diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index c8afe9dfd01e3e9b0eefe0e31f900bc21e676810..5df8470946e57781ce2d0be1c0ce4d77bd9445bb 100644 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -104,7 +104,7 @@ set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab") set(DS_VERSION_MAJOR 0) set(DS_VERSION_MINOR 9) -set(DS_VERSION_MICRO 5) +set(DS_VERSION_MICRO 6) set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ) @@ -394,21 +394,8 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "/usr/local/lib") # Install the executable. install(TARGETS ${PROJECT_NAME} DESTINATION bin/) -install(FILES res/DSLogic.fw DESTINATION bin/res/) -install(FILES res/DSLogic33.bin DESTINATION bin/res/) -install(FILES res/DSLogic50.bin DESTINATION bin/res/) -install(FILES res/DSLogicPro.fw DESTINATION bin/res/) -install(FILES res/DSLogicPro.bin DESTINATION bin/res/) -install(FILES res/DSCope.fw DESTINATION bin/res/) -install(FILES res/DSCope.bin DESTINATION bin/res/) -install(FILES res/DSLogic0.dsc DESTINATION bin/res/) -install(FILES res/DSLogic0.def.dsc DESTINATION bin/res/) -install(FILES res/DSLogic1.dsc DESTINATION bin/res/) -install(FILES res/DSLogic1.def.dsc DESTINATION bin/res/) -install(FILES res/DSLogic2.dsc DESTINATION bin/res/) -install(FILES res/DSLogic2.def.dsc DESTINATION bin/res/) -install(FILES res/DSCope1.dsc DESTINATION bin/res/) -install(FILES res/DSCope1.def.dsc DESTINATION bin/res/) +install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) +install(DIRECTORY ../libsigrokdecode4DSL/decoders DESTINATION share/${PROJECT_NAME}) #=============================================================================== #= Packaging (handled by CPack) diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp index 8600d00b2881778058958962d8083f458cf40979..08d38c2efc566439116d5d7346d3e48b2a5f6159 100644 --- a/DSView/pv/view/analogsignal.cpp +++ b/DSView/pv/view/analogsignal.cpp @@ -57,7 +57,7 @@ AnalogSignal::AnalogSignal(boost::shared_ptr<pv::device::DevInst> dev_inst, Signal(dev_inst, probe), _data(data) { - _typeWidth = 2; + _typeWidth = 3; _colour = SignalColours[probe->index % countof(SignalColours)]; _scale = _totalHeight * 1.0f / 65536; }