suzanne.soy/cadquery-freecad-module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added better support for using external editors by having the editor automatically reload and execute the script based on the settings in Settings.py.

Browse Source
This commit is contained in:
Jeremy Wright 2014-12-26 00:25:19 -05:00
parent ccaf07c396
commit eca4be1818
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CadQuery/InitGui.py
View File

@ -36,6 +36,7 @@ class CadQueryWorkbench (Workbench):
import os, sys import os, sys
import module_locator import module_locator
from Gui import Command, ImportCQ from Gui import Command, ImportCQ
import Settings
#Set up so that we can import from our embedded packages #Set up so that we can import from our embedded packages
module_base_path = module_locator.module_path() module_base_path = module_locator.module_path()
@ -55,6 +56,7 @@ class CadQueryWorkbench (Workbench):
sys.path.insert(1, fc_bin_path) sys.path.insert(1, fc_bin_path)
import cadquery import cadquery
from pyqode.core.modes import FileWatcherMode
from pyqode.python.widgets import PyCodeEdit from pyqode.python.widgets import PyCodeEdit
from PySide import QtGui, QtCore from PySide import QtGui, QtCore
@ -118,6 +120,12 @@ class CadQueryWorkbench (Workbench):
codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter
, args=['-s', libs_dir_path]) , args=['-s', libs_dir_path])
# Allow easy use of an external editor
if Settings.use_external_editor:
codePane.modes.append(FileWatcherMode())
codePane.modes.get(FileWatcherMode).file_reloaded.connect(self.AutoExecute)
codePane.modes.get(FileWatcherMode).auto_reload = True
codePane.setObjectName("cqCodePane") codePane.setObjectName("cqCodePane")
#Add the text area to our dock widget #Add the text area to our dock widget
@ -135,11 +143,21 @@ class CadQueryWorkbench (Workbench):
FreeCADGui.activeDocument().activeView().viewAxometric() FreeCADGui.activeDocument().activeView().viewAxometric()
FreeCADGui.SendMsgToActiveView("ViewFit") FreeCADGui.SendMsgToActiveView("ViewFit")
def AutoExecute(self):
"""We should be able to pass the Gui.Commands.CadQueryExecuteScript function directly to the file_reloaded
connect function, but that causes a segfault in FreeCAD. This function is a work-around for that. This
function is passed to file_reloaded signal and in turn calls the CadQueryExecuteScript.Activated function."""
import Gui.Command
Gui.Command.CadQueryExecuteScript().Activated()
def Deactivated(self): def Deactivated(self):
import Gui.Command
#Put the UI back the way we found it #Put the UI back the way we found it
FreeCAD.Console.PrintMessage("\r\nCadQuery Workbench Deactivated\r\n") FreeCAD.Console.PrintMessage("\r\nCadQuery Workbench Deactivated\r\n")
Command.CadQueryCloseScript().Activated() Gui.Command.CadQueryCloseScript().Activated()
FreeCADGui.addCommand('CadQueryNewScript', CadQueryNewScript()) FreeCADGui.addCommand('CadQueryNewScript', CadQueryNewScript())
FreeCADGui.addCommand('CadQueryOpenScript', CadQueryOpenScript()) FreeCADGui.addCommand('CadQueryOpenScript', CadQueryOpenScript())