- small fixes: selected object in Project used to ask twice for UI build; if scale factor in Object UI is 1 do nothing as there is no point in scaling with a factor of 1
This commit is contained in:
parent
1b37b5a487
commit
2baae550b5
|
@ -8075,7 +8075,7 @@ class App(QtCore.QObject):
|
||||||
if index.isValid():
|
if index.isValid():
|
||||||
if index.internalPointer().parent_item != self.collection.root_item:
|
if index.internalPointer().parent_item != self.collection.root_item:
|
||||||
self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
|
self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
|
||||||
self.collection.on_item_activated(index)
|
# self.collection.on_item_activated(index)
|
||||||
|
|
||||||
def on_row_selected(self, obj_name):
|
def on_row_selected(self, obj_name):
|
||||||
# this is a special string; when received it will make all entries unchecked
|
# this is a special string; when received it will make all entries unchecked
|
||||||
|
|
|
@ -261,9 +261,13 @@ class FlatCAMObj(QtCore.QObject):
|
||||||
self.app.worker_task.emit({'fcn': worker_task, 'params': []})
|
self.app.worker_task.emit({'fcn': worker_task, 'params': []})
|
||||||
|
|
||||||
def on_scale_button_click(self):
|
def on_scale_button_click(self):
|
||||||
log.debug("FlatCAMObj.on_scale_button_click()")
|
|
||||||
self.read_form()
|
self.read_form()
|
||||||
factor = self.ui.scale_entry.get_value()
|
factor = self.ui.scale_entry.get_value()
|
||||||
|
# if factor is 1.0 do nothing, there is no point in scaling with a factor of 1.0
|
||||||
|
if factor == 1.0:
|
||||||
|
return
|
||||||
|
|
||||||
|
log.debug("FlatCAMObj.on_scale_button_click()")
|
||||||
|
|
||||||
def worker_task():
|
def worker_task():
|
||||||
with self.app.proc_container.new(_("Scaling...")):
|
with self.app.proc_container.new(_("Scaling...")):
|
||||||
|
|
|
@ -831,8 +831,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
|
||||||
try:
|
try:
|
||||||
a_idx.build_ui()
|
a_idx.build_ui()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.app.inform.emit('[ERROR] %s: %s' %
|
self.app.inform.emit('[ERROR] %s: %s' % (_("Cause of error"), str(e)))
|
||||||
(_("Cause of error"), str(e)))
|
|
||||||
raise
|
raise
|
||||||
|
|
||||||
def get_list(self):
|
def get_list(self):
|
||||||
|
|
|
@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
- Calibrate Tool - rearranged the GUI
|
- Calibrate Tool - rearranged the GUI
|
||||||
- in Geometry UI made sure that the Label that points to the Tool parameters show clearly that those parameters apply only for the selected tool
|
- in Geometry UI made sure that the Label that points to the Tool parameters show clearly that those parameters apply only for the selected tool
|
||||||
- fixed an small issue in Object UI
|
- fixed an small issue in Object UI
|
||||||
|
- small fixes: selected object in Project used to ask twice for UI build; if scale factor in Object UI is 1 do nothing as there is no point in scaling with a factor of 1
|
||||||
|
|
||||||
7.12.2019
|
7.12.2019
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue