fix some bug

This commit is contained in:
QIDI TECH
2025-01-03 15:03:32 +08:00
parent 360ceaa458
commit a320582cdc
25 changed files with 141 additions and 100 deletions

View File

@@ -595,7 +595,7 @@ double getadhesionCoeff(const PrintObject* printObject)
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PCTG") {
adhesionCoeff = 2;
} else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" ||
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-AMS") {
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-BOX") {
adhesionCoeff = 0.5;
}
}

View File

@@ -3800,7 +3800,7 @@ double Model::getThermalLength(const ModelVolume* modelVolumePtr) {
if (Model::extruderParamsMap.at(aa).materialName == "PC") {
thermalLength = 40;
}
if (Model::extruderParamsMap.at(aa).materialName == "TPU" || Model::extruderParamsMap.at(aa).materialName == "TPU-AMS") {
if (Model::extruderParamsMap.at(aa).materialName == "TPU" || Model::extruderParamsMap.at(aa).materialName == "TPU-BOX") {
thermalLength = 1000;
}
@@ -3873,7 +3873,7 @@ double getadhesionCoeff(const ModelVolumePtrs objectVolumes)
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PCTG") {
adhesionCoeff = 2;
}
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" || Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-AMS") {
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU" || Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU-BOX") {
adhesionCoeff = 0.5;
}
}

View File

@@ -3829,7 +3829,12 @@ BoundingBoxf3 PrintInstance::get_bounding_box() {
Polygon PrintInstance::get_convex_hull_2d() {
Polygon poly = print_object->model_object()->convex_hull_2d(model_instance->get_matrix());
poly.douglas_peucker(0.1);
//y50
float distance_tolerance = 0.1;
while(poly.size() > 200){
poly.douglas_peucker(distance_tolerance);
distance_tolerance*=2;
}
return poly;
}

View File

@@ -43,8 +43,11 @@ void PrintBase::update_object_placeholders(DynamicConfig &config, const std::str
v_scale.push_back("x:" + boost::lexical_cast<std::string>(printable->get_scaling_factor(X) * 100) +
"% y:" + boost::lexical_cast<std::string>(printable->get_scaling_factor(Y) * 100) +
"% z:" + boost::lexical_cast<std::string>(printable->get_scaling_factor(Z) * 100) + "%");
if (input_file.empty())
input_file = model_object->name.empty() ? model_object->input_file : model_object->name;
if (input_file.empty())
input_file = model_object->name.empty() ? model_object->input_file : model_object->name;
//y51
else
input_file += (" + " + (model_object->name.empty() ? model_object->input_file : model_object->name));
}
}

View File

@@ -1444,12 +1444,12 @@ void PrintConfigDef::init_fff_params()
def = this->add("enable_pressure_advance", coBools);
def->label = L("Enable pressure advance");
def->tooltip = L("Enable pressure advance, auto calibration result will be overwriten once enabled. Useless for QIDI Printer");
def->tooltip = L("Enable pressure advance, auto calibration result will be overwriten once enabled.");
def->set_default_value(new ConfigOptionBools{ false });
def = this->add("pressure_advance", coFloats);
def->label = L("Pressure advance");
def->tooltip = L("Pressure advance(Klipper) AKA Linear advance factor(Marlin). Useless for QIDI Printer");
def->tooltip = L("Pressure advance(Klipper) AKA Linear advance factor(Marlin).");
def->max = 2;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats{ 0.02 });
@@ -1625,7 +1625,7 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("PETG");
def->enum_values.push_back("PCTG");
def->enum_values.push_back("TPU");
def->enum_values.push_back("TPU-AMS");
def->enum_values.push_back("TPU-BOX");
def->enum_values.push_back("PC");
def->enum_values.push_back("PA");
def->enum_values.push_back("PA-CF");