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

add lazyloader support

Browse Source 
lazy_loader is copied to Ext now, modified external imports to lazy_load

add a few more imports to be lazy loaded, think the install path is correct now

[TD]"<" symbol embedded in html

revert changes to path modules for testing

use lazyloader in PathAreaOp.py

add back in deferred loading

temp change to print error message in tests

temp change to print error message in tests

add _init__.py to lazy_loader

make install in CMakeLists.txt one line
This commit is contained in:
Eric Trombly
2020-04-09 18:13:02 -05:00
parent 05b17ccbfc
commit 24e681c63b
36 changed files with 233 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Path/PathScripts/PathAreaOp.py
View File

@@ -28,9 +28,12 @@ import PathScripts.PathLog as PathLog
import PathScripts.PathOp as PathOp
import PathScripts.PathUtils as PathUtils
import PathScripts.PathGeom as PathGeom
import Draft
import math
import Part
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Draft = LazyLoader('Draft', globals(), 'Draft')
Part = LazyLoader('Part', globals(), 'Part')
# from PathScripts.PathUtils import waiting_effects
from PySide import QtCore

11
src/Mod/Path/PathScripts/PathCircularHoleBase.py
View File

@@ -28,10 +28,7 @@
# * *
# ***************************************************************************
import ArchPanel
import FreeCAD
import DraftGeomUtils
import Part
import PathScripts.PathLog as PathLog
import PathScripts.PathOp as PathOp
import PathScripts.PathUtils as PathUtils
@@ -39,8 +36,14 @@ import PathScripts.PathUtils as PathUtils
from PySide import QtCore
import PathScripts.PathGeom as PathGeom
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
ArchPanel = LazyLoader('ArchPanel', globals(), 'ArchPanel')
Draft = LazyLoader('Draft', globals(), 'Draft')
Part = LazyLoader('Part', globals(), 'Part')
DraftGeomUtils = LazyLoader('DraftGeomUtils', globals(), 'DraftGeomUtils')
import math
import Draft
if FreeCAD.GuiUp:
import FreeCADGui

5
src/Mod/Path/PathScripts/PathDeburr.py
View File

@@ -24,7 +24,6 @@
# ***************************************************************************
import FreeCAD
import Part
import PathScripts.PathEngraveBase as PathEngraveBase
import PathScripts.PathLog as PathLog
import PathScripts.PathOp as PathOp
@@ -33,6 +32,10 @@ import math
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "Path Deburr Operation"
__author__ = "sliptonic (Brad Collette), Schildkroet"
__url__ = "http://www.freecadweb.org"

7
src/Mod/Path/PathScripts/PathDressupDogbone.py
View File

@@ -22,10 +22,8 @@
# * *
# ***************************************************************************
from __future__ import print_function
import DraftGeomUtils
import FreeCAD
import math
import Part
import Path
import PathScripts.PathDressup as PathDressup
import PathScripts.PathGeom as PathGeom
@@ -35,6 +33,11 @@ import PathScripts.PathUtils as PathUtils
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
DraftDraftGeomUtils = LazyLoader('DraftDraftGeomUtils', globals(), 'DraftDraftGeomUtils')
Part = LazyLoader('Part', globals(), 'Part')
LOG_MODULE = PathLog.thisModule()
PathLog.setLevel(PathLog.Level.NOTICE, LOG_MODULE)

5
src/Mod/Path/PathScripts/PathDressupDragknife.py
View File

@@ -27,9 +27,12 @@ import FreeCAD
import Path
from PySide import QtCore
import math
import DraftVecUtils as D
import PathScripts.PathUtils as PathUtils
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
D = LazyLoader('DraftVecUtils', globals(), 'DraftVecUtils')
__doc__ = """Dragknife Dressup object and FreeCAD command"""
if FreeCAD.GuiUp:

5
src/Mod/Path/PathScripts/PathDressupHoldingTags.py
View File

@@ -22,7 +22,6 @@
# * *
# ***************************************************************************
import FreeCAD
import Part
import Path
import PathScripts.PathDressup as PathDressup
import PathScripts.PathGeom as PathGeom
@@ -36,6 +35,10 @@ from PathScripts.PathDressupTagPreferences import HoldingTagPreferences
from PathScripts.PathUtils import waiting_effects
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
#PathLog.trackModule()

5
src/Mod/Path/PathScripts/PathDressupRampEntry.py
View File

@@ -23,7 +23,6 @@
# ***************************************************************************
import FreeCAD
import Path
import Part
import PathScripts.PathDressup as PathDressup
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
@@ -32,6 +31,10 @@ import math
from PathScripts import PathUtils
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
if FreeCAD.GuiUp:
import FreeCADGui

