Index: denali.pro.user =================================================================== diff -u -ra6abc05918a15924460d2b9358365b3eeedf1d1c -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- denali.pro.user (.../denali.pro.user) (revision a6abc05918a15924460d2b9358365b3eeedf1d1c) +++ denali.pro.user (.../denali.pro.user) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -205,15 +205,15 @@ true - /home/denali/Projects/tmp/build/unittest/tst_threads + /home/denali/Projects/tmp/build/unittest/tst_messaging true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_threads CONFIG+=CodeCoverage + CONFIG+=tst_messaging CONFIG+=CodeCoverage false false false @@ -292,25 +292,25 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_threads - tst_threads + tst_messaging + tst_messaging Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/unittest/tst_messaging + /home/denali/workspace_UI/squish/build true qmake QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_messaging CONFIG+=CodeCoverage + true + CONFIG+=Profile CONFIG+=CodeCoverage TARGET=denaliSquish false false - false + true true @@ -324,7 +324,7 @@ false - true + false %{buildDir}/denali %{buildDir} @@ -333,7 +333,7 @@ ProjectExplorer.ProcessStep - true + false -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} @@ -342,7 +342,7 @@ ProjectExplorer.ProcessStep - true + false --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} @@ -351,7 +351,7 @@ ProjectExplorer.ProcessStep - true + false --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} @@ -386,23 +386,23 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_messaging - tst_messaging + tst_acknow + Profile Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Profile + /home/denali/Projects/tmp/build/unittest/tst_canbus true qmake QtProjectManager.QMakeBuildStep false - - true + CONFIG+=tst_canbus CONFIG+=CodeCoverage + false false false @@ -413,11 +413,47 @@ Qt4ProjectManager.MakeStep false - + LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 false - 2 + + true + + %{buildDir}/denali + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + + true + -m denali.csmes -t UnitTests denali.csexe + cmcsexeimport + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + + true + --csmes=denali.csmes --html=Coverage/index + cmreport + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + + true + --csmes=denali.csmes --csv-excel=Coverage/coverage.csv + cmreport + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + 6 Build Build ProjectExplorer.BuildSteps.Build @@ -441,23 +477,25 @@ 2 false - - Profile - Profile + + PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + + tst_canbus + tst_canbus Qt4ProjectManager.Qt4BuildConfiguration - 0 + 2 true - /home/denali/Projects/tmp/build/unittest/tst_canbus + /home/denali/Projects/tmp/build/unittest/tst_logging true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_canbus CONFIG+=CodeCoverage + CONFIG+=tst_logging CONFIG+=CodeCoverage false false false @@ -536,22 +574,22 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_canbus - tst_canbus + tst_logging + tst_logging Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/unittest/tst_logging + /home/denali/Projects/tmp/build/unittest/tst_utilities true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_logging CONFIG+=CodeCoverage + CONFIG+=tst_utilities CONFIG+=CodeCoverage false false false @@ -630,22 +668,22 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_logging - tst_logging + tst_utilities + tst_utilities Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/unittest/tst_utilities + /home/denali/Projects/tmp/build/unittest/tst_acknow true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_utilities CONFIG+=CodeCoverage + CONFIG+=tst_acknow CONFIG+=CodeCoverage false false false @@ -724,22 +762,22 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_utilities - tst_utilities + tst_acknow + tst_acknow Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/unittest/tst_acknow + /home/denali/Projects/tmp/build/unittest/tst_models true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_acknow CONFIG+=CodeCoverage + CONFIG+=tst_models CONFIG+=CodeCoverage false false false @@ -818,22 +856,22 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_acknow - tst_acknow + tst_models + tst_models Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/unittest/tst_models + /home/denali/Projects/tmp/build/unittest/tst_initializations true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_models CONFIG+=CodeCoverage + CONFIG+=tst_initializations CONFIG+=CodeCoverage false false false @@ -912,22 +950,22 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_models - tst_models + tst_initializations + tst_initializations Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/unittest/tst_initializations + /home/denali/Projects/tmp/build/unittest/tst_views true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_initializations CONFIG+=CodeCoverage + CONFIG+=tst_views CONFIG+=CodeCoverage false false false @@ -1006,22 +1044,22 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_initializations - tst_initializations + tst_views + tst_views Qt4ProjectManager.Qt4BuildConfiguration 2 true - /home/denali/Projects/tmp/build/unittest/tst_views + /home/denali/Projects/tmp/build/unittest/tst_threads true qmake QtProjectManager.QMakeBuildStep false - CONFIG+=tst_views CONFIG+=CodeCoverage + CONFIG+=tst_threads CONFIG+=CodeCoverage false false false @@ -1100,8 +1138,8 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin - tst_views - tst_views + tst_threads + tst_threads Qt4ProjectManager.Qt4BuildConfiguration 2 true Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -205,9 +205,9 @@ model: [ vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure .toFixed(2) , vTreatmentPressureOcclusion.pressureocclusion_VenousPressure .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_BloodPumpOcclusion .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_DialysateInletPumpOcclusion .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_DialysateOutletPumpOcclusion .toFixed(2) + vTreatmentPressureOcclusion.pressureocclusion_BloodPumpOcclusion , + vTreatmentPressureOcclusion.pressureocclusion_DialysateInletPumpOcclusion , + vTreatmentPressureOcclusion.pressureocclusion_DialysateOutletPumpOcclusion ] textObjectName: "_PressureOcclusionData" } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -53,7 +53,7 @@ height : 15 rangebar.color: Colors.pressuresArterialBar - value : vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure + value : vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure // TEST : simulation code minimum : _root.arterialMinimum Index: sources/model/hd/data/MTreatmentPressureOcclusionData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -38,9 +38,9 @@ * | || * | #1:(F32) | \ref Data::mArterialPressure | * | #2:(F32) | \ref Data::mVenousPressure | - * | #3:(F32) | \ref Data::mBloodPumpOcclusion | - * | #4:(F32) | \ref Data::mDialysateInletPumpOcclusion | - * | #5:(F32) | \ref Data::mDialysateOutletPumpOcclusion | + * | #3:(U32) | \ref Data::mBloodPumpOcclusion | + * | #4:(U32) | \ref Data::mDialysateInletPumpOcclusion | + * | #5:(U32) | \ref Data::mDialysateOutletPumpOcclusion | * * \sa Data * @@ -62,9 +62,9 @@ struct { Types::F32 mArterialPressure ; Types::F32 mVenousPressure ; - Types::F32 mBloodPumpOcclusion ; - Types::F32 mDialysateInletPumpOcclusion ; - Types::F32 mDialysateOutletPumpOcclusion ; + Types::U32 mBloodPumpOcclusion ; + Types::U32 mDialysateInletPumpOcclusion ; + Types::U32 mDialysateOutletPumpOcclusion ; } _data; public: @@ -76,9 +76,9 @@ struct Data { float mArterialPressure = 0; ///< ArterialPressure float mVenousPressure = 0; ///< VenousPressure - float mBloodPumpOcclusion = 0; ///< BloodPumpOcclusion - float mDialysateInletPumpOcclusion = 0; ///< DialysateInletPumpOcclusion - float mDialysateOutletPumpOcclusion = 0; ///< DialysateOutletPumpOcclusion + quint32 mBloodPumpOcclusion = 0; ///< BloodPumpOcclusion + quint32 mDialysateInletPumpOcclusion = 0; ///< DialysateInletPumpOcclusion + quint32 mDialysateOutletPumpOcclusion = 0; ///< DialysateOutletPumpOcclusion }; MPressureOcclusion () { } Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp =================================================================== diff -u -ra6abc05918a15924460d2b9358365b3eeedf1d1c -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision a6abc05918a15924460d2b9358365b3eeedf1d1c) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -45,8 +45,10 @@ { // if it's accepted or rejected we have the last/current state of saline // so decide on last received/response state - if ( state() == AdjustSalineRequestData::eStart ) { - _data.requestedState = AdjustSalineRequestData::eStop; + // be careful the response enum (GuiSalineStates) is + // different than request enum (AdjustSalineRequestData) + if ( state() == GuiSalineStates::SALINE_BOLUS_STATE_IN_PROGRESS ) { + _data.requestedState = AdjustSalineRequestData::eStop; } else { _data.requestedState = AdjustSalineRequestData::eStart; Index: sources/view/hd/data/VTreatmentPressureOcclusion.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r767367e5779764bec1c1857f32eaf3d86089d5d9 --- sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) @@ -36,13 +36,13 @@ { Q_OBJECT - PROPERTY( float, pressureocclusion_ArterialPressure , 0) - PROPERTY( float, pressureocclusion_VenousPressure , 0) + PROPERTY( float , pressureocclusion_ArterialPressure , 0) + PROPERTY( float , pressureocclusion_VenousPressure , 0) // coco begin validated: These three properties have not been used in GUI. // has been manually tested that it works perfectly fine if used. - PROPERTY( float, pressureocclusion_BloodPumpOcclusion , 0) - PROPERTY( float, pressureocclusion_DialysateInletPumpOcclusion , 0) - PROPERTY( float, pressureocclusion_DialysateOutletPumpOcclusion , 0) + PROPERTY( quint32 , pressureocclusion_BloodPumpOcclusion , 0) + PROPERTY( quint32 , pressureocclusion_DialysateInletPumpOcclusion , 0) + PROPERTY( quint32 , pressureocclusion_DialysateOutletPumpOcclusion , 0) // coco end VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) };