Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r95a840fc93f1a2cd65732d835fad2aca0f03f28e -rcb5477be624b09e13d5fc4498634ca621722fd0e --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision cb5477be624b09e13d5fc4498634ca621722fd0e) @@ -49,10 +49,10 @@ function setActive(active) { if (active) { color = Colors.createTreatmentActive - knobColor = Colors.createTreatmentActive + handlerColor = Colors.createTreatmentActive } else { color = Colors.createTreatmentInactive - knobColor = Colors.createTreatmentInactive + handlerColor = Colors.createTreatmentInactive } if (active !== isActive) { Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rcb5477be624b09e13d5fc4498634ca621722fd0e --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision cb5477be624b09e13d5fc4498634ca621722fd0e) @@ -35,10 +35,9 @@ const char *Log_File_Name = "denali.log"; // Treatment - const char *Treatment_Base_Path_Name = "/media/sd-card/treatment/"; + const char *Treatment_Base_Dir = "/media/sd-card/treatment/"; const char *Treatment_Profiles_Dir = "/media/sd-card/treatment/profiles/"; - const char *Treatment_Parameter_Ranges_Path = "/media/sd-card/treatment/denali.conf"; - const char *Treatment_Parameter_Ranges_Path_CSV = "/media/sd-card/treatment/denali.csv"; + const char *Treatment_Parameter_Ranges_Path_JSON = "/media/sd-card/treatment/denali.conf"; const char *SDCard_Base_Path_Name = "/media/sd-card/"; } Index: sources/storage/StorageGlobals.h =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rcb5477be624b09e13d5fc4498634ca621722fd0e --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision cb5477be624b09e13d5fc4498634ca621722fd0e) @@ -29,8 +29,8 @@ extern const char *Log_File_Name ; // Treatment + extern const char *Treatment_Base_Dir ; extern const char *Treatment_Profiles_Dir ; - extern const char *Treatment_Parameter_Ranges_Path ; - extern const char *Treatment_Parameter_Ranges_Path_CSV ; + extern const char *Treatment_Parameter_Ranges_Path_JSON; extern const char *SDCard_Base_Path_Name ; } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r1f8abdd821041623392d18cf4f80cad9ae1bf246 -rcb5477be624b09e13d5fc4498634ca621722fd0e --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 1f8abdd821041623392d18cf4f80cad9ae1bf246) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision cb5477be624b09e13d5fc4498634ca621722fd0e) @@ -219,7 +219,7 @@ QString saveNewTreatment(const QJsonObject &obj, const QString &dir = Treatment_Profiles_Dir); QString getParameterRangesDataCSV(); bool saveTreatmentRangesCSV(const QString &filename); - QJsonObject loadTreatmentParameterRanges(const QString &path = Treatment_Parameter_Ranges_Path); + QJsonObject loadTreatmentParameterRanges(const QString &path = Treatment_Parameter_Ranges_Path_JSON); QStringList jsonArrayToStringList(const QJsonArray &arr); bool indexInItems(quint32 idx, const QStringList &items); void setTreatmentData();