Log program setting JSON file path

Author: Gin

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -152,6 +152,10 @@ const std::string& SETTINGS_PATH(){
     static std::string path = get_setting_path();
     return path;
 }
+const std::string& PROGRAM_SETTING_JSON_PATH(){
+    static std::string path = SETTINGS_PATH() + QCoreApplication::applicationName().toStdString() + "-Settings.json";
+    return path;
+}
 const std::string& SCREENSHOTS_PATH(){
     static std::string path = get_screenshot_path();
     return path;

SerialPrograms/Source/CommonFramework/Globals.h

@@ -37,6 +37,8 @@ extern const size_t LOG_HISTORY_LINES;
 
 // Folder path (end with "/") to hold program setting files.
 const std::string& SETTINGS_PATH();
+// The setting JSON file path. This path is a child of the folder SETTINGS_PATH().
+const std::string& PROGRAM_SETTING_JSON_PATH();
 
 // Folder path (end with "/") to hold screenshots from the program "Screenshot" button.
 const std::string& SCREENSHOTS_PATH();

SerialPrograms/Source/CommonFramework/Main.cpp

@@ -72,6 +72,7 @@ int main(int argc, char *argv[]){
             return 1;
         }
 
+        std::cout << "Loading from program setting JSON: " << PROGRAM_SETTING_JSON_PATH() << std::endl;
         PERSISTENT_SETTINGS().read();
 
         if (!migrate_stats(global_logger_tagged())){

SerialPrograms/Source/CommonFramework/PersistentSettings.cpp

@@ -41,18 +41,16 @@ void PersistentSettings::write() const{
     root["99-Panels"] = panels.clone();
 
     try{
-        std::string settings_path = SETTINGS_PATH() + QCoreApplication::applicationName().toStdString() + "-Settings.json";
-        root.dump(settings_path);
+        root.dump(PROGRAM_SETTING_JSON_PATH());
     }catch (FileException&){}
 }
 
 
 void PersistentSettings::read(){
-    std::string settings_path = SETTINGS_PATH() + QCoreApplication::applicationName().toStdString() + "-Settings.json";
-    JsonValue json = load_json_file(settings_path);
+    JsonValue json = load_json_file(PROGRAM_SETTING_JSON_PATH());
     JsonObject* obj = json.to_object();
     if (obj == nullptr){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid settings file.", settings_path);
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid settings file.", PROGRAM_SETTING_JSON_PATH());
     }
 
     //  Need to load this subset of settings first because they will affect how

SerialPrograms/Source/Tests/CommandLineTests.cpp

@@ -180,6 +180,7 @@ int run_command_line_tests(){
     }
 
     QFileInfo test_root_info(root_folder_name.c_str());
+    cout << "Looking for tests under test root folder: " << root_folder_name << endl;
 
     size_t num_passed = 0;