Fixed conflicts after stable->master merge

resources/profiles/Snapmaker.ini

@@ -470,8 +470,4 @@ max_print_height = 235
 start_gcode = M82 ;absolute extrusion mode\n;Start GCode begin\nM140 S[first_layer_bed_temperature]   ;Start Warming Bed\nM104 S160 ;Preheat Nozzle\nG28 ; home all axes\nG90 ;absolute positioning\nG1 X-10 Y-10 F3000\nG1 Z0 F1800\nG1 Z5 F5000 ; lift nozzle\nM190 S[first_layer_bed_temperature]   ;Wait For Bed Temperature\nM109 S[first_layer_temperature] ;Wait for Hotend Temperature\nG92 E0\nG1 E10 F200\nG1 E-2 F300\nG92 E0\n;Start GCode end\nG1 F3600 E-2
 end_gcode = M140 S0\n;End GCode begin\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG90 ;absolute positioning\nG92 E0\nG1 E-2 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z330 E-1 F80 ;move Z up a bit and retract filament even more\nG1 X0 F3000 ;move X to min endstops, so the head is out of the way\nG1 Y250 F3000 ;so the head is out of the way and Plate is moved forward\nM84 ;steppers off\n;End GCode end\nM82 ;absolute extrusion mode\nM104 S0\nM107\n;End of Gcode
 default_filament_profile = Generic PLA @Snapmaker
-<<<<<<< HEAD
 default_print_profile = 0.20mm NORMAL @SnapmakerA250
-=======
-default_print_profile = 0.20mm NORMAL @SnapmakerA250
->>>>>>> stable

src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp

@@ -119,7 +119,6 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking)
 
     const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin());
     Geometry::Transformation trafo =  vol->get_instance_transformation() * vol->get_volume_transformation();
-<<<<<<< HEAD
 
 #if ENABLE_GL_SHADERS_ATTRIBUTES
     const Transform3d instance_scaling_matrix_inverse = vol->get_instance_transformation().get_matrix(true, true, false, true).inverse();
@@ -131,8 +130,6 @@ void GLGizmoHollow::render_points(const Selection& selection, bool picking)
 
     shader->set_uniform("projection_matrix", projection_matrix);
 #else
-=======
->>>>>>> stable
     const Transform3d& instance_scaling_matrix_inverse = trafo.get_matrix(true, true, false, true).inverse();
     const Transform3d& instance_matrix = trafo.get_matrix();
 

src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp

@@ -149,7 +149,6 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
     const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin());
     Geometry::Transformation transformation(vol->get_instance_transformation().get_matrix() * vol->get_volume_transformation().get_matrix());
     const Transform3d& instance_scaling_matrix_inverse = transformation.get_matrix(true, true, false, true).inverse();
-<<<<<<< HEAD
 #if ENABLE_GL_SHADERS_ATTRIBUTES
     const Transform3d instance_matrix = Geometry::assemble_transform(m_c->selection_info()->get_sla_shift() * Vec3d::UnitZ()) * transformation.get_matrix();
     const Camera& camera = wxGetApp().plater()->get_camera();
@@ -158,8 +157,6 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
 
     shader->set_uniform("projection_matrix", projection_matrix);
 #else
-=======
->>>>>>> stable
     const Transform3d& instance_matrix = transformation.get_matrix();
     const float z_shift = m_c->selection_info()->get_sla_shift();
     glsafe(::glPushMatrix());

src/slic3r/GUI/Jobs/SLAImportJob.cpp

@@ -44,6 +44,8 @@ SLAImportJob::~SLAImportJob() = default;
 
 void SLAImportJob::process(Ctl &ctl)
 {
+    if (p->path.empty() || ! p->err.empty()) return;
+
     auto statustxt = _u8L("Importing SLA archive");
     ctl.update_status(0, statustxt);
 
@@ -53,8 +55,6 @@ void SLAImportJob::process(Ctl &ctl)
         return !ctl.was_canceled();
     };
 
-    if (p->path.empty() || ! p->err.empty()) return;
-
     std::string path = p->path.ToUTF8().data();
     std::string format_id = p->import_dlg->get_archive_format();
 
