- updated the Readme file - MacOS installation instructions to ensure that the gdal package is installed correctly
- some minor other changes in the quit_application()
This commit is contained in:
Marius Stanciu
@@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta
|
||||
- Cleaned the GUI in Excellon Preferences of parameters no longer used (transferred to Drilling Tool)
|
||||
- Removed warning message boxes from export DXF/SVG handlers of the menu entries in the File menu and upgraded the status bar message to error
|
||||
- reactivated the close_app Qt signal mechanism
|
||||
- updated the Readme file - MacOS installation instructions to ensure that the gdal package is installed correctly
|
||||
|
||||
20.11.2020
|
||||
|
||||
|
||||
22
README.md
22
README.md
@@ -62,6 +62,15 @@ cd D:\FlatCAM_beta
|
||||
python FlatCAM.py
|
||||
|
||||
2.Linux
|
||||
- create a folder to hold the sources somewhere on your HDD:
|
||||
mkdir FlatCAM-beta
|
||||
|
||||
- unzip in this folder the sources downloaded from https://bitbucket.org/jpcgt/flatcam/downloads/
|
||||
Using commands (e.g using the sources for FlatCAM beta 8.995):
|
||||
cd ~/FlatCAM-beta
|
||||
wget https://bitbucket.org/jpcgt/flatcam/downloads/FlatCAM_beta_8.995_sources.zip
|
||||
unzip FlatCAM_beta_8.995_sources.zip
|
||||
cd FlatCAM_beta_8.995_sources
|
||||
|
||||
- make sure that Python 3.8 is installed on your OS and that the command: python3 -V confirm it
|
||||
- verify that the pip package is installed for your Python installation (e.g 3.8) by running the command:
|
||||
@@ -101,14 +110,14 @@ sudo make install
|
||||
Instructions from here: https://gist.github.com/natevw/3e6fc929aff358b38c0a#gistcomment-3111878
|
||||
|
||||
- create a folder to hold the sources somewhere on your HDD:
|
||||
mkdir FlatCAM
|
||||
mkdir FlatCAM-beta
|
||||
|
||||
- unzip in this folder the sources downloaded from https://bitbucket.org/jpcgt/flatcam/downloads/
|
||||
Using commands (e.g using the sources for FlatCAM beta 8.991):
|
||||
cd ~/FlatCAM
|
||||
wget https://bitbucket.org/jpcgt/flatcam/downloads/FlatCAM_beta_8.991_sources.zip
|
||||
unzip FlatCAM_beta_8.991_sources.zip
|
||||
cd FlatCAM_beta_8.991_sources
|
||||
Using commands (e.g using the sources for FlatCAM beta 8.995):
|
||||
cd ~/FlatCAM-beta
|
||||
wget https://bitbucket.org/jpcgt/flatcam/downloads/FlatCAM_beta_8.995_sources.zip
|
||||
unzip FlatCAM_beta_8.995_sources.zip
|
||||
cd FlatCAM_beta_8.995_sources
|
||||
|
||||
- check if Homebrew is installed:
|
||||
xcode-select --install
|
||||
@@ -116,6 +125,7 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
|
||||
|
||||
- install dependencies:
|
||||
brew install pyqt
|
||||
brew install gdal
|
||||
python3 -m ensurepip
|
||||
python3 -m pip install -r requirements.txt
|
||||
|
||||
|
||||
43
app_Main.py
43
app_Main.py
@@ -289,6 +289,20 @@ class App(QtCore.QObject):
|
||||
# when True, the app has to return from any thread
|
||||
self.abort_flag = False
|
||||
|
||||
# ###########################################################################################################
|
||||
# ############################################ Data #########################################################
|
||||
# ###########################################################################################################
|
||||
|
||||
self.recent = []
|
||||
self.recent_projects = []
|
||||
|
||||
self.clipboard = QtWidgets.QApplication.clipboard()
|
||||
|
||||
self.project_filename = None
|
||||
self.toggle_units_ignore = False
|
||||
|
||||
self.main_thread = QtWidgets.QApplication.instance().thread()
|
||||
|
||||
# ############################################################################################################
|
||||
# ################# Setup the listening thread for another instance launching with args ######################
|
||||
# ############################################################################################################
|
||||
@@ -615,20 +629,6 @@ class App(QtCore.QObject):
|
||||
# When the self.defaults dictionary changes will update the Preferences GUI forms
|
||||
self.defaults.set_change_callback(self.on_defaults_dict_change)
|
||||
|
||||
# ###########################################################################################################
|
||||
# ############################################ Data #########################################################
|
||||
# ###########################################################################################################
|
||||
|
||||
self.recent = []
|
||||
self.recent_projects = []
|
||||
|
||||
self.clipboard = QtWidgets.QApplication.clipboard()
|
||||
|
||||
self.project_filename = None
|
||||
self.toggle_units_ignore = False
|
||||
|
||||
self.main_thread = QtWidgets.QApplication.instance().thread()
|
||||
|
||||
# ###########################################################################################################
|
||||
# ########################################## LOAD LANGUAGES ################################################
|
||||
# ###########################################################################################################
|
||||
@@ -3646,7 +3646,6 @@ class App(QtCore.QObject):
|
||||
self.plotcanvas.graph_event_disconnect(self.mr)
|
||||
self.plotcanvas.graph_event_disconnect(self.mdc)
|
||||
self.plotcanvas.graph_event_disconnect(self.kp)
|
||||
|
||||
else:
|
||||
self.mm = self.plotcanvas.graph_event_disconnect('mouse_move', self.on_mouse_move_over_plot)
|
||||
self.mp = self.plotcanvas.graph_event_disconnect('mouse_press', self.on_mouse_click_over_plot)
|
||||
@@ -3718,24 +3717,14 @@ class App(QtCore.QObject):
|
||||
|
||||
# quit app by signalling for self.kill_app() method
|
||||
self.close_app_signal.emit()
|
||||
# QtWidgets.qApp.quit()
|
||||
# sys.exit(0)
|
||||
|
||||
# When the main event loop is not started yet in which case the qApp.quit() will do nothing
|
||||
# we use the following command
|
||||
# minor_v = sys.version_info.minor
|
||||
# if minor_v < 8:
|
||||
# # make sure that the app closes
|
||||
# sys.exit(0)
|
||||
# else:
|
||||
# os._exit(0) # fix to work with Python 3.8
|
||||
|
||||
@staticmethod
|
||||
def kill_app():
|
||||
QtWidgets.qApp.quit()
|
||||
# When the main event loop is not started yet in which case the qApp.quit() will do nothing
|
||||
# we use the following command
|
||||
sys.exit(0)
|
||||
# sys.exit(0)
|
||||
raise SystemExit
|
||||
|
||||
def on_portable_checked(self, state):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user