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

Merge remote-tracking branch 'origin/updating' into config_snapshots

Browse source
This commit is contained in:
bubnikv 2018-04-10 16:46:15 +02:00
commit 4275b15dcd
40 changed files with 3378 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xs/src/libslic3r/Config.hpp
View file

@ -659,6 +659,7 @@ public:
ConfigOptionPoints() : ConfigOptionVector<Pointf>() {}
explicit ConfigOptionPoints(size_t n, const Pointf &value) : ConfigOptionVector<Pointf>(n, value) {}
explicit ConfigOptionPoints(std::initializer_list<Pointf> il) : ConfigOptionVector<Pointf>(std::move(il)) {}
explicit ConfigOptionPoints(const std::vector<Pointf> &values) : ConfigOptionVector<Pointf>(values) {}
static ConfigOptionType static_type() { return coPoints; }
ConfigOptionType type() const override { return static_type(); }

2
xs/src/libslic3r/PrintConfig.cpp
View file

@ -1620,7 +1620,7 @@ PrintConfigDef::PrintConfigDef()
"temperature control commands in the output.");
def->cli = "temperature=i@";
def->full_label = L("Temperature");
def->max = 0;
def->min = 0;
def->max = max_temp;
def->default_value = new ConfigOptionInts { 200 };

2
xs/src/libslic3r/Utils.hpp
View file

@ -3,6 +3,8 @@
#include <locale>
#include "libslic3r.h"
namespace Slic3r {
extern void set_logging_level(unsigned int level);

2
xs/src/libslic3r/utils.cpp
View file

@ -119,7 +119,7 @@ static std::string g_data_dir;
void set_data_dir(const std::string &dir)
{
g_data_dir = dir;
g_data_dir = dir + "-alpha"; // FIXME: Resolve backcompat problems
}
const std::string& data_dir()