Index: denali.pro.user =================================================================== diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -raad2e406efd1fc2589a19004eb86ca6277f41aea --- denali.pro.user (.../denali.pro.user) (revision e159592e3a99658e661ab83fffef43322dc075f3) +++ denali.pro.user (.../denali.pro.user) (revision aad2e406efd1fc2589a19004eb86ca6277f41aea) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -raad2e406efd1fc2589a19004eb86ca6277f41aea --- en_US.udic (.../en_US.udic) (revision e159592e3a99658e661ab83fffef43322dc075f3) +++ en_US.udic (.../en_US.udic) (revision aad2e406efd1fc2589a19004eb86ca6277f41aea) @@ -87,3 +87,4 @@ VStorage USBDrive SDCard +Pre Index: resources/settings/instructions/instructions.conf =================================================================== diff -u -r98581b325c24eb5ef0ce0ce475ad15320d659140 -raad2e406efd1fc2589a19004eb86ca6277f41aea --- resources/settings/instructions/instructions.conf (.../instructions.conf) (revision 98581b325c24eb5ef0ce0ce475ad15320d659140) +++ resources/settings/instructions/instructions.conf (.../instructions.conf) (revision aad2e406efd1fc2589a19004eb86ca6277f41aea) @@ -1,58 +1,8 @@ -[Sample^Water Sample] -. Unlock pump track . Lock pump track Water Sample Instruction =1.png -Insert cartridge using alignment pins Water Sample Instruction =2.png -HD machine door open / HD machine door closed Water Sample Instruction =3.png - -[Sample^Water Sample Result] -. Unlock pump track . Lock pump track Sample^Water Sample Result =1.png -Insert cartridge using alignment pins Sample^Water Sample Result =2.png -HD machine door open / HD machine door closed Sample^Water Sample Result =3.png - -[Sample^Water Sample Result Failed] -. Unlock pump track . Lock pump track Sample^Water Sample Result Failed=1.png -Insert cartridge using alignment pins Sample^Water Sample Result Failed=2.png -HD machine door open / HD machine door closed Sample^Water Sample Result Failed=3.png - -[Consumables^Consumables Installation] -. Unlock pump track . Lock pump track Consumables^Consumables Installation=1.png -Insert cartridge using alignment pins Consumables^Consumables Installation=2.png -HD machine door open / HD machine door closed Consumables^Consumables Installation=3.png - [Disposables^Cartridge Installation] -. Unlock pump track . Lock pump track Disposables^Cartridge Installation=1.png -Install the Dialyzer v2 = slide1_filter_v2.png -Install the Dialyzer v2b = slide1_filter_v2b.png -Insert cartridge using alignment pins Disposables^Cartridge Installation=2.png -empty image= -=3.png -HD machine door open / HD machine door closed Disposables^Cartridge Installation=3.png +Unlock pump track, Lock pump track =1.png +Insert cartridge using alignment pins =2.png +HD machine door open / HD machine door closed =3.png [Disposables^Cartridge Connection] -. Unlock pump track . Lock pump track Disposables^Cartridge Connection=1.png -Connect dialyzer v1 = slide2_filter-connect_v1.png -Insert cartridge using alignment pins Disposables^Cartridge Connection=2.png -HD machine door open / HD machine door closed Disposables^Cartridge Connection=3.png +Connect dialyzer v1 = slide2_filter-connect_v1.png -[Disposables^Heparin Syringe] -. Unlock pump track . Lock pump track Disposables^Saline Bag=1.png -Insert cartridge using alignment pins Disposables^Saline Bag=2.png -HD machine door open / HD machine door closed Disposables^Saline Bag=3.png - -[Disposables^Saline Bag] - -[Connection^Patient Connection] -. Unlock pump track . Lock pump track Connection^Patient Connection=1.png -Insert cartridge using alignment pins Connection^Patient Connection=2.png -HD machine door open / HD machine door closed Connection^Patient Connection=3.png - -[Connection^Start Treatment] -. Unlock pump track . Lock pump track Connection^Start Treatment=1.png -Insert cartridge using alignment pins Connection^Start Treatment=2.png -HD machine door open / HD machine door closed Connection^Start Treatment=3.png - -[Disconnection^Patient Disconnection] -1 - . Unlock pump track . Lock pump track Connection^Start Treatment=1.png -2 - Insert cartridge using alignment pins Connection^Start Treatment=2.png - - - Index: sources/gui/qml/SDItem.qml =================================================================== diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -raad2e406efd1fc2589a19004eb86ca6277f41aea --- sources/gui/qml/SDItem.qml (.../SDItem.qml) (revision e159592e3a99658e661ab83fffef43322dc075f3) +++ sources/gui/qml/SDItem.qml (.../SDItem.qml) (revision aad2e406efd1fc2589a19004eb86ca6277f41aea) @@ -16,17 +16,19 @@ // Qt import QtQuick 2.12 - // Project // C++ imports // Qml imports import "qrc:/globals" import "qrc:/components" /*! - * \brief Keyboard is the single keyboard in the entire applicaiton. + * \brief SDItem is the component to provide user information about the SDCard. + * \detials This item includes the space left on the device in percent as well as the ProgressCircle for a graphical representation. + * The ProgressCircle turns red if the amount of free space left is less than defined (15% for now) + * The percent value in the circle will show "SD" if the device is not present/ready. */ -Rectangle { id: _root // TEST : SD-Card not present should be handled with better indication(s). +Rectangle { id: _root // TEST : SD-Card not present may need to be handled with better indication(s). color : Colors.transparent anchors { top : parent.top @@ -49,8 +51,8 @@ anchors.fill: parent diameter: _root.width minimum : 0 - maximum : _GuiView.sdTotal / 1000000 - value : _GuiView.sdAvail / 1000000 + maximum : _GuiView.sdTotal / 1000000 // convert to MB since the value in byte is too big for ProgressCircle. + value : _GuiView.sdAvail / 1000000 // convert to MB since the value in byte is too big for ProgressCircle. thickness: 1 color : ! _GuiView.sdIsReady ? "red" : _GuiView.sdIsReadOnly ? "gray" : _GuiView.sdIsLow ? Colors.red : "green" } Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -raad2e406efd1fc2589a19004eb86ca6277f41aea --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision e159592e3a99658e661ab83fffef43322dc075f3) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision aad2e406efd1fc2589a19004eb86ca6277f41aea) @@ -48,6 +48,16 @@ // should be in the project application folder. [is tracking by git] const char *Settings_Path_Name = "/home/denali/Projects/application/resources/settings/"; #endif + + + // Scripts +#ifdef BUILD_FOR_TARGET + const char *Scripts_Path_Name = "/home/root/scripts/"; +#else + // should be in the project application folder. [is tracking by git] + const char *Scripts_Path_Name = "/home/denali/Projects/application/scripts/"; +#endif + // Date and Time const char *Date_Time_Set_Sh = "date_time_set.sh"; } Index: sources/storage/StorageGlobals.h =================================================================== diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -raad2e406efd1fc2589a19004eb86ca6277f41aea --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision e159592e3a99658e661ab83fffef43322dc075f3) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision aad2e406efd1fc2589a19004eb86ca6277f41aea) @@ -30,6 +30,9 @@ // Settings extern const char *Settings_Path_Name; + // Scripts + extern const char *Scripts_Path_Name; + // Date and Time extern const char *Date_Time_Set_Sh; } Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -raad2e406efd1fc2589a19004eb86ca6277f41aea --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision aad2e406efd1fc2589a19004eb86ca6277f41aea) @@ -173,7 +173,9 @@ */ void VDateTime::dateTimeUI(const QString &vDateTime) { - _process.start(Storage::Date_Time_Set_Sh, QStringList() << vDateTime); + QString mScript = Storage::Scripts_Path_Name; + mScript += Storage::Date_Time_Set_Sh; + _process.start(mScript, QStringList() << vDateTime); } /*!