GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 19:15:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#147 remember the color choice if reslice.

Browse Source 
but on first colrprint, it switch, then never again
also on the first multi-extruder print.
also on every extruder count change
This commit is contained in:
supermerill 2020-06-11 00:21:49 +02:00 committed by supermerill
parent 653aa22757
commit 498c48580a
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -1,5 +1,4 @@
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "libslic3r/GCode/PreviewData.hpp"
#include "GUI_Preview.hpp" #include "GUI_Preview.hpp"
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "GUI.hpp" #include "GUI.hpp"
@ -358,13 +357,10 @@ void Preview::set_number_extruders(unsigned int number_extruders)
if (m_number_extruders != number_extruders) if (m_number_extruders != number_extruders)
{ {
m_number_extruders = number_extruders; m_number_extruders = number_extruders;
int tool_idx = m_choice_view_type->FindString(_(L("Tool"))); int type = (number_extruders > 1) ? (int)GCodePreviewData::Extrusion::Tool /* color by a tool number */ : 0; // color by a feature type
int type = (number_extruders > 1) ? tool_idx /* color by a tool number */ : 0; // color by a feature type
m_choice_view_type->SetSelection(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_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type; //m_preferred_color_mode = (type == tool_idx) ? "tool_or_feature" : "feature";
m_preferred_color_mode = (type == tool_idx) ? "tool_or_feature" : "feature";
} }
} }
@ -542,10 +538,12 @@ void Preview::on_size(wxSizeEvent& evt)
void Preview::on_choice_view_type(wxCommandEvent& evt) void Preview::on_choice_view_type(wxCommandEvent& evt)
{ {
m_preferred_color_mode = (m_choice_view_type->GetStringSelection() == L("Tool")) ? "tool" : "feature"; //m_preferred_color_mode = (m_choice_view_type->GetStringSelection() == L("Tool")) ? "tool" : "feature";
int selection = m_choice_view_type->GetCurrentSelection(); int selection = m_choice_view_type->GetCurrentSelection();
if ((0 <= selection) && (selection < (int)GCodePreviewData::Extrusion::Num_View_Types)) if ((0 <= selection) && (selection < (int)GCodePreviewData::Extrusion::Num_View_Types)) {
m_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)selection; m_last_choice = (GCodePreviewData::Extrusion::EViewType)selection;
m_gcode_preview_data->extrusion.view_type = m_last_choice;
}
reload_print(); reload_print();
} }
@ -592,20 +590,20 @@ void Preview::on_checkbox_legend(wxCommandEvent& evt)
void Preview::update_view_type(bool slice_completed) void Preview::update_view_type(bool slice_completed)
{ {
const DynamicPrintConfig& config = wxGetApp().preset_bundle->project_config; const DynamicPrintConfig& config = wxGetApp().preset_bundle->project_config;
bool has_color_print = !wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes.empty()/*&&
const wxString& choice = !wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes.empty() /*&& (wxGetApp().extruders_edited_cnt()==1 || !slice_completed) */;
(wxGetApp().extruders_edited_cnt()==1 || !slice_completed) */? bool has_multi_tool = config.option<ConfigOptionFloats>("wiping_volumes_matrix")->values.size() > 1;
_(L("Color Print")) : if (!m_has_switched_to_color && has_color_print) {
config.option<ConfigOptionFloats>("wiping_volumes_matrix")->values.size() > 1 ? m_last_choice = GCodePreviewData::Extrusion::ColorPrint;
_(L("Tool")) : m_has_switched_to_color = true;
_(L("Feature type")); } else if (!m_has_switched_to_extruders && has_multi_tool) {
m_last_choice = GCodePreviewData::Extrusion::Tool;
int type = m_choice_view_type->FindString(choice); m_has_switched_to_color = true;
if (m_choice_view_type->GetSelection() != type) { }
m_choice_view_type->SetSelection(type); if (m_last_choice != m_gcode_preview_data->extrusion.view_type) {
if (0 <= type && type < (int)GCodePreviewData::Extrusion::Num_View_Types) m_gcode_preview_data->extrusion.view_type = m_last_choice;
m_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type; m_choice_view_type->SetSelection(m_last_choice);
m_preferred_color_mode = "feature"; //m_preferred_color_mode = "feature";
} }
} }

7
src/slic3r/GUI/GUI_Preview.hpp
View File

@ -6,6 +6,7 @@
#include <string> #include <string>
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/GCode/PreviewData.hpp"
class wxNotebook; class wxNotebook;
class wxGLCanvas; class wxGLCanvas;
@ -101,7 +102,11 @@ class Preview : public wxPanel
std::function<void()> m_schedule_background_process; std::function<void()> m_schedule_background_process;
unsigned int m_number_extruders; unsigned int m_number_extruders;
std::string m_preferred_color_mode; std::string m_preferred_color_mode; // neutered / deprecated, ready to remove
//fields to see what color to display
GCodePreviewData::Extrusion::EViewType m_last_choice = GCodePreviewData::Extrusion::EViewType::FeatureType;
bool m_has_switched_to_color = false;
bool m_has_switched_to_extruders = false;
bool m_loaded; bool m_loaded;
bool m_enabled; bool m_enabled;