3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-28 03:01:17 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

PhysicalPrinterCollection: Use select_preset() instead of select_preset_by_name()

Browse source 
+ changed signature for select_preset()
This commit is contained in:
YuSanka 2020-07-23 12:17:18 +02:00
parent 299b783601
commit a4c12b90f1
5 changed files with 23 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/libslic3r/Preset.cpp
View file

@ -1731,34 +1731,27 @@ std::string PhysicalPrinterCollection::get_selected_full_printer_name() const
return (m_idx_selected == size_t(-1)) ? std::string() : this->get_selected_printer().get_full_name(m_selected_preset);
}
PhysicalPrinter& PhysicalPrinterCollection::select_printer_by_name(const std::string& full_name)
void PhysicalPrinterCollection::select_printer(const std::string& full_name)
{
std::string printer_name = PhysicalPrinter::get_short_name(full_name);
auto it = this->find_printer_internal(printer_name);
assert(it != m_printers.end());
if (it == m_printers.end()) {
unselect_printer();
return;
}
// update idx_selected
m_idx_selected = it - m_printers.begin();
m_idx_selected = it - m_printers.begin();
// update name of the currently selected preset
m_selected_preset = it->get_preset_name(full_name);
if (m_selected_preset.empty())
if (printer_name == full_name)
// use first preset in the list
m_selected_preset = *it->preset_names.begin();
return *it;
else
m_selected_preset = it->get_preset_name(full_name);
}
PhysicalPrinter& PhysicalPrinterCollection::select_printer(const std::string& printer_name)
{
auto it = this->find_printer_internal(printer_name);
assert(it != m_printers.end());
// update idx_selected
m_idx_selected = it - m_printers.begin();
// update name of the currently selected preset
m_selected_preset = *it->preset_names.begin();
return *it;
}
PhysicalPrinter& PhysicalPrinterCollection::select_printer(const PhysicalPrinter& printer)
void PhysicalPrinterCollection::select_printer(const PhysicalPrinter& printer)
{
return select_printer(printer.name);
}

14
src/libslic3r/Preset.hpp
View file

@ -666,13 +666,13 @@ public:
// Returns the printer model of the selected preset, or an empty string if no preset is selected.
std::string get_selected_printer_preset_name() const { return (m_idx_selected == size_t(-1)) ? std::string() : m_selected_preset; }
// select printer with name and return reference on it
PhysicalPrinter& select_printer_by_name(const std::string& full_name);
PhysicalPrinter& select_printer(const std::string &printer_name);
PhysicalPrinter& select_printer(const PhysicalPrinter& printer);
bool has_selection() const;
void unselect_printer() ;
bool is_selected(ConstIterator it, const std::string &preset_name) const;
// Select printer by the full printer name, which contains name of printer, separator and name of selected preset
// If full_name doesn't contain name of selected preset, then select first preset in the list for this printer
void select_printer(const std::string& full_name);
void select_printer(const PhysicalPrinter& printer);
bool has_selection() const;
void unselect_printer() ;
bool is_selected(ConstIterator it, const std::string &preset_name) const;
// Return a printer by an index. If the printer is active, a temporary copy is returned.
PhysicalPrinter& printer(size_t idx) { return m_printers[idx]; }

2
src/libslic3r/PresetBundle.cpp
View file

@ -436,7 +436,7 @@ void PresetBundle::load_selections(AppConfig &config, const std::string &preferr
// Activate physical printer from the config
if (!initial_physical_printer_name.empty())
physical_printers.select_printer_by_name(initial_physical_printer_name);
physical_printers.select_printer(initial_physical_printer_name);
}
// Export selections (current print, current filaments, current printer) into config.ini