3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changed default values.

Browse source 
And bottle_volume is preferred to recalculation instead of bottle_weight
This commit is contained in:
YuSanka 2019-09-27 12:08:08 +02:00
parent 82bc243281
commit c370fccd8b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/PrintConfig.cpp
View file

@ -2409,7 +2409,7 @@ void PrintConfigDef::init_sla_params()
def->tooltip = L("Bottle volume"); def->tooltip = L("Bottle volume");
def->sidetext = L("ml"); def->sidetext = L("ml");
def->min = 50; def->min = 50;
def->set_default_value(new ConfigOptionFloat(960.0)); def->set_default_value(new ConfigOptionFloat(1000.0));
def = this->add("bottle_weight", coFloat); def = this->add("bottle_weight", coFloat);
def->label = L("Bottle weight"); def->label = L("Bottle weight");
@ -2423,7 +2423,7 @@ void PrintConfigDef::init_sla_params()
def->tooltip = L("Density"); def->tooltip = L("Density");
def->sidetext = L("g/ml"); def->sidetext = L("g/ml");
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionFloat(0.960)); def->set_default_value(new ConfigOptionFloat(1.0));
def = this->add("bottle_cost", coFloat); def = this->add("bottle_cost", coFloat);
def->label = L("Cost"); def->label = L("Cost");

4
src/slic3r/GUI/Tab.cpp
View file

@ -3417,8 +3417,8 @@ void TabSLAMaterial::build()
new_conf.set_key_value("bottle_volume", new ConfigOptionFloat(new_bottle_volume)); new_conf.set_key_value("bottle_volume", new ConfigOptionFloat(new_bottle_volume));
} }
if (opt_key == "material_density") { if (opt_key == "material_density") {
double new_bottle_weight = new_conf.option("bottle_volume")->getFloat() * boost::any_cast<double>(value) / 1000; double new_bottle_volume = new_conf.option("bottle_weight")->getFloat() * boost::any_cast<double>(value) * 1000;
new_conf.set_key_value("bottle_weight", new ConfigOptionFloat(new_bottle_weight)); new_conf.set_key_value("bottle_volume", new ConfigOptionFloat(new_bottle_volume));
} }
load_config(new_conf); load_config(new_conf);