diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index cb926f1f1..c44993048 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -505,20 +505,10 @@ void Preview::reset_sliders(bool reset_all) void Preview::update_sliders(const std::vector& layers_z, bool keep_z_range) { m_enabled = true; - // update extruder selector - if (wxGetApp().extruders_edited_cnt() != m_extruder_selector->GetCount()-1) - { - m_selected_extruder = m_extruder_selector->GetSelection(); - update_extruder_selector(); - if (m_selected_extruder >= m_extruder_selector->GetCount()) - m_selected_extruder = 0; - m_extruder_selector->SetSelection(m_selected_extruder); - } update_double_slider(layers_z, keep_z_range); m_double_slider_sizer->Show((size_t)0); -// if (m_slider->GetManipulationState() == DoubleSlider::msSingleExtruder) - m_double_slider_sizer->GetItem(size_t(0))->GetSizer()->Hide((size_t)0); + Layout(); } @@ -535,9 +525,6 @@ void Preview::on_choice_view_type(wxCommandEvent& evt) if ((0 <= selection) && (selection < (int)GCodePreviewData::Extrusion::Num_View_Types)) m_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)selection; - if (m_gcode_preview_data->extrusion.view_type != GCodePreviewData::Extrusion::ColorPrint) - m_extruder_selector->SetSelection(0); - reload_print(); } @@ -596,14 +583,6 @@ void Preview::update_view_type(bool slice_completed) m_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type; m_preferred_color_mode = "feature"; } - - if (type != GCodePreviewData::Extrusion::EViewType::ColorPrint) - m_extruder_selector->SetSelection(0); -} - -void Preview::update_extruder_selector() -{ - apply_extruder_selector(&m_extruder_selector, this, L("Whole print"), wxDefaultPosition, wxDefaultSize, true); } void Preview::create_double_slider() @@ -611,35 +590,7 @@ void Preview::create_double_slider() m_slider = new DoubleSlider(this, wxID_ANY, 0, 0, 0, 100); m_slider->EnableTickManipulation(wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF); - // #ys_FIXME_COLOR - // m_double_slider_sizer->Add(m_slider, 0, wxEXPAND, 0); - - update_extruder_selector(); - m_extruder_selector->SetSelection(0); - m_extruder_selector->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& evt) - { - m_selected_extruder = m_extruder_selector->GetSelection(); - m_slider->SetExtruderID(m_selected_extruder); - - int type = m_choice_view_type->FindString(_(L("Color Print"))); - - if (m_choice_view_type->GetSelection() != type) { - m_choice_view_type->SetSelection(type); - if (0 <= type && type < (int)GCodePreviewData::Extrusion::Num_View_Types) - m_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type; - m_preferred_color_mode = "feature"; - } - reload_print(); - - evt.StopPropagation(); - }); - m_extruder_selector->Disable(); - - auto sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add(m_extruder_selector, 0, wxEXPAND, 0); - sizer->Add(m_slider, 1, wxEXPAND, 0); - - m_double_slider_sizer->Add(sizer, 0, wxEXPAND, 0); + m_double_slider_sizer->Add(m_slider, 0, wxEXPAND, 0); // sizer, m_canvas_widget m_canvas_widget->Bind(wxEVT_KEY_DOWN, &Preview::update_double_slider_from_canvas, this); @@ -718,11 +669,7 @@ void Preview::update_double_slider(const std::vector& layers_z, bool kee bool snap_to_min = force_sliders_full_range || m_slider->is_lower_at_min(); bool snap_to_max = force_sliders_full_range || m_slider->is_higher_at_max(); - std::vector tmp_ticks_from_model; - if (m_selected_extruder != 0) - tmp_ticks_from_model = wxGetApp().plater()->model().custom_gcode_per_height; - std::vector &ticks_from_model = m_selected_extruder != 0 ? tmp_ticks_from_model : - wxGetApp().plater()->model().custom_gcode_per_height; + std::vector &ticks_from_model = wxGetApp().plater()->model().custom_gcode_per_height; check_slider_values(ticks_from_model, layers_z); m_slider->SetSliderValues(layers_z); @@ -751,11 +698,10 @@ void Preview::update_double_slider(const std::vector& layers_z, bool kee m_slider->EnableTickManipulation(color_print_enable); if (color_print_enable && wxGetApp().extruders_edited_cnt() > 1) { - m_slider->SetExtruderID(m_extruder_selector->GetSelection()); + m_slider->SetExtruderID(0); } else m_slider->SetExtruderID(-1); - } void Preview::reset_double_slider() @@ -857,7 +803,7 @@ void Preview::load_print_as_fff(bool keep_z_range) if (IsShown()) { - m_canvas->set_selected_extruder(m_selected_extruder); + m_canvas->set_selected_extruder(0); if (gcode_preview_data_valid) { // Load the real G-code preview. m_canvas->load_gcode_preview(*m_gcode_preview_data, colors); @@ -871,7 +817,7 @@ void Preview::load_print_as_fff(bool keep_z_range) std::vector zs = m_canvas->get_current_print_zs(true); if (zs.empty()) { // all layers filtered out - reset_sliders(m_selected_extruder==0); + reset_sliders(true); m_canvas_widget->Refresh(); } else update_sliders(zs, keep_z_range); diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp index 900368baa..b0dac4223 100644 --- a/src/slic3r/GUI/GUI_Preview.hpp +++ b/src/slic3r/GUI/GUI_Preview.hpp @@ -104,8 +104,6 @@ class Preview : public wxPanel bool m_enabled; DoubleSlider* m_slider {nullptr}; - wxBitmapComboBox* m_extruder_selector {nullptr}; - int m_selected_extruder {0}; // 0 means "Whole print" public: Preview(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model, DynamicPrintConfig* config, @@ -133,7 +131,6 @@ public: void edit_double_slider(wxKeyEvent& evt); void update_view_type(bool slice_completed); - void update_extruder_selector(); bool is_loaded() const { return m_loaded; } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index bf858215e..409e9a11e 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -4965,7 +4965,6 @@ void Plater::on_config_change(const DynamicPrintConfig &config) filament_colors.push_back(filaments.find_preset(filament_preset, true)->config.opt_string("filament_colour", (unsigned)0)); p->config->option(opt_key)->values = filament_colors; - p->preview->update_extruder_selector(); p->sidebar->obj_list()->update_extruder_colors(); continue; } @@ -4992,7 +4991,6 @@ void Plater::on_config_change(const DynamicPrintConfig &config) else if(opt_key == "extruder_colour") { update_scheduled = true; p->preview->set_number_extruders(p->config->option(opt_key)->values.size()); - p->preview->update_extruder_selector(); p->sidebar->obj_list()->update_extruder_colors(); } else if(opt_key == "max_print_height") { update_scheduled = true; @@ -5044,7 +5042,6 @@ void Plater::force_filament_colors_update() if (update_scheduled) { update(); - p->preview->update_extruder_selector(); p->sidebar->obj_list()->update_extruder_colors(); }