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

Added filament_ramming_parameters and filament_ramming_buttons into configuration layer

Browse source
This commit is contained in:
Lukas Matena 2018-03-14 15:48:37 +01:00
parent cf5dfb9673
commit 9f18b639a8
4 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
View file

@ -56,7 +56,7 @@ std::istream& operator>>(std::istream& stream, std::vector<T>& vect) {
we_read_something = true;
}
if (!stream.eof() && we_read_something) { // if this is not eof, we might be at separator - let's get rid of it
stream.clear(); // if we failed on very first line or reached eof, return stream in !good() state
stream.clear(); // if we failed on very first line or reached eof, return stream in good() state
stream.get(); // get() whatever we are stuck at
}
return stream;

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

@ -479,6 +479,18 @@ PrintConfigDef::PrintConfigDef()
def->min = 0;
def->default_value = new ConfigOptionInts { 14 };
def = this->add("filament_ramming_parameters", coStrings);
def->label = L("Ramming parameters");
def->tooltip = L("This string is edited by RammingDialog and contains ramming specific parameters ");
def->cli = "filament-ramming-parameters=s@";
def->default_value = new ConfigOptionStrings { "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0" };
def = this->add("filament_ramming_buttons", coStrings);
def->label = L("Draggable button in RammingDialog");
def->tooltip = L("This string is edited by RammingDialog and contains position of draggable buttons ");
def->cli = "filament-ramming-buttons=s@";
def->default_value = new ConfigOptionStrings { "0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" };
def = this->add("filament_diameter", coFloats);
def->label = L("Diameter");
def->tooltip = L("Enter your filament diameter here. Good precision is required, so use a caliper "

4
xs/src/libslic3r/PrintConfig.hpp
View file

@ -471,6 +471,8 @@ public:
ConfigOptionFloats filament_unloading_speed;
ConfigOptionFloats filament_toolchange_delay;
ConfigOptionInts filament_cooling_time;
ConfigOptionStrings filament_ramming_parameters;
ConfigOptionStrings filament_ramming_buttons;
ConfigOptionBool gcode_comments;
ConfigOptionEnum<GCodeFlavor> gcode_flavor;
ConfigOptionString layer_gcode;
@ -527,6 +529,8 @@ protected:
OPT_PTR(filament_unloading_speed);
OPT_PTR(filament_toolchange_delay);
OPT_PTR(filament_cooling_time);
OPT_PTR(filament_ramming_parameters);
OPT_PTR(filament_ramming_buttons);
OPT_PTR(gcode_comments);
OPT_PTR(gcode_flavor);
OPT_PTR(layer_gcode);

7
xs/src/slic3r/GUI/Preset.cpp
View file

@ -211,9 +211,10 @@ const std::vector<std::string>& Preset::filament_options()
static std::vector<std::string> s_opts {
"filament_colour", "filament_diameter", "filament_type", "filament_soluble", "filament_notes", "filament_max_volumetric_speed",
"extrusion_multiplier", "filament_density", "filament_cost", "filament_loading_speed", "filament_unloading_speed", "filament_toolchange_delay",
"filament_cooling_time", "temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", "fan_always_on", "cooling",
"min_fan_speed", "max_fan_speed", "bridge_fan_speed", "disable_fan_first_layers", "fan_below_layer_time", "slowdown_below_layer_time",
"min_print_speed", "start_filament_gcode", "end_filament_gcode","compatible_printers", "compatible_printers_condition"
"filament_cooling_time", "filament_ramming_buttons", "filament_ramming_parameters", "temperature", "first_layer_temperature", "bed_temperature",
"first_layer_bed_temperature", "fan_always_on", "cooling", "min_fan_speed", "max_fan_speed", "bridge_fan_speed", "disable_fan_first_layers",
"fan_below_layer_time", "slowdown_below_layer_time", "min_print_speed", "start_filament_gcode", "end_filament_gcode","compatible_printers",
"compatible_printers_condition"
};
return s_opts;
}