Merge remote-tracking branch 'origin/master' into ys_unsaved_changes

src/PrusaSlicer.cpp

@@ -44,6 +44,7 @@
 #include "libslic3r/Format/OBJ.hpp"
 #include "libslic3r/Format/SL1.hpp"
 #include "libslic3r/Utils.hpp"
+#include "libslic3r/AppConfig.hpp" 
 
 #include "PrusaSlicer.hpp"
 
@@ -52,7 +53,6 @@
     #include "slic3r/GUI/GUI_App.hpp"
     #include "slic3r/GUI/3DScene.hpp"
     #include "slic3r/GUI/InstanceCheck.hpp" 
-    #include "slic3r/GUI/AppConfig.hpp" 
     #include "slic3r/GUI/MainFrame.hpp"
     #include "slic3r/GUI/Plater.hpp"
 #endif /* SLIC3R_GUI */

src/libslic3r/AppConfig.cpp

@@ -15,8 +15,8 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/format/format_fwd.hpp>
 
-#include <wx/string.h>
-#include "I18N.hpp"
+//#include <wx/string.h>
+//#include "I18N.hpp"
 
 namespace Slic3r {
 
@@ -110,7 +110,7 @@ void AppConfig::set_defaults()
     erase("", "object_settings_size");
 }
 
-void AppConfig::load()
+std::string AppConfig::load()
 {
     // 1) Read the complete config file into a boost::property_tree.
     namespace pt = boost::property_tree;
@@ -120,10 +120,15 @@ void AppConfig::load()
         pt::read_ini(ifs, tree);
     } catch (pt::ptree_error& ex) {
         // Error while parsing config file. We'll customize the error message and rethrow to be displayed.
+        // ! But to avoid the use of _utf8 (related to use of wxWidgets) 
+        // we will rethrow this exception from the place of load() call, if returned value wouldn't be empty
+        /*
         throw std::runtime_error(
         	_utf8(L("Error parsing PrusaSlicer config file, it is probably corrupted. "
                     "Try to manually delete the file to recover from the error. Your user profiles will not be affected.")) + 
         	"\n\n" + AppConfig::config_path() + "\n\n" + ex.what());
+        */
+        return ex.what();
     }
 
     // 2) Parse the property_tree, extract the sections and key / value pairs.
@@ -169,6 +174,7 @@ void AppConfig::load()
     // Override missing or keys with their defaults.
     this->set_defaults();
     m_dirty = false;
+    return "";
 }
 
 void AppConfig::save()

src/libslic3r/AppConfig.hpp

@@ -29,7 +29,8 @@ public:
 	void 			   	set_defaults();
 
 	// Load the slic3r.ini from a user profile directory (or a datadir, if configured).
-	void 			   	load();
+	// return error string or empty strinf
+	std::string		   	load();
 	// Store the slic3r.ini into a user profile directory (or a datadir, if configured).
 	void 			   	save();
 

src/libslic3r/CMakeLists.txt

