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

FIX: remove duplicate flush_volumes

Browse source 
Change-Id: I86e3cc1ccd997e5c61915052e70c426bead289b1
(cherry picked from commit 1a615790fe0ac39d9ce0776079c34cf7f2c6217b)
This commit is contained in:
zhimin.zeng 2023-01-18 16:56:54 +08:00 • committed by Lane.Wei
parent 1fe0d7be8c
commit c0ee8d4f0f
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libslic3r/AppConfig.cpp
View file

@ -483,8 +483,6 @@ std::string AppConfig::load()
m_filament_presets = iter.value().get<std::vector<std::string>>(); m_filament_presets = iter.value().get<std::vector<std::string>>();
} else if (iter.key() == "filament_colors") { } else if (iter.key() == "filament_colors") {
m_filament_colors = iter.value().get<std::vector<std::string>>(); m_filament_colors = iter.value().get<std::vector<std::string>>();
} else if (iter.key() == "flushing_volumes") {
m_flush_volumes_matrix = iter.value().get<std::vector<float>>();
} }
else { else {
if (iter.value().is_string()) if (iter.value().is_string())
@ -577,10 +575,6 @@ void AppConfig::save()
j["app"]["filament_colors"].push_back(filament_color); j["app"]["filament_colors"].push_back(filament_color);
} }
for (double flushing_volume : m_flush_volumes_matrix) {
j["app"]["flushing_volumes"].push_back(flushing_volume);
}
// Write the other categories. // Write the other categories.
for (const auto& category : m_storage) { for (const auto& category : m_storage) {
if (category.first.empty()) if (category.first.empty())

6
src/libslic3r/AppConfig.hpp
View file

@ -177,11 +177,6 @@ public:
m_filament_colors = filament_colors; m_filament_colors = filament_colors;
m_dirty = true; m_dirty = true;
} }
const std::vector<float> &get_flush_volumes_matrix() const { return m_flush_volumes_matrix; }
void set_flush_volumes_matrix(const std::vector<float> &flush_volumes_matrix){
m_flush_volumes_matrix = flush_volumes_matrix;
m_dirty = true;
}
// return recent/last_opened_folder or recent/settings_folder or empty string. // return recent/last_opened_folder or recent/settings_folder or empty string.
std::string get_last_dir() const; std::string get_last_dir() const;
@ -281,7 +276,6 @@ private:
std::vector<std::string> m_filament_presets; std::vector<std::string> m_filament_presets;
std::vector<std::string> m_filament_colors; std::vector<std::string> m_filament_colors;
std::vector<float> m_flush_volumes_matrix;
}; };
} // namespace Slic3r } // namespace Slic3r