3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation on OSX

Browse Source
This commit is contained in:
bubnikv 2017-06-13 12:09:49 +02:00
parent a4992602ee
commit f7831240e1
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Slic3r/GUI/Tab.pm
View File

@ -1233,7 +1233,7 @@ sub build {
serial_port serial_speed serial_port serial_speed
octoprint_host octoprint_apikey octoprint_host octoprint_apikey
use_firmware_retraction use_firmware_retraction
use_volumetric_e set_and_wait_temperatures variable_layer_height use_volumetric_e variable_layer_height
single_extruder_multi_material start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode single_extruder_multi_material start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode
nozzle_diameter extruder_offset nozzle_diameter extruder_offset
retract_length retract_lift retract_speed deretract_speed retract_before_wipe retract_restart_extra retract_before_travel retract_layer_change wipe retract_length retract_lift retract_speed deretract_speed retract_before_wipe retract_restart_extra retract_before_travel retract_layer_change wipe
@ -1440,7 +1440,6 @@ sub build {
$optgroup->append_single_option_line('use_firmware_retraction'); $optgroup->append_single_option_line('use_firmware_retraction');
$optgroup->append_single_option_line('use_volumetric_e'); $optgroup->append_single_option_line('use_volumetric_e');
$optgroup->append_single_option_line('variable_layer_height'); $optgroup->append_single_option_line('variable_layer_height');
$optgroup->append_single_option_line('set_and_wait_temperatures');
} }
} }
{ {

3
xs/src/libslic3r/Model.hpp
View File

@ -14,6 +14,7 @@
namespace Slic3r { namespace Slic3r {
class Model;
class ModelInstance; class ModelInstance;
class ModelMaterial; class ModelMaterial;
class ModelObject; class ModelObject;
@ -38,7 +39,7 @@ public:
// Dynamic configuration storage for the object specific configuration values, overriding the global configuration. // Dynamic configuration storage for the object specific configuration values, overriding the global configuration.
DynamicPrintConfig config; DynamicPrintConfig config;
Model* get_model() const { return m_model; }; Model* get_model() const { return m_model; }
void apply(const t_model_material_attributes &attributes) void apply(const t_model_material_attributes &attributes)
{ this->attributes.insert(attributes.begin(), attributes.end()); } { this->attributes.insert(attributes.begin(), attributes.end()); }

1
xs/src/libslic3r/Print.cpp
View File

@ -148,7 +148,6 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
steps_ignore.insert("use_firmware_retraction"); steps_ignore.insert("use_firmware_retraction");
steps_ignore.insert("use_relative_e_distances"); steps_ignore.insert("use_relative_e_distances");
steps_ignore.insert("use_volumetric_e"); steps_ignore.insert("use_volumetric_e");
steps_ignore.insert("set_and_wait_temperatures");
steps_ignore.insert("variable_layer_height"); steps_ignore.insert("variable_layer_height");
steps_ignore.insert("wipe"); steps_ignore.insert("wipe");
} }

6
xs/src/libslic3r/PrintConfig.cpp
View File

@ -1537,12 +1537,6 @@ PrintConfigDef::PrintConfigDef()
def->cli = "use-volumetric-e!"; def->cli = "use-volumetric-e!";
def->default_value = new ConfigOptionBool(false); def->default_value = new ConfigOptionBool(false);
def = this->add("set_and_wait_temperatures", coBool);
def->label = "Use Set and Wait for changing bed temperatures";
def->tooltip = "Check this to change gcode for temperature changes from not waiting (usually M140) to waiting (usually M190). Only necessary if you have a slow-to-heat bed and the first layer bed temp is lower than the other layers.";
def->cli = "set-and-wait-temperatures!";
def->default_value = new ConfigOptionBool(false);
def = this->add("variable_layer_height", coBool); def = this->add("variable_layer_height", coBool);
def->label = "Enable variable layer height feature"; def->label = "Enable variable layer height feature";
def->tooltip = "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default."; def->tooltip = "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default.";

2
xs/src/libslic3r/PrintConfig.hpp
View File

@ -359,7 +359,6 @@ public:
ConfigOptionBool use_firmware_retraction; ConfigOptionBool use_firmware_retraction;
ConfigOptionBool use_relative_e_distances; ConfigOptionBool use_relative_e_distances;
ConfigOptionBool use_volumetric_e; ConfigOptionBool use_volumetric_e;
ConfigOptionBool set_and_wait_temperatures;
ConfigOptionBool variable_layer_height; ConfigOptionBool variable_layer_height;
GCodeConfig(bool initialize = true) : StaticPrintConfig() { GCodeConfig(bool initialize = true) : StaticPrintConfig() {
@ -404,7 +403,6 @@ public:
OPT_PTR(use_firmware_retraction); OPT_PTR(use_firmware_retraction);
OPT_PTR(use_relative_e_distances); OPT_PTR(use_relative_e_distances);
OPT_PTR(use_volumetric_e); OPT_PTR(use_volumetric_e);
OPT_PTR(set_and_wait_temperatures);
OPT_PTR(variable_layer_height); OPT_PTR(variable_layer_height);
return NULL; return NULL;
}; };