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

Follow-up of 4979f9e36a - Gizmo measure - Another distance renaming

Browse Source
This commit is contained in:
enricoturri1966 2022-12-14 12:15:37 +01:00
parent 4979f9e36a
commit 9a0d3cb1ff
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -2040,18 +2040,21 @@ void GLGizmoMeasure::on_render_input_window(float x, float y, float bottom_limit
++measure_row_count; ++measure_row_count;
ImGui::PopID(); ImGui::PopID();
} }
const bool show_strict = measure.distance_strict.has_value() &&
(!measure.distance_infinite.has_value() || std::abs(measure.distance_strict->dist - measure.distance_infinite->dist) > EPSILON);
if (measure.distance_infinite.has_value()) { if (measure.distance_infinite.has_value()) {
double distance = measure.distance_infinite->dist; double distance = measure.distance_infinite->dist;
if (use_inches) if (use_inches)
distance = ObjectManipulation::mm_to_in * distance; distance = ObjectManipulation::mm_to_in * distance;
ImGui::PushID("ClipboardDistanceInfinite"); ImGui::PushID("ClipboardDistanceInfinite");
add_measure_row_to_table(_u8L("Perpendicular distance"), ImGuiWrapper::COL_ORANGE_LIGHT, format_double(distance) + units, add_measure_row_to_table(show_strict ? _u8L("Perpendicular distance") : _u8L("Distance"), ImGuiWrapper::COL_ORANGE_LIGHT, format_double(distance) + units,
ImGui::GetStyleColorVec4(ImGuiCol_Text)); ImGui::GetStyleColorVec4(ImGuiCol_Text));
++measure_row_count; ++measure_row_count;
ImGui::PopID(); ImGui::PopID();
} }
if (measure.distance_strict.has_value() && if (show_strict) {
(!measure.distance_infinite.has_value() || std::abs(measure.distance_strict->dist - measure.distance_infinite->dist) > EPSILON)) {
double distance = measure.distance_strict->dist; double distance = measure.distance_strict->dist;
if (use_inches) if (use_inches)
distance = ObjectManipulation::mm_to_in * distance; distance = ObjectManipulation::mm_to_in * distance;