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

Improved the open and close script functionality to help ensure a better and more integrated workflow.

Browse Source
This commit is contained in:
Jeremy Mack Wright 2016-10-16 21:41:32 -04:00
parent 544faacaf2
commit 3d3f640dae
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CadQuery/Gui/Command.py
View File

@ -75,18 +75,7 @@ class CadQueryCloseScript:
if filename is not None: if filename is not None:
ExportCQ.save(filename) ExportCQ.save(filename)
# Close the matching 3D view if it's open Shared.closeActiveCodeWindow()
if cqCodePane.file.path is not None:
docname = os.path.splitext(os.path.basename(cqCodePane.file.path))[0]
try:
FreeCAD.closeDocument(docname)
except:
# Assume that the document has already been closed
pass
# Clear our script and whatever was rendered by it out
cqCodePane.file.close()
class CadQueryExecuteExample: class CadQueryExecuteExample:
exFile = None exFile = None
@ -214,9 +203,6 @@ class CadQueryOpenScript:
# Make sure the user didn't click cancel # Make sure the user didn't click cancel
if filename[0]: if filename[0]:
# We need to close any file that's already open in the editor window
CadQueryCloseScript().Activated()
self.previousPath = filename[0] self.previousPath = filename[0]
# Append this script's directory to sys.path # Append this script's directory to sys.path

12
CadQuery/Shared.py
View File

@ -45,9 +45,7 @@ def getActiveCodePane():
return cqCodePane return cqCodePane
def getActiveCodeWindow(): def closeActiveCodeWindow():
"""Gets the currently active code window (that holds the pane), even if the associated 3D view window has focus"""
mw = FreeCADGui.getMainWindow() mw = FreeCADGui.getMainWindow()
mdi = mw.findChild(QtGui.QMdiArea) mdi = mw.findChild(QtGui.QMdiArea)
@ -59,11 +57,11 @@ def getActiveCodeWindow():
subList = mdi.subWindowList() subList = mdi.subWindowList()
for sub in subList: for sub in subList:
if sub.windowTitle() == mdiWin.windowTitle() + ".py": if sub.windowTitle() == mdiWin.windowTitle().split(" ")[0] + ".py":
mdiWin = sub sub.close()
return
return mdiWin
mdiWin.close()
def setActiveWindowTitle(title): def setActiveWindowTitle(title):
"""Sets the title of the currently active MDI window, as long as it is a scripting window""" """Sets the title of the currently active MDI window, as long as it is a scripting window"""