From c0ee8d4f0f0ff962cc88202067b35872fa0223e0 Mon Sep 17 00:00:00 2001
From: "zhimin.zeng" <zhimin.zeng@bambulab.com>
Date: Wed, 18 Jan 2023 16:56:54 +0800
Subject: [PATCH] FIX: remove duplicate flush_volumes

Change-Id: I86e3cc1ccd997e5c61915052e70c426bead289b1
(cherry picked from commit 1a615790fe0ac39d9ce0776079c34cf7f2c6217b)
---
 src/libslic3r/AppConfig.cpp | 6 ------
 src/libslic3r/AppConfig.hpp | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index 21415a12a..aa82a5a54 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -483,8 +483,6 @@ std::string AppConfig::load()
                             m_filament_presets = iter.value().get<std::vector<std::string>>();
                         } else if (iter.key() == "filament_colors") {
                             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 {
                             if (iter.value().is_string())
@@ -577,10 +575,6 @@ void AppConfig::save()
         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.
     for (const auto& category : m_storage) {
         if (category.first.empty())
diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
index 7886ad96d..62f5564f8 100644
--- a/src/libslic3r/AppConfig.hpp
+++ b/src/libslic3r/AppConfig.hpp
@@ -177,11 +177,6 @@ public:
         m_filament_colors = filament_colors;
         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.
 	std::string 		get_last_dir() const;
@@ -281,7 +276,6 @@ private:
 
 	std::vector<std::string>									m_filament_presets;
     std::vector<std::string>									m_filament_colors;
-    std::vector<float>											m_flush_volumes_matrix;
 };
 
 } // namespace Slic3r