Fix of 1.42 beta crash when deleting printer profile created by configuration assistant #1985

Fixed an issue, where deleting a profile did not correctly update
profile dependences, and deleting a profile would not test dirty status
of depending profiles, which would be switched thus user changes would be lost.

Fixed enabling / disabling the --default FFF-- / --default SLA-- profiles
when deleting the last printer profile.

Little refactoring (don't compare by strings but by symbolic names).

Making a copy of a profile - "Copy" suffix is added to a system profile.

src/slic3r/GUI/Preset.cpp

@@ -740,6 +740,8 @@ void PresetCollection::save_current_preset(const std::string &new_name)
             return;
         // Overwriting an existing preset.
         preset.config = std::move(m_edited_preset.config);
+		// The newly saved preset will be activated -> make it visible.
+		preset.is_visible = true;
     } else {
         // Creating a new preset.
 		Preset       &preset   = *m_presets.insert(it, m_edited_preset);
@@ -761,6 +763,8 @@ void PresetCollection::save_current_preset(const std::string &new_name)
         preset.is_default  = false;
         preset.is_system   = false;
         preset.is_external = false;
+		// The newly saved preset will be activated -> make it visible.
+		preset.is_visible  = true;
 	}
 	// 2) Activate the saved preset.
 	this->select_preset_by_name(new_name, true);
@@ -768,11 +772,11 @@ void PresetCollection::save_current_preset(const std::string &new_name)
 	this->get_selected_preset().save();
 }
 
-void PresetCollection::delete_current_preset()
+bool PresetCollection::delete_current_preset()
 {
     const Preset &selected = this->get_selected_preset();
 	if (selected.is_default)
-        return;
+		return false;
 	if (! selected.is_external && ! selected.is_system) {
 		// Erase the preset file.
 		boost::nowide::remove(selected.file.c_str());
@@ -786,6 +790,7 @@ void PresetCollection::delete_current_preset()
     if (new_selected_idx == m_presets.size())
 		for (--new_selected_idx; new_selected_idx > 0 && !m_presets[new_selected_idx].is_visible; --new_selected_idx);
     this->select_preset(new_selected_idx);
+	return true;
 }
 
 bool PresetCollection::load_bitmap_default(const std::string &file_name)
@@ -843,7 +848,9 @@ void PresetCollection::set_default_suppressed(bool default_suppressed)
 {
     if (m_default_suppressed != default_suppressed) {
         m_default_suppressed = default_suppressed;
-        m_presets.front().is_visible = ! default_suppressed || (m_presets.size() > m_num_default_presets && m_idx_selected > 0);
+		bool default_visible = ! default_suppressed || m_idx_selected < m_num_default_presets;
+		for (size_t i = 0; i < m_num_default_presets; ++ i)
+			m_presets[i].is_visible = default_visible;
     }
 }
 
@@ -1114,7 +1121,9 @@ Preset& PresetCollection::select_preset(size_t idx)
         idx = first_visible_idx();
     m_idx_selected = idx;
     m_edited_preset = m_presets[idx];
-    m_presets.front().is_visible = ! m_default_suppressed || m_idx_selected == 0;
+	bool default_visible = ! m_default_suppressed || m_idx_selected < m_num_default_presets;
+	for (size_t i = 0; i < m_num_default_presets; ++i)
+		m_presets[i].is_visible = default_visible;
     return m_presets[idx];
 }
 

src/slic3r/GUI/Preset.hpp

@@ -115,6 +115,8 @@ public:
     // Is this preset compatible with the currently active printer?
     bool                is_compatible = true;
 
+    bool                is_user() const { return ! this->is_default && ! this->is_system; }
+
     // Name of the preset, usually derived form the file name.
     std::string         name;
     // File name of the preset. This could be a Print / Filament / Printer preset, 
@@ -269,7 +271,8 @@ public:
     void            save_current_preset(const std::string &new_name);
 
     // Delete the current preset, activate the first visible preset.
-    void            delete_current_preset();
+    // returns true if the preset was deleted successfully.
+    bool            delete_current_preset();
 
     // Load default bitmap to be placed at the wxBitmapComboBox of a MainFrame.
     bool            load_bitmap_default(const std::string &file_name);

src/slic3r/GUI/Tab.cpp

@@ -385,7 +385,7 @@ void Tab::update_changed_ui()
 	if (m_postpone_update_ui) 
 		return;
 
