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 Show 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
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) ...@@ -104,9 +104,9 @@ find_package(FFTW REQUIRED)
set(DS_TITLE DSView) set(DS_TITLE DSView)
set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab") set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab")
set(DS_VERSION_MAJOR 0) set(DS_VERSION_MAJOR 1)
set(DS_VERSION_MINOR 9) set(DS_VERSION_MINOR 0)
set(DS_VERSION_MICRO 9) set(DS_VERSION_MICRO 0)
set(DS_VERSION_STRING set(DS_VERSION_STRING
${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
) )
...@@ -197,7 +197,6 @@ set(DSView_SOURCES ...@@ -197,7 +197,6 @@ set(DSView_SOURCES
pv/data/mathstack.cpp pv/data/mathstack.cpp
pv/view/mathtrace.cpp pv/view/mathtrace.cpp
dsapplication.cpp dsapplication.cpp
pv/widgets/viewstatus.cpp
pv/toolbars/titlebar.cpp pv/toolbars/titlebar.cpp
pv/mainframe.cpp pv/mainframe.cpp
pv/widgets/border.cpp pv/widgets/border.cpp
...@@ -206,6 +205,14 @@ set(DSView_SOURCES ...@@ -206,6 +205,14 @@ set(DSView_SOURCES
pv/dialogs/dsdialog.cpp pv/dialogs/dsdialog.cpp
pv/dialogs/interval.cpp pv/dialogs/interval.cpp
pv/prop/binding/probeoptions.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 set(DSView_HEADERS
...@@ -254,7 +261,7 @@ set(DSView_HEADERS ...@@ -254,7 +261,7 @@ set(DSView_HEADERS
pv/dialogs/fftoptions.h pv/dialogs/fftoptions.h
pv/data/mathstack.h pv/data/mathstack.h
pv/view/mathtrace.h pv/view/mathtrace.h
pv/widgets/viewstatus.h pv/view/viewstatus.h
pv/toolbars/titlebar.h pv/toolbars/titlebar.h
pv/mainframe.h pv/mainframe.h
pv/widgets/border.h pv/widgets/border.h
...@@ -262,6 +269,17 @@ set(DSView_HEADERS ...@@ -262,6 +269,17 @@ set(DSView_HEADERS
pv/dialogs/shadow.h pv/dialogs/shadow.h
pv/dialogs/dsdialog.h pv/dialogs/dsdialog.h
pv/dialogs/interval.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 set(DSView_FORMS
...@@ -269,7 +287,8 @@ set(DSView_FORMS ...@@ -269,7 +287,8 @@ set(DSView_FORMS
set(DSView_RESOURCES set(DSView_RESOURCES
DSView.qrc DSView.qrc
darkstyle/style.qrc themes/breeze.qrc
languages/language.qrc
) )
if(ENABLE_DECODE) if(ENABLE_DECODE)
...@@ -401,8 +420,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_ ...@@ -401,8 +420,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_
install(TARGETS ${PROJECT_NAME} DESTINATION bin/) install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25)
install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) 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 DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
install(FILES DSView.desktop DESTINATION /usr/share/applications/) 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> <RCC>
<qresource prefix="/"> <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/Blackman.png</file>
<file>icons/dsl_logo.png</file>
<file>icons/Flat_top.png</file> <file>icons/Flat_top.png</file>
<file>icons/Hamming.png</file> <file>icons/Hamming.png</file>
<file>icons/Hann.png</file> <file>icons/Hann.png</file>
<file>icons/logo.png</file>
<file>icons/Rectangle.png</file> <file>icons/Rectangle.png</file>
<file>icons/close.png</file> <file>icons/search.png</file>
<file>icons/maximize.png</file> <file>icons/dark/about.png</file>
<file>icons/minimize.png</file> <file>icons/dark/add.png</file>
<file>icons/restore.png</file> <file>icons/dark/bug.png</file>
<file>icons/nav.png</file> <file>icons/dark/capture.png</file>
<file>icons/oneloop.png</file> <file>icons/dark/close.png</file>
<file>icons/repeat.png</file> <file>icons/dark/dark.png</file>
<file>icons/moder.png</file> <file>icons/dark/del.png</file>
<file>icons/moder_dis.png</file> <file>icons/dark/display.png</file>
<file>icons/modes.png</file> <file>icons/dark/down-arrow.png</file>
<file>icons/modes_dis.png</file> <file>icons/dark/export.png</file>
<file>icons/add.png</file> <file>icons/dark/fft.png</file>
<file>icons/del.png</file> <file>icons/dark/file.png</file>
<file>icons/add_dis.png</file> <file>icons/dark/gear.png</file>
<file>icons/del_dis.png</file> <file>icons/dark/hidden.png</file>
<file>icons/about.png</file> <file>icons/dark/instant.png</file>
<file>icons/manual.png</file> <file>icons/dark/light.png</file>
<file>icons/bug.png</file> <file>icons/dark/logo_color.png</file>
<file>icons/support.png</file> <file>icons/dark/logo_noColor.png</file>
<file>icons/showDoc.png</file> <file>icons/dark/manual.png</file>
<file>icons/dark/maximize.png</file>
<file>icons/dark/measure.png</file>
<file>icons/dark/minimize.png</file>
<file>icons/dark/moder.png</file>
<file>icons/dark/modes.png</file>
<file>icons/dark/nav.png</file>
<file>icons/dark/next.png</file>
<file>icons/dark/oneloop.png</file>
<file>icons/dark/open.png</file>
<file>icons/dark/params.png</file>
<file>icons/dark/pre.png</file>
<file>icons/dark/protocol.png</file>
<file>icons/dark/repeat.png</file>
<file>icons/dark/restore.png</file>
<file>icons/dark/save.png</file>
<file>icons/dark/search.png</file>
<file>icons/dark/search-bar.png</file>
<file>icons/dark/shown.png</file>
<file>icons/dark/single.png</file>
<file>icons/dark/start.png</file>
<file>icons/dark/stop.png</file>
<file>icons/dark/support.png</file>
<file>icons/dark/trigger.png</file>
<file>icons/light/about.png</file>
<file>icons/light/add.png</file>
<file>icons/light/bug.png</file>
<file>icons/light/capture.png</file>
<file>icons/light/close.png</file>
<file>icons/light/dark.png</file>
<file>icons/light/del.png</file>
<file>icons/light/display.png</file>
<file>icons/light/down-arrow.png</file>
<file>icons/light/export.png</file>
<file>icons/light/fft.png</file>
<file>icons/light/file.png</file>
<file>icons/light/gear.png</file>
<file>icons/light/hidden.png</file>
<file>icons/light/instant.png</file>
<file>icons/light/light.png</file>
<file>icons/light/logo_color.png</file>
<file>icons/light/logo_noColor.png</file>
<file>icons/light/manual.png</file>
<file>icons/light/maximize.png</file>
<file>icons/light/measure.png</file>
<file>icons/light/minimize.png</file>
<file>icons/light/moder.png</file>
<file>icons/light/modes.png</file>
<file>icons/light/nav.png</file>
<file>icons/light/next.png</file>
<file>icons/light/oneloop.png</file>
<file>icons/light/open.png</file>
<file>icons/light/params.png</file>
<file>icons/light/pre.png</file>
<file>icons/light/protocol.png</file>
<file>icons/light/repeat.png</file>
<file>icons/light/restore.png</file>
<file>icons/light/save.png</file>
<file>icons/light/search.png</file>
<file>icons/light/search-bar.png</file>
<file>icons/light/shown.png</file>
<file>icons/light/single.png</file>
<file>icons/light/start.png</file>
<file>icons/light/stop.png</file>
<file>icons/light/support.png</file>
<file>icons/light/trigger.png</file>
<file>icons/mAmplitude.png</file>
<file>icons/mBurst.png</file>
<file>icons/mDelay.png</file>
<file>icons/mFall.png</file>
<file>icons/mFreq.png</file>
<file>icons/mHigh.png</file>
<file>icons/mLow.png</file>
<file>icons/mMax.png</file>
<file>icons/mMean.png</file>
<file>icons/mMin.png</file>
<file>icons/mNduty.png</file>
<file>icons/mNover.png</file>
<file>icons/mNwidth.png</file>
<file>icons/mPcount.png</file>
<file>icons/mPduty.png</file>
<file>icons/mPeriod.png</file>
<file>icons/mPover.png</file>
<file>icons/mPwidth.png</file>
<file>icons/mRise.png</file>
<file>icons/mRms.png</file>
<file>icons/mVpp.png</file>
<file>icons/light/lissajous.png</file>
<file>icons/dark/lissajous.png</file>
<file>icons/light/function.png</file>
<file>icons/dark/function.png</file>
<file>icons/light/math.png</file>
<file>icons/dark/math.png</file>
<file>icons/math.png</file>
<file>icons/Chinese.png</file>
<file>icons/English.png</file>
<file>icons/lissajous.png</file>
<file>icons/light/wait.gif</file>
<file>icons/dark/wait.gif</file>
<file>icons/light/daq.png</file>
<file>icons/light/la.png</file>
<file>icons/light/osc.png</file>
<file>icons/dark/daq.png</file>
<file>icons/dark/la.png</file>
<file>icons/dark/osc.png</file>
<file>icons/showDoc25.png</file>
<file>icons/showDoc31.png</file>
</qresource> </qresource>
</RCC> </RCC>
DSView/DreamSourceLab.rules 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
DSView/README 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755
DSView/config.h.in 100644 → 100755
View file @ 45204e6a
File mode changed from 100644 to 100755