7
src/Mod/Path/PathScripts/PathDressupTag.py
View File

@@ -22,14 +22,17 @@
# * *
# ***************************************************************************
import FreeCAD
import DraftGeomUtils
import Part
import PathScripts.PathDressup as PathDressup
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
import PathScripts.PathUtils as PathUtils
import math
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
DraftGeomUtils = LazyLoader('DraftGeomUtils', globals(), 'DraftGeomUtils')
Part = LazyLoader('Part', globals(), 'Part')
from PathScripts.PathDressupTagPreferences import HoldingTagPreferences
from PySide import QtCore

5
src/Mod/Path/PathScripts/PathDressupZCorrect.py
View File

@@ -27,7 +27,6 @@
# ***************************************************************************
import FreeCAD
import FreeCADGui
import Part
import Path
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
@@ -35,6 +34,10 @@ import PathScripts.PathUtils as PathUtils
from PySide import QtCore, QtGui
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
"""Z Depth Correction Dressup. This dressup takes a probe file as input and does bilinear interpolation of the Zdepths to correct for a surface which is not parallel to the milling table/bed. The probe file should conform to the format specified by the linuxcnc G38 probe logging: 9-number coordinate consisting of XYZABCUVW http://linuxcnc.org/docs/html/gcode/g-code.html#gcode:g38
"""

7
src/Mod/Path/PathScripts/PathEngrave.py
View File

@@ -22,9 +22,7 @@
# * *
# ***************************************************************************
import ArchPanel
import FreeCAD
import Part
import Path
import PathScripts.PathEngraveBase as PathEngraveBase
import PathScripts.PathLog as PathLog
@@ -33,6 +31,11 @@ import PathScripts.PathUtils as PathUtils
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
ArchPanel = LazyLoader('ArchPanel', globals(), 'ArchPanel')
Part = LazyLoader('Part', globals(), 'Part')
__doc__ = "Class and implementation of Path Engrave operation"
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())

5
src/Mod/Path/PathScripts/PathEngraveBase.py
View File

@@ -22,7 +22,6 @@
# * *
# ***************************************************************************
import DraftGeomUtils
import Path
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
@@ -30,6 +29,10 @@ import PathScripts.PathOp as PathOp
import PathScripts.PathOpTools as PathOpTools
import copy
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
DraftGeomUtils = LazyLoader('DraftGeomUtils', globals(), 'DraftGeomUtils')
from PySide import QtCore
__doc__ = "Base class for all ops in the engrave family."

5
src/Mod/Path/PathScripts/PathGeom.py
View File

@@ -23,7 +23,6 @@
# ***************************************************************************
import FreeCAD
import Part
import Path
import PathScripts.PathLog as PathLog
import math
@@ -31,6 +30,10 @@ import math
from FreeCAD import Vector
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "PathGeom - geometry utilities for Path"
__author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org"

5
src/Mod/Path/PathScripts/PathGetPoint.py
View File

@@ -22,11 +22,14 @@
# * *
# ***************************************************************************
import Draft
import FreeCAD
import FreeCADGui
import PathScripts.PathLog as PathLog
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Draft = LazyLoader('Draft', globals(), 'Draft')
from PySide import QtCore, QtGui
from pivy import coin

7
src/Mod/Path/PathScripts/PathJob.py
View File

@@ -22,8 +22,6 @@
# * *
# ***************************************************************************
import ArchPanel
import Draft
import FreeCAD
import PathScripts.PathIconViewProvider as PathIconViewProvider
import PathScripts.PathLog as PathLog
@@ -34,6 +32,11 @@ import PathScripts.PathToolController as PathToolController
import PathScripts.PathUtil as PathUtil
import json
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
ArchPanel = LazyLoader('ArchPanel', globals(), 'ArchPanel')
Draft = LazyLoader('Draft', globals(), 'Draft')
from PathScripts.PathPostProcessor import PostProcessor
from PySide import QtCore

7
src/Mod/Path/PathScripts/PathJobGui.py
View File

@@ -22,8 +22,6 @@
# * *
# ***************************************************************************
import Draft
import DraftVecUtils
import FreeCAD
import FreeCADGui
import PathScripts.PathJob as PathJob
@@ -42,6 +40,11 @@ import PathScripts.PathUtils as PathUtils
import math
import traceback
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Draft = LazyLoader('Draft', globals(), 'Draft')
DraftVecUtils = LazyLoader('DraftVecUtils', globals(), 'DraftVecUtils')
from PySide import QtCore, QtGui
from collections import Counter
from contextlib import contextmanager

