Fix Lattice2 failing to load when no Lattice v1 is installed
Due to me mistakenly importing lattice1 modules by forgetting to put in number 2.
This commit is contained in:
parent
b5e6e35c1d
commit
254e2e6dfb
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue
Block a user