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

Adds printer notes item and tab. Fixes #3806

Browse Source
This commit is contained in:
Joseph Lenox 2017-04-02 23:35:20 -05:00
parent 90623c4170
commit c110a9d517
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1167,10 +1167,12 @@ sub options {
use_firmware_retraction pressure_advance vibration_limit use_firmware_retraction pressure_advance vibration_limit
use_volumetric_e use_volumetric_e
start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode
notes
nozzle_diameter extruder_offset nozzle_diameter extruder_offset
retract_length retract_lift retract_speed retract_restart_extra retract_before_travel retract_layer_change wipe retract_length retract_lift retract_speed retract_restart_extra retract_before_travel retract_layer_change wipe
retract_length_toolchange retract_restart_extra_toolchange retract_lift_above retract_lift_below retract_length_toolchange retract_restart_extra_toolchange retract_lift_above retract_lift_below
printer_settings_id printer_settings_id
printer_notes
); );
} }
@ -1367,9 +1369,21 @@ sub build {
$optgroup->append_single_option_line($option); $optgroup->append_single_option_line($option);
} }
} }
$self->{extruder_pages} = []; $self->{extruder_pages} = [];
$self->_build_extruder_pages; $self->_build_extruder_pages;
{
my $page = $self->add_options_page('Notes', 'note.png');
{
my $optgroup = $page->new_optgroup('Notes',
label_width => 0,
);
my $option = $optgroup->get_option('notes');
$option->full_width(1);
$option->height(250);
$optgroup->append_single_option_line($option);
}
}
$self->_update_serial_ports unless $Slic3r::GUI::Settings->{_}{no_controller}; $self->_update_serial_ports unless $Slic3r::GUI::Settings->{_}{no_controller};
} }

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

@ -914,6 +914,19 @@ PrintConfigDef::PrintConfigDef()
def->height = 60; def->height = 60;
def->default_value = new ConfigOptionStrings(); def->default_value = new ConfigOptionStrings();
def = this->add("printer_notes", coStrings);
def->label = "Printer notes";
def->tooltip = "You can put your notes regarding the printer here.";
def->cli = "printer-notes=s@";
def->multiline = true;
def->full_width = true;
def->height = 130;
{
ConfigOptionStrings* opt = new ConfigOptionStrings();
opt->values.push_back("");
def->default_value = opt;
}
def = this->add("print_settings_id", coString); def = this->add("print_settings_id", coString);
def->default_value = new ConfigOptionString(""); def->default_value = new ConfigOptionString("");

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

@ -418,6 +418,7 @@ class PrintConfig : public GCodeConfig
ConfigOptionString output_filename_format; ConfigOptionString output_filename_format;
ConfigOptionFloat perimeter_acceleration; ConfigOptionFloat perimeter_acceleration;
ConfigOptionStrings post_process; ConfigOptionStrings post_process;
ConfigOptionStrings printer_notes;
ConfigOptionFloat resolution; ConfigOptionFloat resolution;
ConfigOptionFloats retract_before_travel; ConfigOptionFloats retract_before_travel;
ConfigOptionBools retract_layer_change; ConfigOptionBools retract_layer_change;
@ -480,6 +481,7 @@ class PrintConfig : public GCodeConfig
OPT_PTR(output_filename_format); OPT_PTR(output_filename_format);
OPT_PTR(perimeter_acceleration); OPT_PTR(perimeter_acceleration);
OPT_PTR(post_process); OPT_PTR(post_process);
OPT_PTR(printer_notes);
OPT_PTR(resolution); OPT_PTR(resolution);
OPT_PTR(retract_before_travel); OPT_PTR(retract_before_travel);
OPT_PTR(retract_layer_change); OPT_PTR(retract_layer_change);