diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index 94586530..ed3765c0 100644 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -106,7 +106,7 @@ set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab") set(DS_VERSION_MAJOR 0) set(DS_VERSION_MINOR 9) -set(DS_VERSION_MICRO 7) +set(DS_VERSION_MICRO 8) set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ) @@ -400,7 +400,8 @@ 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}/res RENAME NEWS) +install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) +install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) install(FILES DSView.desktop DESTINATION /usr/share/applications/) diff --git a/DSView/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp index bff14abb..3fa497ef 100644 --- a/DSView/pv/dialogs/about.cpp +++ b/DSView/pv/dialogs/about.cpp @@ -66,6 +66,7 @@ About::About(QWidget *parent) : QString changlogs = tr("Changelogs
"); QDir dir(DS_RES_PATH); + dir.cdUp(); QString filename = dir.absolutePath() + "/NEWS"; QFile news(filename); if (news.open(QIODevice::ReadOnly)) { diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp index 5cae32b6..ad27f679 100644 --- a/DSView/pv/toolbars/logobar.cpp +++ b/DSView/pv/toolbars/logobar.cpp @@ -117,7 +117,8 @@ void LogoBar::on_actionAbout_triggered() void LogoBar::on_actionManual_triggered() { - QDir dir(QCoreApplication::applicationDirPath()); + QDir dir(DS_RES_PATH); + dir.cdUp(); QDesktopServices::openUrl( QUrl("file:///"+dir.absolutePath() + "/ug.pdf")); } diff --git a/DSView/pv/toolbars/logobar.h b/DSView/pv/toolbars/logobar.h index 021d3320..d1d2f905 100644 --- a/DSView/pv/toolbars/logobar.h +++ b/DSView/pv/toolbars/logobar.h @@ -29,6 +29,8 @@ #include "../sigsession.h" +#include + namespace pv { namespace toolbars { diff --git a/NEWS b/NEWS index e63dbbfa..caa55c7f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,23 @@ +0.98 (2017-07-29) +----------------- + --common + *fix hardware initialization issue(always red led indicator) when power on + *improve move operations of cursors/label/trigger level, support both press-drag and select-move-release mode + *update the manually, and integrate into the menu of the software + *improve the content of 'About' menu, add 'changelogs' information + *firmware/HDL update + + --for logic analyzer + *improve display scale of decoder contents under exception case + *fix display issue of progressbar of saving dsl file, when sample depth greater than 4G + *fix export issue when part of channels enalbed + *fix pattern search issue. + *fix out of boundary issue of scroll bar, when sample depth greater than 8G + + --for oscilloscope + *fix auto calibraiton issue + *improve noise processing method + 0.97 (2017-06-02) ----------------- --common diff --git a/ug.pdf b/ug.pdf new file mode 100755 index 00000000..3939c3de Binary files /dev/null and b/ug.pdf differ