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

Merge remote-tracking branch 'origin/master' into tm_colldetection_upgr

Browse source
This commit is contained in:
tamasmeszaros 2019-01-17 17:46:47 +01:00
commit 17bba23dba
9 changed files with 60 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libslic3r/GCodeReader.cpp
View file

@ -3,6 +3,7 @@
#include <boost/algorithm/string/split.hpp>
#include <fstream>
#include <iostream>
#include <iomanip>
#include <Shiny/Shiny.h>

6
src/libslic3r/PlaceholderParser.cpp
View file

@ -270,9 +270,9 @@ namespace client
{
std::string out;
switch (type) {
case TYPE_BOOL: out = boost::to_string(data.b); break;
case TYPE_INT: out = boost::to_string(data.i); break;
case TYPE_DOUBLE: out = boost::to_string(data.d); break;
case TYPE_BOOL: out = boost::lexical_cast<std::string>(data.b); break;
case TYPE_INT: out = boost::lexical_cast<std::string>(data.i); break;
case TYPE_DOUBLE: out = boost::lexical_cast<std::string>(data.d); break;
case TYPE_STRING: out = *data.s; break;
default: break;
}

1
src/libslic3r/Slicing.hpp
View file

@ -5,6 +5,7 @@
#include <set>
#include <vector>
#include <map>
#include "libslic3r.h"
namespace Slic3r

2
src/libslic3r/Technologies.hpp
View file

@ -60,3 +60,5 @@
#define ENABLE_MOVE_MIN_THRESHOLD (1 && ENABLE_1_42_0_ALPHA4)
// Modified initial default placement of generic subparts
#define ENABLE_GENERIC_SUBPARTS_PLACEMENT (1 && ENABLE_1_42_0_ALPHA4)
// Reworked management of bed shape changes
#define ENABLE_REWORKED_BED_SHAPE_CHANGE (1 && ENABLE_1_42_0_ALPHA4)