Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuSanka <yusanka@gmail.com>2020-07-20 17:27:39 +0300
committerYuSanka <yusanka@gmail.com>2020-07-20 17:27:39 +0300
commit3d990a918904fb1ab10afa4f95f2885350821994 (patch)
treefef746b7840aff4308005f9ea59ef3218202ff08 /src/slic3r/GUI
parent72ec414f1e4492d67465efe368a4a224a21ed7eb (diff)
First try to convert a user printer profiles to the physical printers
Diffstat (limited to 'src/slic3r/GUI')
-rw-r--r--src/slic3r/GUI/PresetComboBoxes.cpp6
-rw-r--r--src/slic3r/GUI/PresetComboBoxes.hpp9
2 files changed, 9 insertions, 6 deletions
diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index bc1f48dd6..2d74344bd 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -131,6 +131,12 @@ PresetComboBox::~PresetComboBox()
{
}
+BitmapCache& PresetComboBox::bitmap_cache()
+{
+ static BitmapCache bmps;
+ return bmps;
+}
+
void PresetComboBox::set_label_marker(int item, LabelItemType label_item_type)
{
this->SetClientData(item, (void*)label_item_type);
diff --git a/src/slic3r/GUI/PresetComboBoxes.hpp b/src/slic3r/GUI/PresetComboBoxes.hpp
index 1cea97e41..89d043f7b 100644
--- a/src/slic3r/GUI/PresetComboBoxes.hpp
+++ b/src/slic3r/GUI/PresetComboBoxes.hpp
@@ -10,7 +10,7 @@
#include "libslic3r/Preset.hpp"
#include "wxExtensions.hpp"
#include "GUI_Utils.hpp"
-#include "BitmapCache.hpp"
+//#include "BitmapCache.hpp"
class wxString;
class wxTextCtrl;
@@ -22,7 +22,7 @@ namespace Slic3r {
namespace GUI {
-
+class BitmapCache;
// ---------------------------------
// *** PresetComboBox ***
// ---------------------------------
@@ -72,10 +72,7 @@ protected:
PresetCollection* m_collection {nullptr};
// Caching bitmaps for the all bitmaps, used in preset comboboxes
- static BitmapCache& bitmap_cache() {
- static BitmapCache bmps;
- return bmps;
- }
+ static BitmapCache& bitmap_cache();
// Indicator, that the preset is compatible with the selected printer.
ScalableBitmap m_bitmapCompatible;