Merged with Vojtech's branch

This commit is contained in:
bubnikv
2018-04-13 16:19:27 +02:00
18 changed files with 365 additions and 100 deletions

View File

@@ -4,6 +4,9 @@
#include "ConfigWizard.hpp"
#include <vector>
#include <set>
#include <unordered_map>
#include <boost/filesystem.hpp>
#include <wx/sizer.h>
#include <wx/panel.h>
@@ -13,13 +16,15 @@
#include "libslic3r/PrintConfig.hpp"
#include "AppConfig.hpp"
#include "PresetBundle.hpp"
#include "Preset.hpp"
#include "BedShapeDialog.hpp"
namespace fs = boost::filesystem;
namespace Slic3r {
namespace GUI {
// typedef std::unordered_map<std::string, VendorProfile> VendorMap;
enum {
CONTENT_WIDTH = 500,
@@ -167,8 +172,9 @@ private:
struct ConfigWizard::priv
{
ConfigWizard *q;
AppConfig appconfig_vendors;
PresetBundle bundle_vendors;
AppConfig appconfig_vendors; // TODO: use order-preserving container
std::unordered_map<std::string, VendorProfile> vendors; // TODO: just set?
std::unordered_map<std::string, fs::path> vendors_rsrc;
std::unique_ptr<DynamicPrintConfig> custom_config;
wxBoxSizer *topsizer = nullptr;