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

Added updating for the Z_rotation after object selection changing

Browse Source
This commit is contained in:
YuSanka 2018-07-30 10:48:40 +02:00
parent c2993de6e0
commit b6d1d10502
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View File

@ -503,7 +503,7 @@ void add_object_settings(wxWindow* parent, wxBoxSizer* sizer)
def.gui_type = "legend"; def.gui_type = "legend";
def.tooltip = L("Object name"); def.tooltip = L("Object name");
def.full_width = true; def.full_width = true;
def.default_value = new ConfigOptionString{ "BlaBla_object.stl" }; def.default_value = new ConfigOptionString{ " " };
optgroup->append_single_option_line(Option(def, "object_name")); optgroup->append_single_option_line(Option(def, "object_name"));
optgroup->set_flag(ogSIDE_OPTIONS_VERTICAL); optgroup->set_flag(ogSIDE_OPTIONS_VERTICAL);
@ -1164,6 +1164,7 @@ void update_settings_value()
} }
g_is_percent_scale = boost::any_cast<wxString>(og->get_value("scale_unit")) == _("%"); g_is_percent_scale = boost::any_cast<wxString>(og->get_value("scale_unit")) == _("%");
update_scale_values(); update_scale_values();
update_rotation_values();
} }
void part_selection_changed() void part_selection_changed()
@ -1343,9 +1344,18 @@ void update_scale_values(const Pointf3& size, float scaling_factor)
} }
} }
void update_rotation_value() void update_rotation_values()
{ {
// update_rotation_values(0, 0, (*m_objects)[m_selected_object_id]->volumes[0]->get_angle_z()); auto og = get_optgroup(ogFrequentlyObjectSettings);
og->set_value("rotation_x", 0);
og->set_value("rotation_y", 0);
auto rotation_z = (*m_objects)[m_selected_object_id]->instances[0]->rotation;
auto deg = int(Geometry::rad2deg(rotation_z));
if (deg > 180) deg -= 360;
og->set_value("rotation_z", deg);
} }
void update_rotation_value(const double angle, const std::string& axis) void update_rotation_value(const double angle, const std::string& axis)

4
xs/src/slic3r/GUI/GUI_ObjectParts.hpp
View File

@ -103,7 +103,9 @@ void update_extruder_in_config(const wxString& selection);
// update scale values after scale unit changing or "gizmos" // update scale values after scale unit changing or "gizmos"
void update_scale_values(); void update_scale_values();
void update_scale_values(const Pointf3& size, float scale); void update_scale_values(const Pointf3& size, float scale);
// update rotation values after "gizmos" // update rotation values object selection changing
void update_rotation_values();
// update rotation value after "gizmos"
void update_rotation_value(const double angle, const std::string& axis); void update_rotation_value(const double angle, const std::string& axis);
} //namespace GUI } //namespace GUI
} //namespace Slic3r } //namespace Slic3r