Skip to content

Commit 45204e6

Browse files
author
Andy Dneg
committed
Bump version to v1.00
1 parent f17c612 commit 45204e6

File tree

867 files changed

+40942
-21467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

867 files changed

+40942
-21467
lines changed

.gitignore

100644100755
File mode changed.

COPYING

100644100755
+674-674
Large diffs are not rendered by default.

DSView/CMake/FindFFTW.cmake

100644100755
File mode changed.

DSView/CMake/Findlibusb-1.0.cmake

100644100755
File mode changed.

DSView/CMake/Findlibzip.cmake

100644100755
File mode changed.

DSView/CMakeLists.txt

100644100755
+110-89
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ find_package(FFTW REQUIRED)
104104
set(DS_TITLE DSView)
105105
set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab")
106106

107-
set(DS_VERSION_MAJOR 0)
108-
set(DS_VERSION_MINOR 9)
109-
set(DS_VERSION_MICRO 9)
107+
set(DS_VERSION_MAJOR 1)
108+
set(DS_VERSION_MINOR 0)
109+
set(DS_VERSION_MICRO 0)
110110
set(DS_VERSION_STRING
111111
${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
112112
)
@@ -121,95 +121,102 @@ configure_file (
121121
#-------------------------------------------------------------------------------
122122

123123
set(DSView_SOURCES
124-
main.cpp
125-
pv/sigsession.cpp
126-
pv/mainwindow.cpp
127-
pv/devicemanager.cpp
128-
pv/data/snapshot.cpp
129-
pv/data/signaldata.cpp
130-
pv/data/logicsnapshot.cpp
131-
pv/data/logic.cpp
132-
pv/data/analogsnapshot.cpp
133-
pv/data/analog.cpp
134-
pv/dialogs/deviceoptions.cpp
135-
pv/prop/property.cpp
136-
pv/prop/int.cpp
137-
pv/prop/enum.cpp
138-
pv/prop/double.cpp
139-
pv/prop/bool.cpp
140-
pv/prop/binding/binding.cpp
141-
pv/toolbars/samplingbar.cpp
142-
pv/view/viewport.cpp
143-
pv/view/view.cpp
144-
pv/view/timemarker.cpp
145-
pv/view/signal.cpp
146-
pv/view/ruler.cpp
147-
pv/view/logicsignal.cpp
148-
pv/view/header.cpp
149-
pv/view/cursor.cpp
150-
pv/view/analogsignal.cpp
151-
pv/prop/binding/deviceoptions.cpp
152-
pv/toolbars/trigbar.cpp
153-
pv/toolbars/filebar.cpp
154-
pv/dock/protocoldock.cpp
155-
pv/dock/triggerdock.cpp
156-
pv/dock/measuredock.cpp
157-
pv/dock/searchdock.cpp
158-
pv/toolbars/logobar.cpp
159-
pv/data/groupsnapshot.cpp
160-
pv/view/groupsignal.cpp
161-
pv/data/group.cpp
162-
pv/dialogs/about.cpp
163-
pv/dialogs/search.cpp
164-
pv/data/dsosnapshot.cpp
124+
main.cpp
125+
pv/sigsession.cpp
126+
pv/mainwindow.cpp
127+
pv/devicemanager.cpp
128+
pv/data/snapshot.cpp
129+
pv/data/signaldata.cpp
130+
pv/data/logicsnapshot.cpp
131+
pv/data/logic.cpp
132+
pv/data/analogsnapshot.cpp
133+
pv/data/analog.cpp
134+
pv/dialogs/deviceoptions.cpp
135+
pv/prop/property.cpp
136+
pv/prop/int.cpp
137+
pv/prop/enum.cpp
138+
pv/prop/double.cpp
139+
pv/prop/bool.cpp
140+
pv/prop/binding/binding.cpp
141+
pv/toolbars/samplingbar.cpp
142+
pv/view/viewport.cpp
143+
pv/view/view.cpp
144+
pv/view/timemarker.cpp
145+
pv/view/signal.cpp
146+
pv/view/ruler.cpp
147+
pv/view/logicsignal.cpp
148+
pv/view/header.cpp
149+
pv/view/cursor.cpp
150+
pv/view/analogsignal.cpp
151+
pv/prop/binding/deviceoptions.cpp
152+
pv/toolbars/trigbar.cpp
153+
pv/toolbars/filebar.cpp
154+
pv/dock/protocoldock.cpp
155+
pv/dock/triggerdock.cpp
156+
pv/dock/measuredock.cpp
157+
pv/dock/searchdock.cpp
158+
pv/toolbars/logobar.cpp
159+
pv/data/groupsnapshot.cpp
160+
pv/view/groupsignal.cpp
161+
pv/data/group.cpp
162+
pv/dialogs/about.cpp
163+
pv/dialogs/search.cpp
164+
pv/data/dsosnapshot.cpp
165165
pv/data/dso.cpp
166-
pv/view/dsosignal.cpp
167-
pv/view/dsldial.cpp
168-
pv/dock/dsotriggerdock.cpp
169-
pv/view/trace.cpp
170-
pv/view/selectableitem.cpp
171-
pv/data/decoderstack.cpp
172-
pv/data/decode/rowdata.cpp
173-
pv/data/decode/row.cpp
174-
pv/data/decode/decoder.cpp
175-
pv/data/decode/annotation.cpp
176-
pv/view/decodetrace.cpp
177-
pv/prop/binding/decoderoptions.cpp
178-
pv/widgets/fakelineedit.cpp
179-
pv/widgets/decodermenu.cpp
180-
pv/widgets/decodergroupbox.cpp
181-
pv/prop/string.cpp
182-
pv/device/sessionfile.cpp
183-
pv/device/inputfile.cpp
184-
pv/device/file.cpp
185-
pv/device/devinst.cpp
186-
pv/dialogs/storeprogress.cpp
187-
pv/storesession.cpp
188-
pv/view/devmode.cpp
189-
pv/device/device.cpp
190-
pv/dialogs/waitingdialog.cpp
191-
pv/dialogs/dsomeasure.cpp
192-
pv/dialogs/calibration.cpp
193-
pv/data/decodermodel.cpp
194-
pv/dialogs/protocollist.cpp
195-
pv/dialogs/protocolexp.cpp
196-
pv/dialogs/fftoptions.cpp
197-
pv/data/mathstack.cpp
198-
pv/view/mathtrace.cpp
199-
dsapplication.cpp
200-
pv/widgets/viewstatus.cpp
201-
pv/toolbars/titlebar.cpp
202-
pv/mainframe.cpp
203-
pv/widgets/border.cpp
204-
pv/dialogs/dsmessagebox.cpp
205-
pv/dialogs/shadow.cpp
166+
pv/view/dsosignal.cpp
167+
pv/view/dsldial.cpp
168+
pv/dock/dsotriggerdock.cpp
169+
pv/view/trace.cpp
170+
pv/view/selectableitem.cpp
171+
pv/data/decoderstack.cpp
172+
pv/data/decode/rowdata.cpp
173+
pv/data/decode/row.cpp
174+
pv/data/decode/decoder.cpp
175+
pv/data/decode/annotation.cpp
176+
pv/view/decodetrace.cpp
177+
pv/prop/binding/decoderoptions.cpp
178+
pv/widgets/fakelineedit.cpp
179+
pv/widgets/decodermenu.cpp
180+
pv/widgets/decodergroupbox.cpp
181+
pv/prop/string.cpp
182+
pv/device/sessionfile.cpp
183+
pv/device/inputfile.cpp
184+
pv/device/file.cpp
185+
pv/device/devinst.cpp
186+
pv/dialogs/storeprogress.cpp
187+
pv/storesession.cpp
188+
pv/view/devmode.cpp
189+
pv/device/device.cpp
190+
pv/dialogs/waitingdialog.cpp
191+
pv/dialogs/dsomeasure.cpp
192+
pv/dialogs/calibration.cpp
193+
pv/data/decodermodel.cpp
194+
pv/dialogs/protocollist.cpp
195+
pv/dialogs/protocolexp.cpp
196+
pv/dialogs/fftoptions.cpp
197+
pv/data/mathstack.cpp
198+
pv/view/mathtrace.cpp
199+
dsapplication.cpp
200+
pv/toolbars/titlebar.cpp
201+
pv/mainframe.cpp
202+
pv/widgets/border.cpp
203+
pv/dialogs/dsmessagebox.cpp
204+
pv/dialogs/shadow.cpp
206205
pv/dialogs/dsdialog.cpp
207206
pv/dialogs/interval.cpp
208207
pv/prop/binding/probeoptions.cpp
208+
pv/view/viewstatus.cpp
209+
pv/dialogs/lissajousoptions.cpp
210+
pv/view/lissajoustrace.cpp
211+
pv/view/spectrumtrace.cpp
212+
pv/data/spectrumstack.cpp
213+
pv/dialogs/mathoptions.cpp
214+
pv/dialogs/regionoptions.cpp
215+
pv/view/xcursor.cpp
209216
)
210217

211218
set(DSView_HEADERS
212-
pv/sigsession.h
219+
pv/sigsession.h
213220
pv/mainwindow.h
214221
pv/dialogs/deviceoptions.h
215222
pv/prop/property.h
@@ -254,22 +261,34 @@ set(DSView_HEADERS
254261
pv/dialogs/fftoptions.h
255262
pv/data/mathstack.h
256263
pv/view/mathtrace.h
257-
pv/widgets/viewstatus.h
264+
pv/view/viewstatus.h
258265
pv/toolbars/titlebar.h
259266
pv/mainframe.h
260267
pv/widgets/border.h
261268
pv/dialogs/dsmessagebox.h
262269
pv/dialogs/shadow.h
263270
pv/dialogs/dsdialog.h
264271
pv/dialogs/interval.h
272+
pv/dialogs/lissajousoptions.h
273+
pv/view/lissajoustrace.h
274+
pv/view/spectrumtrace.h
275+
pv/data/spectrumstack.h
276+
pv/dialogs/mathoptions.h
277+
pv/dialogs/regionoptions.h
278+
pv/view/xcursor.h
279+
pv/view/signal.h
280+
pv/view/logicsignal.h
281+
pv/view/analogsignal.h
282+
pv/view/dsosignal.h
265283
)
266284

267285
set(DSView_FORMS
268286
)
269287

270288
set(DSView_RESOURCES
271289
DSView.qrc
272-
darkstyle/style.qrc
290+
themes/breeze.qrc
291+
languages/language.qrc
273292
)
274293

275294
if(ENABLE_DECODE)
@@ -401,8 +420,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_
401420
install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
402421
install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
403422
install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
404-
install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS)
405-
install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf)
423+
install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25)
424+
install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
425+
install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
426+
install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)
406427
install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
407428
install(FILES DSView.desktop DESTINATION /usr/share/applications/)
408429

DSView/COPYING

100644100755
File mode changed.

DSView/DSView.desktop

100644100755
File mode changed.

0 commit comments

Comments
 (0)