@@ -104,9 +104,9 @@ find_package(FFTW REQUIRED)
104
104
set (DS_TITLE DSView)
105
105
set (DS_DESCRIPTION "A GUI for instruments of DreamSourceLab" )
106
106
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 )
110
110
set (DS_VERSION_STRING
111
111
${DS_VERSION_MAJOR} .${DS_VERSION_MINOR} .${DS_VERSION_MICRO}
112
112
)
@@ -121,95 +121,102 @@ configure_file (
121
121
#-------------------------------------------------------------------------------
122
122
123
123
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
165
165
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
206
205
pv/dialogs/dsdialog.cpp
207
206
pv/dialogs/interval.cpp
208
207
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
209
216
)
210
217
211
218
set (DSView_HEADERS
212
- pv/sigsession.h
219
+ pv/sigsession.h
213
220
pv/mainwindow.h
214
221
pv/dialogs/deviceoptions.h
215
222
pv/prop/property.h
@@ -254,22 +261,34 @@ set(DSView_HEADERS
254
261
pv/dialogs/fftoptions.h
255
262
pv/data/mathstack.h
256
263
pv/view/mathtrace.h
257
- pv/widgets /viewstatus.h
264
+ pv/view /viewstatus.h
258
265
pv/toolbars/titlebar.h
259
266
pv/mainframe.h
260
267
pv/widgets/border.h
261
268
pv/dialogs/dsmessagebox.h
262
269
pv/dialogs/shadow.h
263
270
pv/dialogs/dsdialog.h
264
271
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
265
283
)
266
284
267
285
set (DSView_FORMS
268
286
)
269
287
270
288
set (DSView_RESOURCES
271
289
DSView.qrc
272
- darkstyle/style.qrc
290
+ themes/breeze.qrc
291
+ languages/language .qrc
273
292
)
274
293
275
294
if (ENABLE_DECODE)
@@ -401,8 +420,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_
401
420
install (TARGETS ${PROJECT_NAME} DESTINATION bin/)
402
421
install (DIRECTORY res DESTINATION share/${PROJECT_NAME} )
403
422
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)
406
427
install (FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
407
428
install (FILES DSView.desktop DESTINATION /usr/share/applications/)
408
429
0 commit comments