5
src/Mod/Path/PathScripts/PathMillFace.py
View File

@@ -25,7 +25,6 @@
from __future__ import print_function
import FreeCAD
import Part
import PathScripts.PathLog as PathLog
import PathScripts.PathPocketBase as PathPocketBase
import PathScripts.PathUtils as PathUtils
@@ -33,6 +32,10 @@ import PathScripts.PathUtils as PathUtils
from PySide import QtCore
import numpy
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "Path Mill Face Operation"
__author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org"

5
src/Mod/Path/PathScripts/PathOp.py
View File

@@ -23,7 +23,6 @@
# ***************************************************************************
import FreeCAD
import Part
import Path
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
@@ -33,6 +32,10 @@ import PathScripts.PathUtils as PathUtils
from PathScripts.PathUtils import waiting_effects
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "Base class for all operations."
__author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org"

5
src/Mod/Path/PathScripts/PathOpTools.py
View File

@@ -23,13 +23,16 @@
# ***************************************************************************
import FreeCAD
import Part
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
import math
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "PathOpTools - Tools for Path operations."
__author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org"

5
src/Mod/Path/PathScripts/PathPocket.py
View File

@@ -23,7 +23,6 @@
# ***************************************************************************
import FreeCAD
import Part
import PathScripts.PathLog as PathLog
import PathScripts.PathOp as PathOp
import PathScripts.PathPocketBase as PathPocketBase
@@ -31,6 +30,10 @@ import PathScripts.PathUtils as PathUtils
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "Path 3D Pocket Operation"
__author__ = "Yorik van Havre <yorik@uncreated.net>"
__url__ = "http://www.freecadweb.org"

9
src/Mod/Path/PathScripts/PathPocketShape.py
View File

@@ -24,15 +24,18 @@
# ***************************************************************************
import FreeCAD
import Part
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
import PathScripts.PathOp as PathOp
import PathScripts.PathPocketBase as PathPocketBase
import PathScripts.PathUtils as PathUtils
import TechDraw
import math
import Draft
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Draft = LazyLoader('Draft', globals(), 'Draft')
Part = LazyLoader('Part', globals(), 'Part')
TechDraw = LazyLoader('TechDraw', globals(), 'TechDraw')
from PySide import QtCore

5
src/Mod/Path/PathScripts/PathPocketShapeGui.py
View File

@@ -24,7 +24,6 @@
import FreeCAD
import FreeCADGui
import Part
import PathScripts.PathGeom as PathGeom
import PathScripts.PathGui as PathGui
import PathScripts.PathLog as PathLog
@@ -35,6 +34,10 @@ import PathScripts.PathPocketBaseGui as PathPocketBaseGui
from PySide import QtCore, QtGui
from pivy import coin
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "Path Pocket Shape Operation UI"
__author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org"

7
src/Mod/Path/PathScripts/PathProfileContour.py
View File

@@ -24,9 +24,7 @@
from __future__ import print_function
import ArchPanel
import FreeCAD
import Part
import Path
import PathScripts.PathProfileBase as PathProfileBase
import PathScripts.PathLog as PathLog
@@ -34,6 +32,11 @@ import PathScripts.PathLog as PathLog
from PathScripts import PathUtils
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
ArchPanel = LazyLoader('ArchPanel', globals(), 'ArchPanel')
Part = LazyLoader('Part', globals(), 'Part')
FreeCAD.setLogLevel('Path.Area', 0)
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())

9
src/Mod/Path/PathScripts/PathProfileEdges.py
View File

@@ -23,18 +23,21 @@
# ***************************************************************************
import FreeCAD
import Part
import Path
import PathScripts.PathLog as PathLog
import PathScripts.PathOp as PathOp
import PathScripts.PathProfileBase as PathProfileBase
import PathScripts.PathUtils as PathUtils
import DraftGeomUtils
import Draft
import math
import PySide
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Draft = LazyLoader('Draft', globals(), 'Draft')
Part = LazyLoader('Part', globals(), 'Part')
DraftGeomUtils = LazyLoader('DraftGeomUtils', globals(), 'DraftGeomUtils')
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
# PathLog.trackModule(PathLog.thisModule())

7
src/Mod/Path/PathScripts/PathProfileFaces.py
View File

@@ -23,9 +23,7 @@
# * *
# ***************************************************************************
import ArchPanel
import FreeCAD
import Part
import Path
import PathScripts.PathLog as PathLog
import PathScripts.PathOp as PathOp
@@ -35,6 +33,11 @@ import numpy
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
ArchPanel = LazyLoader('ArchPanel', globals(), 'ArchPanel')
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "Path Profile Faces Operation"
__author__ = "sliptonic (Brad Collette), Schildkroet"
__url__ = "http://www.freecadweb.org"

