GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 21:57:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Convert filament_settings_id to something that can be set instead of just read from a configuration file."

Browse Source 
This reverts commit d9c1d459c5744aa880cd0c5e9093b0ee42f5321b.
This commit is contained in:
Joseph Lenox 2018-11-05 19:50:40 -06:00
parent 5509afa82a
commit 704429eb58
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Slic3r/GUI/PresetEditor.pm
View File

@ -1046,7 +1046,6 @@ sub build {
my $optgroup = $page->new_optgroup('Optional information');
$optgroup->append_single_option_line('filament_density', 0);
$optgroup->append_single_option_line('filament_cost', 0);
$optgroup->append_single_option_line('filament_settings_id', 0);
}
}

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

@ -447,15 +447,8 @@ PrintConfigDef::PrintConfigDef()
def->default_value = opt;
}
def = this->add("filament_settings_id", coStrings);
def->label = __TRANS("Custom GCode ID");
def->tooltip = __TRANS("Identifer for this filament. Used to mark specific filament profiles for custom gcode.");
def->cli = "filament-settings-id=s@";
{
ConfigOptionStrings* opt = new ConfigOptionStrings();
opt->values.push_back("");
def->default_value = opt;
}
def = this->add("filament_settings_id", coString);
def->default_value = new ConfigOptionString("");
def = this->add("fill_angle", coFloat);
def->label = __TRANS("Fill angle");

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

@ -336,7 +336,6 @@ class GCodeConfig : public virtual StaticPrintConfig
ConfigOptionFloats filament_cost;
ConfigOptionFloats filament_max_volumetric_speed;
ConfigOptionStrings filament_notes;
ConfigOptionStrings filament_settings_id;
ConfigOptionBool gcode_comments;
ConfigOptionEnum<GCodeFlavor> gcode_flavor;
ConfigOptionBool label_printed_objects;
@ -381,7 +380,6 @@ class GCodeConfig : public virtual StaticPrintConfig
OPT_PTR(filament_cost);
OPT_PTR(filament_max_volumetric_speed);
OPT_PTR(filament_notes);
OPT_PTR(filament_settings_id);
OPT_PTR(gcode_comments);
OPT_PTR(gcode_flavor);
OPT_PTR(label_printed_objects);