3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
bubnikv 2019-03-17 09:33:11 +01:00
commit f5b30237ea
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/Plater.hpp
View file

@ -51,8 +51,6 @@ public:
int get_extruder_idx() const { return extruder_idx; } int get_extruder_idx() const { return extruder_idx; }
void check_selection(); void check_selection();
std::string selected_preset_name;
private: private:
typedef std::size_t Marker; typedef std::size_t Marker;
enum { LABEL_ITEM_MARKER = 0x4d }; enum { LABEL_ITEM_MARKER = 0x4d };

7
src/slic3r/GUI/Preset.cpp
View file

@ -879,8 +879,7 @@ size_t PresetCollection::update_compatible_internal(const Preset &active_printer
// Hide the // Hide the
void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui) void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui)
{ {
if (ui == nullptr || if (ui == nullptr)
ui->selected_preset_name == this->get_selected_preset().name)
return; return;
// Otherwise fill in the list from scratch. // Otherwise fill in the list from scratch.
@ -951,10 +950,6 @@ void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui)
ui->SetSelection(selected_preset_item); ui->SetSelection(selected_preset_item);
ui->SetToolTip(ui->GetString(selected_preset_item)); ui->SetToolTip(ui->GetString(selected_preset_item));
ui->Thaw(); ui->Thaw();
// For printer preset it's important to update preset list every time because of ConfigWizard
// So, don't save selected preset name
ui->selected_preset_name = type()==Preset::TYPE_PRINTER ? "" : this->get_selected_preset().name;
} }
size_t PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompatible) size_t PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompatible)

5
src/slic3r/GUI/PresetBundle.cpp
View file

@ -1436,8 +1436,7 @@ bool PresetBundle::parse_color(const std::string &scolor, unsigned char *rgb_out
void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::PresetComboBox *ui) void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::PresetComboBox *ui)
{ {
if (ui == nullptr || this->printers.get_edited_preset().printer_technology() == ptSLA || if (ui == nullptr || this->printers.get_edited_preset().printer_technology() == ptSLA ||
this->filament_presets.size() <= idx_extruder || this->filament_presets.size() <= idx_extruder )
ui->selected_preset_name == this->filaments.find_preset(this->filament_presets[idx_extruder])->name)
return; return;
unsigned char rgb[3]; unsigned char rgb[3];
@ -1526,8 +1525,6 @@ void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::Pr
ui->SetSelection(selected_preset_item); ui->SetSelection(selected_preset_item);
ui->SetToolTip(ui->GetString(selected_preset_item)); ui->SetToolTip(ui->GetString(selected_preset_item));
ui->Thaw(); ui->Thaw();
ui->selected_preset_name = this->filaments.find_preset(this->filament_presets[idx_extruder])->name;
} }
void PresetBundle::set_default_suppressed(bool default_suppressed) void PresetBundle::set_default_suppressed(bool default_suppressed)