-	const bool deep_compare = (m_name == "printer" || m_name == "sla_material");
+	const bool deep_compare = (m_type == Slic3r::Preset::TYPE_PRINTER || m_type == Slic3r::Preset::TYPE_SLA_MATERIAL);
 	auto dirty_options = m_presets->current_dirty_options(deep_compare);
 	auto nonsys_options = m_presets->current_different_from_parent_options(deep_compare);
     if (m_type == Slic3r::Preset::TYPE_PRINTER) {
@@ -2395,7 +2395,7 @@ void Tab::load_current_preset()
 	(preset.is_default || preset.is_system) ? m_btn_delete_preset->Disable() : m_btn_delete_preset->Enable(true);
 
     update();
-	if (m_name == "printer") {
+	if (m_type == Slic3r::Preset::TYPE_PRINTER) {
 		// For the printer profile, generate the extruder pages.
 		if (preset.printer_technology() == ptFFF)
 			on_preset_loaded();
@@ -2425,7 +2425,7 @@ void Tab::load_current_preset()
 		update_tab_ui();
 
         // update show/hide tabs
-        if (m_name == "printer") {
+		if (m_type == Slic3r::Preset::TYPE_PRINTER) {
             const PrinterTechnology printer_technology = m_presets->get_edited_preset().printer_technology();
             if (printer_technology != static_cast<TabPrinter*>(this)->m_printer_technology)
             {
@@ -2458,7 +2458,7 @@ void Tab::load_current_preset()
 		}
 		else {
 			on_presets_changed();
-            if (m_type == Preset::TYPE_SLA_PRINT || m_type == Preset::TYPE_PRINT)// if (m_name == "print")
+            if (m_type == Preset::TYPE_SLA_PRINT || m_type == Preset::TYPE_PRINT)
 				update_frequently_changed_parameters();
 		}
 
@@ -2526,15 +2526,30 @@ void Tab::update_page_tree_visibility()
 
 }
 
-// Called by the UI combo box when the user switches profiles.
+// Called by the UI combo box when the user switches profiles, and also to delete the current profile.
 // Select a preset by a name.If !defined(name), then the default preset is selected.
 // If the current profile is modified, user is asked to save the changes.
-void Tab::select_preset(std::string preset_name)
+void Tab::select_preset(std::string preset_name, bool delete_current)
 {
+	if (preset_name.empty()) {
+		if (delete_current) {
+			// Find an alternate preset to be selected after the current preset is deleted.
+			const std::deque<Preset> &presets 		= this->m_presets->get_presets();
+			size_t    				  idx_current   = this->m_presets->get_idx_selected();
+    		// Find the next visible preset.
+    		size_t 				      idx_new       = idx_current + 1;
+    		if (idx_new < presets.size())
+        		for (; idx_new < presets.size() && ! presets[idx_new].is_visible; ++ idx_new) ;
+    		if (idx_new == presets.size())
+				for (idx_new = idx_current - 1; idx_new > 0 && ! presets[idx_new].is_visible; -- idx_new);
+			preset_name = presets[idx_new].name;
+		} else {
 			// If no name is provided, select the "-- default --" preset.
-	if (preset_name.empty())
 			preset_name = m_presets->default_preset().name;
-	bool current_dirty = m_presets->current_is_dirty();
+		}
+	}
+	assert(! delete_current || (m_presets->get_edited_preset().name != preset_name && m_presets->get_edited_preset().is_user()));
+	bool current_dirty = ! delete_current && m_presets->current_is_dirty();
 	bool print_tab     = m_presets->type() == Preset::TYPE_PRINT || m_presets->type() == Preset::TYPE_SLA_PRINT;
 	bool printer_tab   = m_presets->type() == Preset::TYPE_PRINTER;
 	bool canceled      = false;
@@ -2602,6 +2617,19 @@ void Tab::select_preset(std::string preset_name)
             }
         }
 	}
+
+	if (! canceled && delete_current) {
+		// Delete the file and select some other reasonable preset.
+		// It does not matter which preset will be made active as the preset will be re-selected from the preset_name variable.
+		// The 'external' presets will only be removed from the preset list, their files will not be deleted.
+		try { 
+			m_presets->delete_current_preset();
+		} catch (const std::exception & /* e */) {
+			//FIXME add some error reporting!
+			canceled = true;
+		}
+	}
+
 	if (canceled) {
 		update_tab_ui();
 		// Trigger the on_presets_changed event so that we also restore the previous value in the plater selector,
@@ -2610,11 +2638,13 @@ void Tab::select_preset(std::string preset_name)
 	} else {
 		if (current_dirty)
 			m_presets->discard_current_changes();
-		const bool is_selected = m_presets->select_preset_by_name(preset_name, false);
+
+		const bool is_selected = m_presets->select_preset_by_name(preset_name, false) || delete_current;
+		assert(m_presets->get_edited_preset().name == preset_name || ! is_selected);
 		// Mark the print & filament enabled if they are compatible with the currently selected preset.
 		// The following method should not discard changes of current print or filament presets on change of a printer profile,
 		// if they are compatible with the current printer.
-		if (current_dirty || print_tab || printer_tab)
+		if (current_dirty || delete_current || print_tab || printer_tab)
 			m_preset_bundle->update_compatible(true);
 		// Initialize the UI from the current preset.
         if (printer_tab)
@@ -2631,15 +2661,10 @@ void Tab::select_preset(std::string preset_name)
              * to the corresponding printer_technology
              */
             const PrinterTechnology printer_technology = m_presets->get_edited_preset().printer_technology();
-            if (printer_technology == ptFFF && m_dependent_tabs.front() != Preset::Type::TYPE_PRINT ||
+            if (printer_technology == ptFFF && m_dependent_tabs.front() != Preset::Type::TYPE_PRINT)
-                printer_technology == ptSLA && m_dependent_tabs.front() != Preset::Type::TYPE_SLA_PRINT )
-            {
-                m_dependent_tabs.clear();
-                if (printer_technology == ptFFF)
             	m_dependent_tabs = { Preset::Type::TYPE_PRINT, Preset::Type::TYPE_FILAMENT };
-                else
+            else if (printer_technology == ptSLA && m_dependent_tabs.front() != Preset::Type::TYPE_SLA_PRINT)
                 m_dependent_tabs = { Preset::Type::TYPE_SLA_PRINT, Preset::Type::TYPE_SLA_MATERIAL };
-            }
         }
 		load_current_preset();
 	}
@@ -2771,11 +2796,14 @@ void Tab::save_preset(std::string name /*= ""*/)
 //!	m_treectrl->OnSetFocus();
 
 	if (name.empty()) {
-		auto preset = m_presets->get_selected_preset();
+		const Preset &preset = m_presets->get_selected_preset();
 		auto default_name = preset.is_default ? "Untitled" : preset.name;
+		if (preset.is_system) {
+			default_name += " - ";
+			default_name += _(L("Copy")).ToUTF8().data();
+		}
  		bool have_extention = boost::iends_with(default_name, ".ini");
-		if (have_extention)
+		if (have_extention) {
-		{
 			size_t len = default_name.length()-4;
 			default_name.resize(len);
 		}
@@ -2819,7 +2847,7 @@ void Tab::save_preset(std::string name /*= ""*/)
 	// If current profile is saved, "delete preset" button have to be enabled
 	m_btn_delete_preset->Enable(true);
 
-	if (m_name == "printer")
+	if (m_type == Preset::TYPE_PRINTER)
 		static_cast<TabPrinter*>(this)->m_initial_extruders_count = static_cast<TabPrinter*>(this)->m_extruders_count;
 	update_changed_ui();
 }
@@ -2836,15 +2864,9 @@ void Tab::delete_preset()
 	if (current_preset.is_default ||
 		wxID_YES != wxMessageDialog(parent(), msg, title, wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION).ShowModal())
 		return;
-	// Delete the file and select some other reasonable preset.
+	// Select will handle of the preset dependencies, of saving & closing the depending profiles, and
-	// The 'external' presets will only be removed from the preset list, their files will not be deleted.
+	// finally of deleting the preset.
-	try{ m_presets->delete_current_preset(); }
+	this->select_preset("", true);
-	catch (const std::exception & /* e */)
-	{
-		return;
-	}
-	// Load the newly selected preset into the UI, update selection combo boxes with their dirty flags.
-	load_current_preset();
 }
 
 void Tab::toggle_show_hide_incompatible()

src/slic3r/GUI/Tab.hpp

@@ -239,7 +239,8 @@ public:
 	void		load_current_preset();
 	void        rebuild_page_tree();
 	void        update_page_tree_visibility();
-	void		select_preset(std::string preset_name = "");
+	// Select a new preset, possibly delete the current one.
+	void		select_preset(std::string preset_name = "", bool delete_current = false);
 	bool		may_discard_current_dirty_preset(PresetCollection* presets = nullptr, const std::string& new_printer_name = "");
     bool        may_switch_to_SLA_preset();