SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Bumped version number to 0.96

Browse Source
This commit is contained in:
DreamSourceLab
2016-08-10 16:45:36 +08:00
parent 941c73d373
commit b15bf26843
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
DSView/CMakeLists.txt
View File

@@ -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)

2
DSView/pv/view/analogsignal.cpp
View File

@@ -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;
}