juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed an issue that translate object was not wrong (#5005)

Browse Source 
* fixed an issue that translate object was not wrong

* Display correct coordinate system name

* Update locale
This commit is contained in:
SoftFever
2024-04-15 23:02:21 +08:00
committed by GitHub
parent c9111b4851
commit 368c465a8c
20 changed files with 117 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
View File

@@ -267,7 +267,7 @@ void GizmoObjectManipulation::change_position_value(int axis, double value)
TransformationType trafo_type;
trafo_type.set_relative();
if (selection.requires_local_axes()) {
trafo_type.set_local();
trafo_type.set_instance();
}
selection.translate(position - m_cache.position, trafo_type);
m_glcanvas.do_move(L("Set Position"));
@@ -588,7 +588,12 @@ void GizmoObjectManipulation::do_render_move_window(ImGuiWrapper *imgui_wrapper,
float space_size = imgui_wrapper->get_style_scaling() * 8;
float position_size = imgui_wrapper->calc_text_size(_L("Position")).x + space_size;
float World_size = imgui_wrapper->calc_text_size(_L("World coordinates")).x + space_size;
auto position_title = _L("World coordinates");
Selection& selection = m_glcanvas.get_selection();
if(selection.is_single_modifier() || selection.is_single_volume())
position_title = _L("Object coordinates");
float World_size = imgui_wrapper->calc_text_size(position_title).x + space_size;
float caption_max = std::max(position_size, World_size) + 2 * space_size;
float end_text_size = imgui_wrapper->calc_text_size(this->m_new_unit_string).x;
@@ -609,7 +614,7 @@ void GizmoObjectManipulation::do_render_move_window(ImGuiWrapper *imgui_wrapper,
ImGui::AlignTextToFramePadding();
unsigned int current_active_id = ImGui::GetActiveID();
ImGui::PushItemWidth(caption_max);
imgui_wrapper->text(_L("World coordinates"));
imgui_wrapper->text(position_title);
ImGui::SameLine(caption_max + index * space_size);
ImGui::PushItemWidth(unit_size);
ImGui::TextAlignCenter("X");