Index: denali.pro.user =================================================================== diff -u -rd28dcbacdb1818e5777d83feb1e513a339da6995 -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- denali.pro.user (.../denali.pro.user) (revision d28dcbacdb1818e5777d83feb1e513a339da6995) +++ denali.pro.user (.../denali.pro.user) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -60,28 +60,7 @@ ProjectExplorer.Project.PluginSettings - - - false - false - true - true - - 0 - true - - true - Builtin.Questionable - - true - Builtin.DefaultTidyAndClazy - 2 - - - - true - - + ProjectExplorer.Project.Target.0 @@ -93,18 +72,18 @@ 0 0 - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/projects/tmp/build/build-denali-Desktop_Qt_5_12_5_GCC_64bit-Debug true qmake QtProjectManager.QMakeBuildStep - false + true false false - true + false true @@ -119,7 +98,7 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build @@ -136,7 +115,7 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 @@ -149,7 +128,7 @@ true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release + /home/denali/projects/build-denali-Desktop_Qt_5_12_5_GCC_64bit-Release true @@ -175,7 +154,7 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build @@ -192,7 +171,7 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 @@ -204,207 +183,19 @@ 0 true - - /home/denali/Projects/tmp/build/unittest/tst_threads - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_threads CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/unittest/tst_messaging - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_messaging CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Profile + /home/denali/projects/build-denali-Desktop_Qt_5_12_5_GCC_64bit-Profile true qmake QtProjectManager.QMakeBuildStep - false + true - true - false - false + false + true + true true @@ -419,7 +210,7 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build @@ -436,7 +227,7 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 @@ -448,670 +239,12 @@ 0 true - - /home/denali/Projects/tmp/build/unittest/tst_canbus - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_canbus CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - 2 - true - - - /home/denali/Projects/tmp/build/unittest/tst_logging - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_logging CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/unittest/tst_utilities - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_utilities CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/unittest/tst_acknow - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_acknow CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/unittest/tst_models - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_models CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/unittest/tst_initializations - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_initializations CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/denali/Projects/tmp/build/unittest/tst_views - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - CONFIG+=tst_views CONFIG+=CodeCoverage - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 - - false - - - 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 - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 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 - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - 12 + 3 0 Deploy - Deploy + ProjectExplorer.BuildSteps.Deploy 1 @@ -1175,7 +308,7 @@ denali - Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/denali/projects/application/denali.pro 3768 false @@ -1184,8 +317,9 @@ false false true + false - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/projects/tmp/build-denali-Desktop_Qt_5_12_5_GCC_64bit-Debug 1 @@ -1200,14 +334,14 @@ 0 0 - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Debug + /home/denali/projects/tmp/build/build-denali-Qt_5_12_5_iMX8-Debug true qmake QtProjectManager.QMakeBuildStep - false + true false false @@ -1226,7 +360,7 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build @@ -1243,7 +377,7 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 @@ -1256,7 +390,7 @@ true - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Release + /home/denali/projects/build-denali-Qt_5_12_5_iMX8-Release true @@ -1267,7 +401,7 @@ false false - false + true true @@ -1282,7 +416,7 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build @@ -1299,7 +433,7 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 @@ -1312,18 +446,18 @@ true - /home/denali/Projects/tmp/build/denali-Qt_5_12_5_iMX8-Profile + /home/denali/projects/build-denali-Qt_5_12_5_iMX8-Profile true qmake QtProjectManager.QMakeBuildStep - false + true false - false - false + true + true true @@ -1338,7 +472,7 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build @@ -1355,7 +489,7 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 @@ -1412,7 +546,7 @@ 3 Deploy - Deploy + ProjectExplorer.BuildSteps.Deploy 1 @@ -1474,9 +608,9 @@ 1 - denali (on Generic Linux Device)2 - denali (on Generic Linux Device)2 - RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro + + denali (on Generic Linux Device (iMX8)) + RemoteLinuxRunConfiguration:/home/denali/projects/application/denali.pro 1 false Index: scripts/copy.sh =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- scripts/copy.sh (.../copy.sh) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ scripts/copy.sh (.../copy.sh) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -24,8 +24,8 @@ SSHUSER=root HOMEPATH="/home/$SSHUSER/" FONTPATH="/usr/share/fonts/truetype/" -FONTSPATH="/home/denali/Project/application/resources/fonts/" -DENALIPATH="/home/denali/Project/tmp/build/denali-Qt_5_12_5_iMX8-Release/" +FONTSPATH="/home/denali/projects/application/resources/fonts/" +DENALIPATH="/home/denali/projects/tmp/build/denali-Qt_5_12_5_iMX8-Release/" DENALINAME=denali function folderExists() { Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -rd1907168ef46faa6de1ada400cad789f8379041f -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision d1907168ef46faa6de1ada400cad789f8379041f) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -36,7 +36,7 @@ /*! * \brief MessageInterpreter::notify - * \details Checks and Prepaires the model with the Message Data + * \details Checks and prepares the model with the Message Data * Regarding the type of message logs the message recived. * Notofies observers by emiting the didActionReceive( < Data > ) signal * \param vMessage - The Denali message @@ -55,7 +55,7 @@ tModel.toVariantList(vData); // coco begin validated : Tested manually. This code will never go false // because the isValidMessage is catching errors. - // only is checking here for developer safty if logic has changed. + // only is checking here for developer safety if logic has changed. if ( ! ok ) return false; // coco end emit didActionReceive(tModel.data()); Index: sources/gui/qml/components/RectSelectCreateTreatment.qml =================================================================== diff -u -r2d09ae36f6b791e0415a87b6f14f582d4b434d7d -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- sources/gui/qml/components/RectSelectCreateTreatment.qml (.../RectSelectCreateTreatment.qml) (revision 2d09ae36f6b791e0415a87b6f14f582d4b434d7d) +++ sources/gui/qml/components/RectSelectCreateTreatment.qml (.../RectSelectCreateTreatment.qml) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -49,12 +49,6 @@ } - Text { - id: _text - text: "Title" - font.pixelSize: Fonts.fontPixelFluidText - color: Colors.textMain; - } function setActive(active) { if (!active) { for (let i = 0; i < _repeater.count; i++) { @@ -64,6 +58,13 @@ } } + Text { + id: _text + text: "Title" + font.pixelSize: Fonts.fontPixelFluidText + color: Colors.textMain; + } + GridLayout { id: _grid anchors.top: _text.bottom @@ -75,6 +76,7 @@ model: buttonNames TouchRect { id: _touchRect + objectName: _root.objectName + index text.text: modelData; selectable: true height: _root.buttonHeight Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r2d09ae36f6b791e0415a87b6f14f582d4b434d7d -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 2d09ae36f6b791e0415a87b6f14f582d4b434d7d) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -34,6 +34,8 @@ property alias stepSnap: _slider.stepSnap property alias sliderWidth: _slider.width property alias isActive: _slider.isActive + property alias sliderObjectName: _slider.objectName + property alias selectedValueObjectName: _selected_value.objectName signal sliderChanged() height: Variables.progressbarRectHeight Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml =================================================================== diff -u -r2d09ae36f6b791e0415a87b6f14f582d4b434d7d -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 2d09ae36f6b791e0415a87b6f14f582d4b434d7d) +++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -45,6 +45,10 @@ property alias highSliderWidth: _highSlider.width property alias isLowActive: _lowSlider.isActive property alias isHighActive: _highSlider.isActive + property alias lowSliderObjectName: _lowSlider.objectName + property alias lowSelectedValueObjectName: _lowSelectedValue.objectName + property alias highSliderObjectName: _highSlider.objectName + property alias highSelectedValueObjectName: _highSelectedValue.objectName signal lowSliderChanged() signal highSliderChanged() Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r2d09ae36f6b791e0415a87b6f14f582d4b434d7d -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 2d09ae36f6b791e0415a87b6f14f582d4b434d7d) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -78,6 +78,9 @@ SliderCreateTreatment { id: _bloodFlowRate + objectName: "_bloodFlowRate" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Blood Flow Rate" units: qsTr(" mL/min") min: vCreateTreatment.bloodFlowRateMin @@ -89,6 +92,9 @@ SliderCreateTreatment { id: _dialysateFlowRate + objectName: "_dialysateFlowRate" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Dialysate Flow Rate" units: qsTr(" mL/min") min: vCreateTreatment.dialysateFlowRateMin @@ -100,6 +106,9 @@ SliderCreateTreatment { id: _duration + objectName: "_duration" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Duration" units: qsTr(" min") min: vCreateTreatment.durationMin @@ -111,6 +120,9 @@ SliderCreateTreatment { id: _heparinDispensingRate + objectName: "_heparinDispensingRate" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Heparin Dispensing Rate" units: qsTr(" mL/hr") min: vCreateTreatment.heparinDispensingRateMin @@ -122,6 +134,9 @@ SliderCreateTreatment { id: _heparinBolusVolume + objectName: "_heparinBolusVolume" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Heparin Bolus Volume" units: qsTr(" mL") min: vCreateTreatment.heparinBolusVolumeMin @@ -133,6 +148,9 @@ SliderCreateTreatment { id: _heparinStopTime + objectName: "_heparinStopTime" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Heparin Stop Time" units: qsTr(" min") min: vCreateTreatment.heparinStopTimeMin @@ -144,6 +162,7 @@ RectSelectCreateTreatment { id: _salineBolus + objectName: "_salineBolusRect" name: "Saline Bolus" buttonNames: vCreateTreatment.salineBolusOptions onButtonClicked: { @@ -153,6 +172,7 @@ RectSelectCreateTreatment { id: _acidConcentrate + objectName: "_acidConcentrateRect" name: "Acid Concentrate" buttonNames: vCreateTreatment.acidConcentrateOptions; onButtonClicked: { @@ -162,6 +182,7 @@ RectSelectCreateTreatment { id: _bicarbonateConcentrate + objectName: "_bicarbonateConcentrateRect" name: "Bicarbonate Concentrate" numRows: 1 numCols: 2 @@ -173,6 +194,7 @@ RectSelectCreateTreatment { id: _dialyzerType + objectName: "_dialyzerTypeRect" name: "Dialyzer Type" numRows: 3 numCols: 2 @@ -184,6 +206,9 @@ SliderCreateTreatment { id: _dialysateTemperature + objectName: "_dialysateTemperature" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Dialysate Temperature" units: qsTr(" C") step: 0.1 @@ -205,6 +230,11 @@ SliderDoubleCreateTreatment { id: _arterialPressureLimits + objectName: "_arterialPressureLimits" + lowSliderObjectName: objectName + "LowSlider" + lowSelectedValueObjectName: objectName + "LowValue" + highSliderObjectName: objectName + "HighSlider" + highSelectedValueObjectName: objectName + "HighValue" lowTitle: "Low" lowUnits: " mmHg" highTitle: "High" @@ -235,6 +265,11 @@ SliderDoubleCreateTreatment { id: _venousPressureLimits + objectName: "_venousPressureLimits" + lowSliderObjectName: objectName + "LowSlider" + lowSelectedValueObjectName: objectName + "LowValue" + highSliderObjectName: objectName + "HighSlider" + highSelectedValueObjectName: objectName + "HighValue" lowTitle: "Low" lowUnits: " mmHg" highTitle: "High" @@ -255,6 +290,9 @@ SliderCreateTreatment { id: _bloodPressureMeasurementInterval + objectName: "_bloodPressureMeasurementInterval" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Blood Pressure Measurement Interval" units: qsTr(" min") min: vCreateTreatment.bloodPressureMeasureIntervalMin @@ -268,6 +306,9 @@ SliderCreateTreatment { id: _rinsebackFlowRate + objectName: "_rinsebackFlowRate" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" text: "Rinseback Flow Rate" units: qsTr(" mL/min") min: vCreateTreatment.rinsebackFlowRateMin @@ -280,6 +321,7 @@ } TouchRect { id : _continueRect + objectName: "_continueButton" anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("CONTINUE") backgroundColor: Colors.createTreatmentNotReady Index: sources/view/VCreateTreatment.cpp =================================================================== diff -u -rd1907168ef46faa6de1ada400cad789f8379041f -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 --- sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision d1907168ef46faa6de1ada400cad789f8379041f) +++ sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) @@ -232,7 +232,7 @@ treatmentData.bloodPressureMeasureInterval, treatmentData.rinsebackFlowRate }; - GuiActionType messageAction = GuiActions::CreateTreatmentReq; + GuiActionType messageAction = GuiActions::ID_CreateTreatmentReq; emit validateParamsWithFW(messageAction, messageData);