@@ -75,16 +75,11 @@ void SLAImportJob::process(Ctl &ctl)
         }
     } catch (MissingProfileError &) {
         p->err = _u8L("The SLA archive doesn't contain any presets. "
-<<<<<<< HEAD
                       "Please activate some SLA printer preset first before "
                       "importing that SLA archive.");
     } catch (ReaderUnimplementedError &) {
         p->err = _u8L("Import is unavailable for this archive format.");
     }catch (std::exception &ex) {
-=======
-                    "Please activate some SLA printer preset first before importing that SLA archive.");
-    } catch (std::exception &ex) {
->>>>>>> stable
         p->err = ex.what();
     }
 
@@ -106,30 +101,17 @@ void SLAImportJob::prepare()
 {
     reset();
 
-<<<<<<< HEAD
     auto path  = p->import_dlg->get_path();
     auto nm    = wxFileName(path);
     p->path    = !nm.Exists(wxFILE_EXISTS_REGULAR) ? "" : nm.GetFullPath();
+    if (p->path.empty()) {
+        p->err = _u8L("The file does not exist.");
+        return;
+    }
     p->sel     = p->import_dlg->get_selection();
     p->quality = p->import_dlg->get_quality();
 
     p->config_substitutions.clear();
-=======
-    if (p->import_dlg.ShowModal() == wxID_OK) {
-        auto path = p->import_dlg.get_path();
-        auto nm = wxFileName(path);
-        p->path = !nm.Exists(wxFILE_EXISTS_REGULAR) ? "" : nm.GetFullPath();
-        if (p->path.empty()) {
-            p->err = _u8L("The file does not exist.");
-            return;
-        }
-        p->sel  = p->import_dlg.get_selection();
-        p->win  = p->import_dlg.get_marchsq_windowsize();
-        p->config_substitutions.clear();
-    } else {
-        p->path = "";
-    }
->>>>>>> stable
 }
 
 void SLAImportJob::finalize(bool canceled, std::exception_ptr &eptr)
@@ -144,12 +126,6 @@ void SLAImportJob::finalize(bool canceled, std::exception_ptr &eptr)
         return;
     }
 
-    if (p->path.empty()) {
-        // This happens when the user cancels the import dialog. That is not
-        // an error to report, but we cannot continue either.
-        return;
-    }
-
     std::string name = wxFileName(p->path).GetName().ToUTF8().data();
 
     if (p->profile.empty()) {

src/slic3r/GUI/Search.cpp

@@ -301,24 +301,7 @@ OptionsSearcher::~OptionsSearcher()
 
 void OptionsSearcher::check_and_update(PrinterTechnology pt_in, ConfigOptionMode mode_in, std::vector<InputInfo> input_values)
 {
-<<<<<<< HEAD
-    options.clear();
-    for (auto i : input_values)
-        append_options(i.config, i.type, i.mode);
-
-    options.insert(options.end(), preferences_options.begin(), preferences_options.end());
-
-    sort_options();
-
-    search(search_line, true);
-}
-
-void OptionsSearcher::apply(DynamicPrintConfig* config, Preset::Type type, ConfigOptionMode mode)
-{
-    if (options.empty())
-=======
     if (printer_technology == pt_in && mode == mode_in)
->>>>>>> stable
         return;
 
     options.clear();

src/slic3r/GUI/Search.hpp

@@ -111,18 +111,11 @@ public:
     OptionsSearcher();
     ~OptionsSearcher();
 
-<<<<<<< HEAD
-    void init(std::vector<InputInfo> input_values);
-    void apply(DynamicPrintConfig *config,
-               Preset::Type        type,
-               ConfigOptionMode    mode);
     void append_preferences_option(const GUI::Line& opt_line);
     void append_preferences_options(const std::vector<GUI::Line>& opt_lines);
-=======
     void check_and_update(  PrinterTechnology pt_in, 
                             ConfigOptionMode mode_in, 
                             std::vector<InputInfo> input_values);
->>>>>>> stable
     bool search();
     bool search(const std::string& search, bool force = false);