diff --git a/lattice2Common.py b/lattice2Common.py index 974a36a..ab4af1d 100644 --- a/lattice2Common.py +++ b/lattice2Common.py @@ -22,7 +22,7 @@ #*************************************************************************** import FreeCAD, Part -from latticeExecuter import CancelError +from lattice2Executer import CancelError if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui diff --git a/lattice2MakeCompound.py b/lattice2MakeCompound.py index 95c9889..07cfb6f 100644 --- a/lattice2MakeCompound.py +++ b/lattice2MakeCompound.py @@ -27,7 +27,7 @@ __url__ = "" __doc__ = "Mirror of Part MakeCompound command" from lattice2Common import * -from latticeBaseFeature import isObjectLattice +from lattice2BaseFeature import isObjectLattice import lattice2Executer class _CommandLatticeMakeCompound: diff --git a/lattice2ParaSeries.py b/lattice2ParaSeries.py index 0577afe..3070e4c 100644 --- a/lattice2ParaSeries.py +++ b/lattice2ParaSeries.py @@ -159,7 +159,7 @@ class LatticeParaSeries(lattice2BaseFeature.LatticeFeature): shape = None for obj in doc2.Objects: if 'Invalid' in obj.State: - latticeExecuter.error(obj,"Recomputing shape for parameter value of "+val+" failed.") + lattice2Executer.error(obj,"Recomputing shape for parameter value of "+val+" failed.") scale = 1.0 try: diff --git a/lattice2PopulateCopies.py b/lattice2PopulateCopies.py index df996dd..0a23e28 100644 --- a/lattice2PopulateCopies.py +++ b/lattice2PopulateCopies.py @@ -61,7 +61,7 @@ def DereferenceArray(obj,placements, lnkFrom, refmode): elif len(placementsFrom) == len(placements): return [lattice2BaseFeature.makeMoveFromTo(placementsFrom[i], placements[i]) for i in range(0, len(placements))] else: - latticeExecuter.warning(obj,"Lengths of arrays linked as PlacementsTo and PlacementsFrom must equal, or PlacementsFrom can be one placement. Violation: lengths are "+str(len(placements))+ " and "+str(len(placementsFrom))) + lattice2Executer.warning(obj,"Lengths of arrays linked as PlacementsTo and PlacementsFrom must equal, or PlacementsFrom can be one placement. Violation: lengths are "+str(len(placements))+ " and "+str(len(placementsFrom))) else: raise ValueError("Referencing mode not implemented: "+refmode) diff --git a/lattice2ValueSeriesGenerator.py b/lattice2ValueSeriesGenerator.py index 2f4d22c..1b9d939 100644 --- a/lattice2ValueSeriesGenerator.py +++ b/lattice2ValueSeriesGenerator.py @@ -28,7 +28,7 @@ __doc__ = "Value Series generator module: utility module to attach value generat import math import lattice2Executer -from latticeCommon import ParaConfusion +from lattice2Common import ParaConfusion class ValueSeriesGenerator: def __init__(self, docObj):