mirror of
https://github.com/Denvi/FlatCAM.git
synced 2026-02-19 17:21:39 +01:00
Splitter width saved on app exit.
Workers threads count reduced to 2.
This commit is contained in:
@@ -182,7 +182,7 @@ class App(QtCore.QObject):
|
||||
|
||||
self.ui = FlatCAMGUI(self.version)
|
||||
self.connect(self.ui,
|
||||
QtCore.SIGNAL("geomUpdate(int, int, int, int)"),
|
||||
QtCore.SIGNAL("geomUpdate(int, int, int, int, int)"),
|
||||
self.save_geometry)
|
||||
|
||||
#### Plot Area ####
|
||||
@@ -937,11 +937,12 @@ class App(QtCore.QObject):
|
||||
return
|
||||
self.defaults.update(defaults)
|
||||
|
||||
def save_geometry(self, x, y, width, height):
|
||||
def save_geometry(self, x, y, width, height, notebook_width):
|
||||
self.defaults["def_win_x"] = x
|
||||
self.defaults["def_win_y"] = y
|
||||
self.defaults["def_win_w"] = width
|
||||
self.defaults["def_win_h"] = height
|
||||
self.defaults["def_notebook_width"] = notebook_width
|
||||
self.save_defaults()
|
||||
|
||||
def message_dialog(self, title, message, kind="info"):
|
||||
@@ -2307,10 +2308,14 @@ class App(QtCore.QObject):
|
||||
self.log.debug(" " + param + " OK!")
|
||||
|
||||
def restore_main_win_geom(self):
|
||||
self.ui.setGeometry(self.defaults["def_win_x"],
|
||||
self.defaults["def_win_y"],
|
||||
self.defaults["def_win_w"],
|
||||
self.defaults["def_win_h"])
|
||||
try:
|
||||
self.ui.setGeometry(self.defaults["def_win_x"],
|
||||
self.defaults["def_win_y"],
|
||||
self.defaults["def_win_w"],
|
||||
self.defaults["def_win_h"])
|
||||
self.ui.splitter.setSizes([self.defaults["def_notebook_width"], 0])
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
def plot_all(self):
|
||||
"""
|
||||
|
||||
@@ -5,7 +5,7 @@ from GUIElements import *
|
||||
class FlatCAMGUI(QtGui.QMainWindow):
|
||||
|
||||
# Emitted when persistent window geometry needs to be retained
|
||||
geom_update = QtCore.pyqtSignal(int, int, int, int, name='geomUpdate')
|
||||
geom_update = QtCore.pyqtSignal(int, int, int, int, int, name='geomUpdate')
|
||||
|
||||
def __init__(self, version):
|
||||
super(FlatCAMGUI, self).__init__()
|
||||
@@ -287,7 +287,7 @@ class FlatCAMGUI(QtGui.QMainWindow):
|
||||
|
||||
def closeEvent(self, event):
|
||||
grect = self.geometry()
|
||||
self.geom_update.emit(grect.x(), grect.y(), grect.width(), grect.height())
|
||||
self.geom_update.emit(grect.x(), grect.y(), grect.width(), grect.height(), self.splitter.sizes()[0])
|
||||
QtGui.qApp.quit()
|
||||
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class WorkerStack(QtCore.QObject):
|
||||
self.load = {} # {'worker_name': tasks_count}
|
||||
|
||||
# Create workers crew
|
||||
for i in range(0, multiprocessing.cpu_count()):
|
||||
for i in range(0, 2):
|
||||
worker = Worker(self, 'Slogger-' + str(i))
|
||||
thread = QtCore.QThread()
|
||||
|
||||
|
||||
@@ -25,8 +25,8 @@ include_files.append(("LICENSE", "LICENSE"))
|
||||
base = None
|
||||
|
||||
## Lets not open the console while running the app
|
||||
# if sys.platform == "win32":
|
||||
# base = "Win32GUI"
|
||||
if sys.platform == "win32":
|
||||
base = "Win32GUI"
|
||||
|
||||
buildOptions = dict(
|
||||
compressed=False,
|
||||
|
||||
Reference in New Issue
Block a user