Skip to content

D
dsview
Commit 45204e6a authored by Andy Dneg's avatar Andy Dneg
Browse files
Options

Bump version to v1.00

parent f17c612c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 40942 additions and 20072 deletions
.gitignore 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
COPYING 100644 → 100755
View file @ 45204e6a
This diff is collapsed.
DSView/CMake/FindFFTW.cmake 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
DSView/CMake/Findlibusb-1.0.cmake 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
DSView/CMake/Findlibzip.cmake 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
DSView/CMakeLists.txt 100644 → 100755
View file @ 45204e6a
......@@ -104,9 +104,9 @@ find_package(FFTW REQUIRED)
set(DS_TITLE DSView)
set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab")
set(DS_VERSION_MAJOR 0)
set(DS_VERSION_MINOR 9)
set(DS_VERSION_MICRO 9)
set(DS_VERSION_MAJOR 1)
set(DS_VERSION_MINOR 0)
set(DS_VERSION_MICRO 0)
set(DS_VERSION_STRING
${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
)
......@@ -121,95 +121,102 @@ configure_file (
#-------------------------------------------------------------------------------
set(DSView_SOURCES
main.cpp
pv/sigsession.cpp
pv/mainwindow.cpp
pv/devicemanager.cpp
pv/data/snapshot.cpp
pv/data/signaldata.cpp
pv/data/logicsnapshot.cpp
pv/data/logic.cpp
pv/data/analogsnapshot.cpp
pv/data/analog.cpp
pv/dialogs/deviceoptions.cpp
pv/prop/property.cpp
pv/prop/int.cpp
pv/prop/enum.cpp
pv/prop/double.cpp
pv/prop/bool.cpp
pv/prop/binding/binding.cpp
pv/toolbars/samplingbar.cpp
pv/view/viewport.cpp
pv/view/view.cpp
pv/view/timemarker.cpp
pv/view/signal.cpp
pv/view/ruler.cpp
pv/view/logicsignal.cpp
pv/view/header.cpp
pv/view/cursor.cpp
pv/view/analogsignal.cpp
pv/prop/binding/deviceoptions.cpp
pv/toolbars/trigbar.cpp
pv/toolbars/filebar.cpp
pv/dock/protocoldock.cpp
pv/dock/triggerdock.cpp
pv/dock/measuredock.cpp
pv/dock/searchdock.cpp
pv/toolbars/logobar.cpp
pv/data/groupsnapshot.cpp
pv/view/groupsignal.cpp
pv/data/group.cpp
pv/dialogs/about.cpp
pv/dialogs/search.cpp
pv/data/dsosnapshot.cpp
main.cpp
pv/sigsession.cpp
pv/mainwindow.cpp
pv/devicemanager.cpp
pv/data/snapshot.cpp
pv/data/signaldata.cpp
pv/data/logicsnapshot.cpp
pv/data/logic.cpp
pv/data/analogsnapshot.cpp
pv/data/analog.cpp
pv/dialogs/deviceoptions.cpp
pv/prop/property.cpp
pv/prop/int.cpp
pv/prop/enum.cpp
pv/prop/double.cpp
pv/prop/bool.cpp
pv/prop/binding/binding.cpp
pv/toolbars/samplingbar.cpp
pv/view/viewport.cpp
pv/view/view.cpp
pv/view/timemarker.cpp
pv/view/signal.cpp
pv/view/ruler.cpp
pv/view/logicsignal.cpp
pv/view/header.cpp
pv/view/cursor.cpp
pv/view/analogsignal.cpp
pv/prop/binding/deviceoptions.cpp
pv/toolbars/trigbar.cpp
pv/toolbars/filebar.cpp
pv/dock/protocoldock.cpp
pv/dock/triggerdock.cpp
pv/dock/measuredock.cpp
pv/dock/searchdock.cpp
pv/toolbars/logobar.cpp
pv/data/groupsnapshot.cpp
pv/view/groupsignal.cpp
pv/data/group.cpp
pv/dialogs/about.cpp
pv/dialogs/search.cpp
pv/data/dsosnapshot.cpp
pv/data/dso.cpp
pv/view/dsosignal.cpp
pv/view/dsldial.cpp
pv/dock/dsotriggerdock.cpp
pv/view/trace.cpp
pv/view/selectableitem.cpp
pv/data/decoderstack.cpp
pv/data/decode/rowdata.cpp
pv/data/decode/row.cpp
pv/data/decode/decoder.cpp
pv/data/decode/annotation.cpp
pv/view/decodetrace.cpp
pv/prop/binding/decoderoptions.cpp
pv/widgets/fakelineedit.cpp
pv/widgets/decodermenu.cpp
pv/widgets/decodergroupbox.cpp
pv/prop/string.cpp
pv/device/sessionfile.cpp
pv/device/inputfile.cpp
pv/device/file.cpp
pv/device/devinst.cpp
pv/dialogs/storeprogress.cpp
pv/storesession.cpp
pv/view/devmode.cpp
pv/device/device.cpp
pv/dialogs/waitingdialog.cpp
pv/dialogs/dsomeasure.cpp
pv/dialogs/calibration.cpp
pv/data/decodermodel.cpp
pv/dialogs/protocollist.cpp
pv/dialogs/protocolexp.cpp
pv/dialogs/fftoptions.cpp
pv/data/mathstack.cpp
pv/view/mathtrace.cpp
dsapplication.cpp
pv/widgets/viewstatus.cpp
pv/toolbars/titlebar.cpp
pv/mainframe.cpp
pv/widgets/border.cpp
pv/dialogs/dsmessagebox.cpp
pv/dialogs/shadow.cpp
pv/view/dsosignal.cpp
pv/view/dsldial.cpp
pv/dock/dsotriggerdock.cpp
pv/view/trace.cpp
pv/view/selectableitem.cpp
pv/data/decoderstack.cpp
pv/data/decode/rowdata.cpp
pv/data/decode/row.cpp
pv/data/decode/decoder.cpp
pv/data/decode/annotation.cpp
pv/view/decodetrace.cpp
pv/prop/binding/decoderoptions.cpp
pv/widgets/fakelineedit.cpp
pv/widgets/decodermenu.cpp
pv/widgets/decodergroupbox.cpp
pv/prop/string.cpp
pv/device/sessionfile.cpp
pv/device/inputfile.cpp
pv/device/file.cpp
pv/device/devinst.cpp
pv/dialogs/storeprogress.cpp
pv/storesession.cpp
pv/view/devmode.cpp
pv/device/device.cpp
pv/dialogs/waitingdialog.cpp
pv/dialogs/dsomeasure.cpp
pv/dialogs/calibration.cpp
pv/data/decodermodel.cpp
pv/dialogs/protocollist.cpp
pv/dialogs/protocolexp.cpp
pv/dialogs/fftoptions.cpp
pv/data/mathstack.cpp
pv/view/mathtrace.cpp
dsapplication.cpp
pv/toolbars/titlebar.cpp
pv/mainframe.cpp
pv/widgets/border.cpp
pv/dialogs/dsmessagebox.cpp
pv/dialogs/shadow.cpp
pv/dialogs/dsdialog.cpp
pv/dialogs/interval.cpp
pv/prop/binding/probeoptions.cpp
pv/view/viewstatus.cpp
pv/dialogs/lissajousoptions.cpp
pv/view/lissajoustrace.cpp
pv/view/spectrumtrace.cpp
pv/data/spectrumstack.cpp
pv/dialogs/mathoptions.cpp
pv/dialogs/regionoptions.cpp
pv/view/xcursor.cpp
)
set(DSView_HEADERS
pv/sigsession.h
pv/sigsession.h
pv/mainwindow.h
pv/dialogs/deviceoptions.h
pv/prop/property.h
......@@ -254,7 +261,7 @@ set(DSView_HEADERS
pv/dialogs/fftoptions.h
pv/data/mathstack.h
pv/view/mathtrace.h
pv/widgets/viewstatus.h
pv/view/viewstatus.h
pv/toolbars/titlebar.h
pv/mainframe.h
pv/widgets/border.h
......@@ -262,6 +269,17 @@ set(DSView_HEADERS
pv/dialogs/shadow.h
pv/dialogs/dsdialog.h
pv/dialogs/interval.h
pv/dialogs/lissajousoptions.h
pv/view/lissajoustrace.h
pv/view/spectrumtrace.h
pv/data/spectrumstack.h
pv/dialogs/mathoptions.h
pv/dialogs/regionoptions.h
pv/view/xcursor.h
pv/view/signal.h
pv/view/logicsignal.h
pv/view/analogsignal.h
pv/view/dsosignal.h
)
set(DSView_FORMS
......@@ -269,7 +287,8 @@ set(DSView_FORMS
set(DSView_RESOURCES
DSView.qrc
darkstyle/style.qrc
themes/breeze.qrc
languages/language.qrc
)
if(ENABLE_DECODE)
......@@ -401,8 +420,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_
install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS)
install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf)
install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25)
install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)
install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
install(FILES DSView.desktop DESTINATION /usr/share/applications/)
......
DSView/COPYING 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
DSView/DSView.desktop 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
DSView/DSView.qrc 100644 → 100755
View file @ 45204e6a
<RCC>
<qresource prefix="/">
<file>icons/search.png</file>
<file>icons/next.png</file>
<file>icons/pre.png</file>
<file>icons/file.png</file>
<file>icons/save.png</file>
<file>icons/open.png</file>
<file>icons/params.png</file>
<file>stylesheet.qss</file>
<file>icons/down-arrow.png</file>
<file>icons/slider-handle.png</file>
<file>icons/trigger.png</file>
<file>icons/measure.png</file>
<file>icons/search-bar.png</file>
<file>icons/protocol.png</file>
<file>icons/logo_noColor.png</file>
<file>icons/logo_color.png</file>
<file>icons/capture.png</file>
<file>icons/stop.png</file>
<file>icons/start.png</file>
<file>icons/dsl_logo.png</file>
<file>icons/logo.png</file>
<file>icons/hidden.png</file>
<file>icons/shown.png</file>
<file>icons/instant.png</file>
<file>icons/trigger_dis.png</file>
<file>icons/file_dis.png</file>
<file>icons/measure_dis.png</file>
<file>icons/protocol_dis.png</file>
<file>icons/search-bar_dis.png</file>
<file>icons/params_dis.png</file>
<file>icons/gear.png</file>
<file>icons/wait.gif</file>
<file>icons/instant_dis.png</file>
<file>icons/start_dis.png</file>
<file>icons/settings.png</file>
<file>darkstyle/style.qss</file>
<file>icons/export.png</file>
<file>icons/single.png</file>
<file>icons/single_dis.png</file>
<file>icons/math.png</file>
<file>icons/math_dis.png</file>
<file>icons/fft.png</file>
<file>icons/Blackman.png</file>
<file>icons/dsl_logo.png</file>
<file>icons/Flat_top.png</file>
<file>icons/Hamming.png</file>
<file>icons/Hann.png</file>
<file>icons/logo.png</file>
<file>icons/Rectangle.png</file>
<file>icons/close.png</file>
<file>icons/maximize.png</file>
<file>icons/minimize.png</file>
<file>icons/restore.png</file>
<file>icons/nav.png</file>
<file>icons/oneloop.png</file>
<file>icons/repeat.png</file>
<file>icons/moder.png</file>
<file>icons/moder_dis.png</file>
<file>icons/modes.png</file>
<file>icons/modes_dis.png</file>
<file>icons/add.png</file>
<file>icons/del.png</file>
<file>icons/add_dis.png</file>
<file>icons/del_dis.png</file>
<file>icons/about.png</file>
<file>icons/manual.png</file>
<file>icons/bug.png</file>
<file>icons/support.png</file>
<file>icons/showDoc.png</file>
<file>icons/search.png</file>
<file>icons/dark/about.png</file>
<file>icons/dark/add.png</file>
<file>icons/dark/bug.png</file>
<file>icons/dark/capture.png</file>
<file>icons/dark/close.png</file>