@@ -151,6 +151,8 @@ add_library(libslic3r STATIC
     Preset.hpp
     PresetBundle.cpp
     PresetBundle.hpp
+    AppConfig.cpp
+    AppConfig.hpp
     Print.cpp
     Print.hpp
     PrintBase.cpp

src/libslic3r/Preset.cpp

@@ -1,7 +1,7 @@
 #include <cassert>
 
 #include "Preset.hpp"
-#include "slic3r/GUI/AppConfig.hpp"
+#include "AppConfig.hpp"
 
 #ifdef _MSC_VER
     #define WIN32_LEAN_AND_MEAN

src/libslic3r/PresetBundle.hpp

@@ -2,13 +2,12 @@
 #define slic3r_PresetBundle_hpp_
 
 #include "Preset.hpp"
+#include "AppConfig.hpp"
 
 #include <memory>
 #include <unordered_map>
 #include <boost/filesystem/path.hpp>
 
-#include "slic3r/GUI/AppConfig.hpp"
-
 namespace Slic3r {
 
 // Bundle of Print + Filament + Printer presets.

src/slic3r/CMakeLists.txt

@@ -12,8 +12,6 @@ set(SLIC3R_GUI_SOURCES
     GUI/SysInfoDialog.hpp
     GUI/KBShortcutsDialog.cpp
     GUI/KBShortcutsDialog.hpp
-    GUI/AppConfig.cpp
-    GUI/AppConfig.hpp
     GUI/BackgroundSlicingProcess.cpp
     GUI/BackgroundSlicingProcess.hpp
     GUI/BitmapCache.cpp

src/slic3r/Config/Snapshot.cpp

@@ -1,5 +1,4 @@
 #include "Snapshot.hpp"
-#include "../GUI/AppConfig.hpp"
 
 #include <time.h>
 

src/slic3r/GUI/3DScene.cpp

@@ -10,7 +10,6 @@
 #if ENABLE_ENVIRONMENT_MAP
 #include "GUI_App.hpp"
 #include "Plater.hpp"
-#include "AppConfig.hpp"
 #endif // ENABLE_ENVIRONMENT_MAP
 
 #include "libslic3r/ExtrusionEntity.hpp"
@@ -24,6 +23,7 @@
 #include "slic3r/GUI/BitmapCache.hpp"
 #include "libslic3r/Format/STL.hpp"
 #include "libslic3r/Utils.hpp"
+#include "libslic3r/AppConfig.hpp"
 
 #include <stdio.h>
 #include <stdlib.h>

src/slic3r/GUI/Camera.cpp

@@ -1,8 +1,8 @@
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/AppConfig.hpp"
 
 #include "Camera.hpp"
 #include "GUI_App.hpp"
-#include "AppConfig.hpp"
 #if ENABLE_CAMERA_STATISTICS
 #include "Mouse3DController.hpp"
 #endif // ENABLE_CAMERA_STATISTICS

src/slic3r/GUI/ConfigWizard_private.hpp

@@ -22,7 +22,6 @@
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "slic3r/Utils/PresetUpdater.hpp"
-#include "AppConfig.hpp"
 #include "BedShapeDialog.hpp"
 #include "GUI.hpp"
 #include "wxExtensions.hpp"

src/slic3r/GUI/GUI_App.cpp

@@ -38,7 +38,6 @@
 
 #include "GUI.hpp"
 #include "GUI_Utils.hpp"
-#include "AppConfig.hpp"
 #include "3DScene.hpp"
 #include "MainFrame.hpp"
 #include "Plater.hpp"
@@ -326,7 +325,13 @@ void GUI_App::init_app_config()
 	// load settings
 	app_conf_exists = app_config->exists();
 	if (app_conf_exists) {
-		app_config->load();
+        std::string error = app_config->load();
+        if (!error.empty())
+            // Error while parsing config file. We'll customize the error message and rethrow to be displayed.
+            throw std::runtime_error(
+                _u8L("Error parsing PrusaSlicer config file, it is probably corrupted. "
+                    "Try to manually delete the file to recover from the error. Your user profiles will not be affected.") +
+                "\n\n" + AppConfig::config_path() + "\n\n" + error);
 	}
 }
 

src/slic3r/GUI/Jobs/SLAImportJob.cpp

@@ -2,7 +2,6 @@
 
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
-#include "slic3r/GUI/AppConfig.hpp"
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GUI_ObjectList.hpp"
 #include "slic3r/Utils/SLAImport.hpp"

src/slic3r/GUI/MainFrame.cpp

@@ -20,7 +20,6 @@
 #include "Tab.hpp"
 #include "ProgressStatusBar.hpp"
 #include "3DScene.hpp"
-#include "AppConfig.hpp"
 #include "PrintHostDialogs.hpp"
 #include "wxExtensions.hpp"
 #include "GUI_ObjectList.hpp"

src/slic3r/GUI/Mouse3DController.cpp

@@ -4,7 +4,6 @@
 
 #include "Camera.hpp"
 #include "GUI_App.hpp"
-#include "AppConfig.hpp"
 #include "GLCanvas3D.hpp"
 #include "Plater.hpp"
 #include "NotificationManager.hpp"

src/slic3r/GUI/Preferences.cpp

@@ -1,8 +1,8 @@
 #include "Preferences.hpp"
-#include "AppConfig.hpp"
 #include "OptionsGroup.hpp"
 #include "GUI_App.hpp"
 #include "I18N.hpp"
+#include "libslic3r/AppConfig.hpp"
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/PresetComboBoxes.cpp

@@ -517,7 +517,7 @@ PlaterPresetComboBox::PlaterPresetComboBox(wxWindow *parent, Preset::Type preset
             const Preset* selected_preset = m_collection->find_preset(m_preset_bundle->filament_presets[m_extruder_idx]);
             // Wide icons are shown if the currently selected preset is not compatible with the current printer,
             // and red flag is drown in front of the selected preset.
-            bool          wide_icons = selected_preset != nullptr && !selected_preset->is_compatible;
+            bool          wide_icons = selected_preset && !selected_preset->is_compatible;
             float scale = m_em_unit*0.1f;
 
             int shifl_Left = wide_icons ? int(scale * 16 + 0.5) : 0;
@@ -707,10 +707,11 @@ void PlaterPresetComboBox::update()
         assert(selected_filament_preset);
     }
 
-    const Preset& selected_preset = m_type == Preset::TYPE_FILAMENT ? *selected_filament_preset : m_collection->get_selected_preset();
+    bool has_selection = m_collection->get_selected_idx() != size_t(-1);
+    const Preset* selected_preset = m_type == Preset::TYPE_FILAMENT ? selected_filament_preset : has_selection ? &m_collection->get_selected_preset() : nullptr;
     // Show wide icons if the currently selected preset is not compatible with the current printer,
     // and draw a red flag in front of the selected preset.
-    bool wide_icons = !selected_preset.is_compatible;
+    bool wide_icons = selected_preset && !selected_preset->is_compatible;
 
     std::map<wxString, wxBitmap*> nonsys_presets;
 

src/slic3r/GUI/PrintHostDialogs.cpp

@@ -15,11 +15,11 @@
 
 #include "GUI.hpp"
 #include "GUI_App.hpp"
-#include "AppConfig.hpp"
 #include "MsgDialog.hpp"
 #include "I18N.hpp"
 #include "../Utils/PrintHost.hpp"
 #include "wxExtensions.hpp"
+#include "libslic3r/AppConfig.hpp"
 
 namespace fs = boost::filesystem;