kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

BIM: import ToDo from correct file (#18221)

Browse Source 
* BIM: import ToDo from correct file

* Oops, forgot to save some files.
This commit is contained in:
Roy-043
2024-12-03 15:18:06 +01:00
committed by GitHub
parent 7fdc3b807a
commit 284bb80412
11 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/BIM/Arch.py
View File

@@ -187,8 +187,8 @@ def convertFloors(floor=None):
obj.Label = obj.Label+" to delete"
nobj.Label = label
for n in todel:
from DraftGui import todo
todo.delay(FreeCAD.ActiveDocument.removeObject,n)
from draftutils import todo
todo.ToDo.delay(FreeCAD.ActiveDocument.removeObject,n)
def makeCurtainWall(baseobj=None,name=None):
@@ -1090,7 +1090,7 @@ def makeWindow(baseobj=None,width=None,height=None,parts=None,name=None):
import ArchWindow
import Draft
from DraftGui import todo
from draftutils import todo
if not FreeCAD.ActiveDocument:
FreeCAD.Console.PrintError("No active document. Aborting\n")
return
@@ -1141,5 +1141,5 @@ def makeWindow(baseobj=None,width=None,height=None,parts=None,name=None):
if obj.Base and FreeCAD.GuiUp:
obj.Base.ViewObject.DisplayMode = "Wireframe"
obj.Base.ViewObject.hide()
todo.delay(ArchWindow.recolorize,[obj.Document.Name,obj.Name])
todo.ToDo.delay(ArchWindow.recolorize,[obj.Document.Name,obj.Name])
return obj

4
src/Mod/BIM/ArchBuilding.py
View File

@@ -314,8 +314,8 @@ class _ViewProviderBuilding(ArchFloor._ViewProviderFloor):
def convertToBuildingPart(self):
if hasattr(self,"Object"):
import ArchBuildingPart
from DraftGui import todo
todo.delay(ArchBuildingPart.convertFloors,self.Object)
from draftutils import todo
todo.ToDo.delay(ArchBuildingPart.convertFloors,self.Object)
if FreeCAD.GuiUp:

4
src/Mod/BIM/ArchFloor.py
View File

@@ -413,8 +413,8 @@ class _ViewProviderFloor:
if hasattr(self,"Object"):
import ArchBuildingPart
from DraftGui import todo
todo.delay(ArchBuildingPart.convertFloors,self.Object)
from draftutils import todo
todo.ToDo.delay(ArchBuildingPart.convertFloors,self.Object)
if FreeCAD.GuiUp:

8
src/Mod/BIM/ArchReference.py
View File

@@ -564,8 +564,8 @@ class ViewProviderArchReference:
colors = obj.Proxy.getColors(obj)
if colors:
obj.ViewObject.DiffuseColor = colors
from DraftGui import todo
todo.delay(self.recolorize,obj.ViewObject)
from draftutils import todo
todo.ToDo.delay(self.recolorize,obj.ViewObject)
def recolorize(self,vobj):
@@ -642,8 +642,8 @@ class ViewProviderArchReference:
return None
FreeCADGui.Control.closeDialog()
from DraftGui import todo
todo.delay(vobj.Proxy.recolorize,vobj)
from draftutils import todo
todo.ToDo.delay(vobj.Proxy.recolorize,vobj)
return True

10
src/Mod/BIM/InitGui.py
View File

@@ -474,7 +474,7 @@ class BIMWorkbench(Workbench):
def Activated(self):
import WorkingPlane
from DraftGui import todo
from draftutils import todo
import BimStatus
from nativeifc import ifc_observer
from draftutils import grid_observer
@@ -489,8 +489,8 @@ class BIMWorkbench(Workbench):
grid_observer._view_observer_setup()
if PARAMS.GetBool("FirstTime", True) and (not hasattr(FreeCAD, "TestEnvironment")):
todo.delay(FreeCADGui.runCommand, "BIM_Welcome")
todo.delay(BimStatus.setStatusIcons, True)
todo.ToDo.delay(FreeCADGui.runCommand, "BIM_Welcome")
todo.ToDo.delay(BimStatus.setStatusIcons, True)
FreeCADGui.Control.clearTaskWatcher()
class BimWatcher:
@@ -552,7 +552,7 @@ class BIMWorkbench(Workbench):
def Deactivated(self):
from DraftGui import todo
from draftutils import todo
import BimStatus
from bimcommands import BimViews
import WorkingPlane
@@ -573,7 +573,7 @@ class BIMWorkbench(Workbench):
grid_observer._view_observer_setup()
# print("Deactivating status icon")
todo.delay(BimStatus.setStatusIcons, False)
todo.ToDo.delay(BimStatus.setStatusIcons, False)
FreeCADGui.Control.clearTaskWatcher()
# store views widget state and vertical size

4
src/Mod/BIM/bimcommands/BimConvert.py
View File

@@ -93,9 +93,9 @@ class BIM_Convert_TaskPanel:
FreeCAD.ActiveDocument.commitTransaction()
FreeCAD.ActiveDocument.recompute()
if idx:
from DraftGui import todo
from draftutils import todo
todo.delay(FreeCADGui.Control.closeDialog, None)
todo.ToDo.delay(FreeCADGui.Control.closeDialog, None)
return True

8
src/Mod/BIM/bimcommands/BimLibrary.py
View File

@@ -584,17 +584,17 @@ class BIM_Library_TaskPanel:
self.place(path)
elif ext == ".fcstd":
FreeCADGui.ActiveDocument.mergeProject(path)
from DraftGui import todo
from draftutils import todo
todo.delay(self.reject, None)
todo.ToDo.delay(self.reject, None)
elif ext == ".ifc":
from importers import importIFC
importIFC.ZOOMOUT = False
importIFC.insert(path, FreeCAD.ActiveDocument.Name)
from DraftGui import todo
from draftutils import todo
todo.delay(self.reject, None)
todo.ToDo.delay(self.reject, None)
elif ext in [".sat", ".sab"]:
try:
# InventorLoader addon

4
src/Mod/BIM/bimcommands/BimMaterial.py
View File

@@ -444,9 +444,9 @@ class BIM_Material:
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/BIM")
p.SetInt("BimMaterialDialogWidth", self.dlg.width())
p.SetInt("BimMaterialDialogHeight", self.dlg.height())
from DraftGui import todo
from draftutils import todo
todo.delay(self.dlg.hide, None)
todo.ToDo.delay(self.dlg.hide, None)
def onReject(self):
if self.dlg:

6
src/Mod/BIM/bimcommands/BimPreflight.py
View File

@@ -294,16 +294,16 @@ class BIM_Preflight_TaskPanel:
"runs all tests"
from PySide import QtCore, QtGui
from DraftGui import todo
from draftutils import todo
for test in tests:
if test != "testAll":
QtGui.QApplication.processEvents()
self.reset(test)
if hasattr(self, test):
todo.delay(getattr(self, test), None)
todo.ToDo.delay(getattr(self, test), None)
for customTest in self.customTests.keys():
todo.delay(self.testCustom, customTest)
todo.ToDo.delay(self.testCustom, customTest)
FreeCADGui.BIMPreflightDone = True
def testIFC4(self):

4
src/Mod/BIM/bimcommands/BimTutorial.py
View File

@@ -84,10 +84,10 @@ class BIM_Tutorial:
self.pixempty = QtGui.QPixmap()
# fire the loading after displaying the widget
from DraftGui import todo
from draftutils import todo
# self.load()
# todo.delay(self.load,None)
# todo.ToDo.delay(self.load,None)
QtCore.QTimer.singleShot(1000, self.load)
def load(self, arg=None):

1
src/Mod/BIM/bimcommands/BimUnclone.py
View File

@@ -120,7 +120,6 @@ class BIM_Unclone:
if newobj != obj:
name = obj.Name
label = obj.Label
from DraftGui import todo
FreeCAD.ActiveDocument.removeObject(name)
newobj.Label = label