7
src/Mod/Path/PathScripts/PathSimulatorGui.py
View File

@@ -1,6 +1,4 @@
import FreeCAD
import Mesh
import Part
import Path
import PathScripts.PathDressup as PathDressup
import PathScripts.PathGeom as PathGeom
@@ -13,6 +11,11 @@ from FreeCAD import Vector, Base
_filePath = os.path.dirname(os.path.abspath(__file__))
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Mesh = LazyLoader('Mesh', globals(), 'Mesh')
Part = LazyLoader('Part', globals(), 'Part')
if FreeCAD.GuiUp:
import FreeCADGui
from PySide import QtGui, QtCore

5
src/Mod/Path/PathScripts/PathStock.py
View File

@@ -23,13 +23,16 @@
'''used to create material stock around a machined part- for visualization '''
import FreeCAD
import Part
import PathScripts.PathIconViewProvider as PathIconViewProvider
import PathScripts.PathLog as PathLog
import math
from PySide import QtCore
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
#PathLog.trackModule(PathLog.thisModule())

9
src/Mod/Path/PathScripts/PathSurface.py
View File

@@ -30,7 +30,6 @@
from __future__ import print_function
import FreeCAD
import MeshPart
import Path
import PathScripts.PathLog as PathLog
import PathScripts.PathUtils as PathUtils
@@ -39,8 +38,12 @@ import PathScripts.PathOp as PathOp
from PySide import QtCore
import time
import math
import Part
import Draft
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
MeshPart = LazyLoader('MeshPart', globals(), 'MeshPart')
Draft = LazyLoader('Draft', globals(), 'Draft')
Part = LazyLoader('Part', globals(), 'Part')
if FreeCAD.GuiUp:
import FreeCADGui

5
src/Mod/Path/PathScripts/PathToolBit.py
View File

@@ -23,7 +23,6 @@
# ***************************************************************************
import FreeCAD
import Part
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog
import PathScripts.PathPreferences as PathPreferences
@@ -36,6 +35,10 @@ import math
import os
import zipfile
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
__title__ = "Tool bits."
__author__ = "sliptonic (Brad Collette)"
__url__ = "http://www.freecadweb.org"

5
src/Mod/Path/PathScripts/PathToolControllerGui.py
View File

@@ -24,7 +24,6 @@
import FreeCAD
import FreeCADGui
import Part
import PathScripts
import PathScripts.PathGui as PathGui
import PathScripts.PathLog as PathLog
@@ -34,6 +33,10 @@ import PathScripts.PathUtil as PathUtil
from PySide import QtCore, QtGui
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
Part = LazyLoader('Part', globals(), 'Part')
# Qt translation handling
def translate(context, text, disambig=None):
return QtCore.QCoreApplication.translate(context, text, disambig)

9
src/Mod/Path/PathScripts/PathUtils.py
View File

@@ -23,21 +23,24 @@
# ***************************************************************************
'''PathUtils -common functions used in PathScripts for filtering, sorting, and generating gcode toolpath data '''
import FreeCAD
import Part
import Path
import PathScripts
import PathScripts.PathGeom as PathGeom
import TechDraw
import math
import numpy
from DraftGeomUtils import geomType
from FreeCAD import Vector
from PathScripts import PathJob
from PathScripts import PathLog
from PySide import QtCore
from PySide import QtGui
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
geomType = LazyLoader('DraftDraftGeomUtils', globals(), 'DraftDraftGeomUtils.geomType')
Part = LazyLoader('Part', globals(), 'Part')
TechDraw = LazyLoader('TechDraw', globals(), 'TechDraw')
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
#PathLog.trackModule(PathLog.thisModule())

9
src/Mod/Path/PathScripts/PathWaterline.py
View File

@@ -26,7 +26,6 @@
from __future__ import print_function
import FreeCAD
import MeshPart
import Path
import PathScripts.PathLog as PathLog
import PathScripts.PathUtils as PathUtils
@@ -35,8 +34,12 @@ import PathScripts.PathOp as PathOp
from PySide import QtCore
import time
import math
import Part
import Draft
# lazily loaded modules
from lazy_loader.lazy_loader import LazyLoader
MeshPart = LazyLoader('MeshPart', globals(), 'MeshPart')
Draft = LazyLoader('Draft', globals(), 'Draft')
Part = LazyLoader('Part', globals(), 'Part')
if FreeCAD.GuiUp:
import FreeCADGui