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

Fixed typo in LambdaObjectDialog. It was a reason of the wrong cube size updating for generic modifier "Cube".

Browse Source 
+ some code cleaning
This commit is contained in:
YuSanka 2018-08-15 12:47:46 +02:00
parent 3e549c153d
commit 76249e5625
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,14 +690,12 @@ void set_object_scale(int idx, int scale)
void unselect_objects() void unselect_objects()
{ {
printf("UNSELECT OBJECTS\n"); if (!m_objects_ctrl->GetSelection())
return;
g_prevent_list_events = true; g_prevent_list_events = true;
if (m_objects_ctrl->GetSelection()) {
m_objects_ctrl->UnselectAll(); m_objects_ctrl->UnselectAll();
part_selection_changed(); part_selection_changed();
}
else
printf("all items are UNSELECTED\n");
g_prevent_list_events = false; g_prevent_list_events = false;
} }
@ -1327,7 +1325,6 @@ void update_settings_value()
og->set_value("scale_x", 0); og->set_value("scale_x", 0);
og->set_value("scale_y", 0); og->set_value("scale_y", 0);
og->set_value("scale_z", 0); og->set_value("scale_z", 0);
printf("return because of unselect\n");
og->disable(); og->disable();
return; return;
} }
@ -1478,7 +1475,6 @@ void set_extruder_column_hidden(bool hide)
void update_extruder_in_config(const wxString& selection) void update_extruder_in_config(const wxString& selection)
{ {
printf("BEGIN OF update_extruder_in_config\n");
if (!m_config || selection.empty()) if (!m_config || selection.empty())
return; return;
@ -1489,7 +1485,6 @@ void update_extruder_in_config(const wxString& selection)
wxCommandEvent e(m_event_update_scene); wxCommandEvent e(m_event_update_scene);
get_main_frame()->ProcessWindowEvent(e); get_main_frame()->ProcessWindowEvent(e);
} }
printf("END OF update_extruder_in_config\n");
} }
void update_scale_values() void update_scale_values()
@ -1612,7 +1607,7 @@ void on_drop(wxDataViewEvent &event)
void update_objects_list_extruder_column(const int extruders_count) void update_objects_list_extruder_column(const int extruders_count)
{ {
// delete old 3rd column // delete old 3rd column
m_objects_ctrl->DeleteColumn(m_objects_ctrl->GetColumnAt(3)); m_objects_ctrl->DeleteColumn(m_objects_ctrl->GetColumn(3));
// insert new created 3rd column // insert new created 3rd column
m_objects_ctrl->InsertColumn(3, object_ctrl_create_extruder_column(extruders_count)); m_objects_ctrl->InsertColumn(3, object_ctrl_create_extruder_column(extruders_count));
// set show/hide for this column // set show/hide for this column

6
xs/src/slic3r/GUI/LambdaObjectDialog.cpp
View File

@ -30,9 +30,9 @@ LambdaObjectDialog::LambdaObjectDialog(wxWindow* parent)
auto optgroup = init_modificator_options_page(_(L("Box"))); auto optgroup = init_modificator_options_page(_(L("Box")));
optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value){ optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value){
int opt_id = opt_key == "L" ? 0 : int opt_id = opt_key == "l" ? 0 :
opt_key == "W" ? 1 : opt_key == "w" ? 1 :
opt_key == "L" ? 2 : -1; opt_key == "h" ? 2 : -1;
if (opt_id < 0) return; if (opt_id < 0) return;
object_parameters.dim[opt_id] = boost::any_cast<double>(value); object_parameters.dim[opt_id] = boost::any_cast<double>(value);
}; };