diff options
| author | supermerill <merill@free.fr> | 2020-06-04 21:50:26 +0300 |
|---|---|---|
| committer | supermerill <merill@free.fr> | 2020-06-04 21:50:26 +0300 |
| commit | 055cfb80c9f9850456067a03935c8c9ac18cfc42 (patch) | |
| tree | 0b17ea11003de05207294bdbc5757d350fb443e0 | |
| parent | 6a33909e79f3f4e178db6255bea3ea71e538b30f (diff) | |
#263 temperature calibration bugs with scaling by nozzle diameter.
| -rw-r--r-- | src/slic3r/GUI/CalibrationTempDialog.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/slic3r/GUI/CalibrationTempDialog.cpp b/src/slic3r/GUI/CalibrationTempDialog.cpp index 497defae6..29c631174 100644 --- a/src/slic3r/GUI/CalibrationTempDialog.cpp +++ b/src/slic3r/GUI/CalibrationTempDialog.cpp @@ -82,8 +82,7 @@ void CalibrationTempDialog::create_geometry(wxCommandEvent& event_args) { float xyzScale = nozzle_diameter / 0.4; //do scaling if (xyzScale < 0.9 || 1.1 < xyzScale) { - for (size_t i = 0; i < 5; i++) - model.objects[objs_idx[0]]->scale(xyzScale, xyzScale * 0.5, xyzScale); + model.objects[objs_idx[0]]->scale(xyzScale, xyzScale * 0.5, xyzScale); } else { xyzScale = 1; model.objects[objs_idx[0]]->scale(xyzScale, xyzScale * 0.5, xyzScale); @@ -99,7 +98,7 @@ void CalibrationTempDialog::create_geometry(wxCommandEvent& event_args) { } for (int16_t i = 1; i < nb_items; i++) { tower.push_back(add_part(model.objects[objs_idx[0]], Slic3r::resources_dir()+"/calibration/filament_temp/Smart_compact_temperature_calibration_item.amf", - Vec3d{ 0,0, zshift + i * 10 }, Vec3d{ xyzScale, xyzScale * 0.5, xyzScale })); + Vec3d{ 0,0, zshift + i * 10 * xyzScale }, Vec3d{ xyzScale, xyzScale * 0.5, xyzScale })); if (temperature - i * step_temp > 175 && temperature - i * step_temp < 290) { tower.push_back(add_part(model.objects[objs_idx[0]], Slic3r::resources_dir()+"/calibration/filament_temp/t" + std::to_string(temperature - i * step_temp) + ".amf", Vec3d{ xyzScale * 5, -xyzScale * 2.5, zshift + xyzScale * (i * 10 - 2.5) }, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 })); |