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

Fixed a few bugs with pad_enable and supports_enable

Browse Source
This commit is contained in:
tamasmeszaros 2018-11-30 14:26:41 +01:00
parent 62a3cb272e
commit f289efab23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/PrintConfig.cpp
View File

@ -2349,14 +2349,14 @@ void PrintConfigDef::init_sla_params()
def->tooltip = L("Width of the display"); def->tooltip = L("Width of the display");
def->cli = "display-width=f"; def->cli = "display-width=f";
def->min = 1; def->min = 1;
def->default_value = new ConfigOptionFloat(150.); def->default_value = new ConfigOptionFloat(120.);
def = this->add("display_height", coFloat); def = this->add("display_height", coFloat);
def->label = L("Display height"); def->label = L("Display height");
def->tooltip = L("Height of the display"); def->tooltip = L("Height of the display");
def->cli = "display-height=f"; def->cli = "display-height=f";
def->min = 1; def->min = 1;
def->default_value = new ConfigOptionFloat(100.); def->default_value = new ConfigOptionFloat(68.);
def = this->add("display_pixels_x", coInt); def = this->add("display_pixels_x", coInt);
def->full_label = L("Number of pixels in"); def->full_label = L("Number of pixels in");
@ -2364,14 +2364,14 @@ void PrintConfigDef::init_sla_params()
def->tooltip = L("Number of pixels in X"); def->tooltip = L("Number of pixels in X");
def->cli = "display-pixels-x=i"; def->cli = "display-pixels-x=i";
def->min = 100; def->min = 100;
def->default_value = new ConfigOptionInt(2000); def->default_value = new ConfigOptionInt(2560);
def = this->add("display_pixels_y", coInt); def = this->add("display_pixels_y", coInt);
def->label = ("Y"); def->label = ("Y");
def->tooltip = L("Number of pixels in Y"); def->tooltip = L("Number of pixels in Y");
def->cli = "display-pixels-y=i"; def->cli = "display-pixels-y=i";
def->min = 100; def->min = 100;
def->default_value = new ConfigOptionInt(1000); def->default_value = new ConfigOptionInt(1440);
def = this->add("printer_correction", coFloats); def = this->add("printer_correction", coFloats);
def->full_label = L("Printer scaling correction"); def->full_label = L("Printer scaling correction");

17
src/libslic3r/SLAPrint.cpp
View File

@ -927,8 +927,10 @@ bool SLAPrintObject::invalidate_state_by_config_options(const std::vector<t_conf
std::vector<SLAPrintObjectStep> steps; std::vector<SLAPrintObjectStep> steps;
bool invalidated = false; bool invalidated = false;
for (const t_config_option_key &opt_key : opt_keys) { for (const t_config_option_key &opt_key : opt_keys) {
if ( opt_key == "supports_enable" if( opt_key == "supports_enable") {
|| opt_key == "support_head_front_diameter" steps.emplace_back(slaposSupportPoints);
} else if (
opt_key == "support_head_front_diameter"
|| opt_key == "support_head_penetration" || opt_key == "support_head_penetration"
|| opt_key == "support_head_width" || opt_key == "support_head_width"
|| opt_key == "support_pillar_diameter" || opt_key == "support_pillar_diameter"
@ -1071,21 +1073,20 @@ TriangleMesh SLAPrintObject::get_mesh(SLAPrintObjectStep step) const
} }
} }
const TriangleMesh& SLAPrintObject::support_mesh() const const TriangleMesh& SLAPrintObject::support_mesh() const
{ {
if(m_supportdata && m_supportdata->support_tree_ptr) if(m_config.supports_enable.getBool() && m_supportdata &&
return m_supportdata->support_tree_ptr->merged_mesh(); m_supportdata->support_tree_ptr) return m_supportdata->support_tree_ptr->merged_mesh();
return EMPTY_MESH; return EMPTY_MESH;
} }
const TriangleMesh& SLAPrintObject::pad_mesh() const const TriangleMesh& SLAPrintObject::pad_mesh() const
{ {
if(!m_supportdata || !m_supportdata->support_tree_ptr) return EMPTY_MESH; if(m_config.pad_enable.getBool() && m_supportdata && m_supportdata->support_tree_ptr)
return m_supportdata->support_tree_ptr->get_pad();
return m_supportdata->support_tree_ptr->get_pad(); return EMPTY_MESH;
} }
const TriangleMesh &SLAPrintObject::transformed_mesh() const { const TriangleMesh &SLAPrintObject::transformed_mesh() const {