From: daid303 Date: Fri, 7 Dec 2012 17:58:26 +0000 (+0100) Subject: Turn all classes into new style classes, this speeds up skeinforge a tiny bit. X-Git-Tag: 13.03~165 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7376c44b852f0eb3fa982cf1dd33c24691350466;p=cura.git Turn all classes into new style classes, this speeds up skeinforge a tiny bit. --- diff --git a/Cura/cura_sf/fabmetheus_utilities/euclidean.py b/Cura/cura_sf/fabmetheus_utilities/euclidean.py index f8c17ae8..56e7d102 100644 --- a/Cura/cura_sf/fabmetheus_utilities/euclidean.py +++ b/Cura/cura_sf/fabmetheus_utilities/euclidean.py @@ -2065,7 +2065,7 @@ def unbuckleBasis( basis, maximumUnbuckling, normal ): basis.setToVector3( basis * unbuckling ) -class DistanceIndex: +class DistanceIndex(object): 'A class to hold the distance and the index of the loop.' def __init__(self, distance, index): 'Initialize.' @@ -2077,7 +2077,7 @@ class DistanceIndex: return '%s, %s' % (self.distance, self.index) -class Endpoint: +class Endpoint(object): 'The endpoint of a segment.' def __repr__(self): 'Get the string representation of this Endpoint.' @@ -2180,7 +2180,7 @@ class Endpoint: return self -class LoopLayer: +class LoopLayer(object): 'Loops with a z.' def __init__(self, z): 'Initialize.' @@ -2192,7 +2192,7 @@ class LoopLayer: return '%s, %s' % (self.z, self.loops) -class NestedRing: +class NestedRing(object): 'A nested ring.' def __init__(self): 'Initialize.' @@ -2345,7 +2345,7 @@ class NestedBand(NestedRing): self.infillPaths = getTransferredPaths(paths, self.boundary) -class PathZ: +class PathZ(object): 'Complex path with a z.' def __init__( self, z ): self.path = [] @@ -2356,7 +2356,7 @@ class PathZ: return '%s, %s' % ( self.z, self.path ) -class ProjectiveSpace: +class ProjectiveSpace(object): 'Class to define a projective space.' def __init__( self, basisX = Vector3(1.0, 0.0, 0.0), basisY = Vector3( 0.0, 1.0, 0.0 ), basisZ = Vector3(0.0, 0.0, 1.0) ): 'Initialize the basis vectors.' @@ -2466,7 +2466,7 @@ class ProjectiveSpace: unbuckleBasis( self.basisY, maximumUnbuckling, normal ) -class XIntersectionIndex: +class XIntersectionIndex(object): 'A class to hold the x intersection position and the index of the loop which intersected.' def __init__( self, index, x ): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py index 8e6d1762..3e2153ec 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py @@ -110,7 +110,7 @@ def getWindowAnalyzeFile(fileName): print('Open office writer can then be started from the command line with the command "soffice -writer".') -class InterpretRepository: +class InterpretRepository(object): "A class to handle the interpret settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py index 857ad768..32f4b75e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py @@ -54,7 +54,7 @@ def readHeader( file ): pass -class SampleTableEntry: +class SampleTableEntry(object): "Sample table entry." def __init__( self, file ): "Read in the sampling table section. It contains a table length (byte) and the table entries." @@ -68,7 +68,7 @@ class SampleTableEntry: return '%s, %s, %s' % ( self.min_z_level, self.layer_thickness, self.beam_comp ) -class SLCCarving: +class SLCCarving(object): "An slc carving." def __init__(self): "Add empty lists." diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py index c88fe063..13d0812d 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py @@ -33,7 +33,7 @@ def getCarving(fileName=''): return carving -class SVGCarving: +class SVGCarving(object): 'An svg carving.' def __init__(self): 'Add empty lists.' diff --git a/Cura/cura_sf/fabmetheus_utilities/gcodec.py b/Cura/cura_sf/fabmetheus_utilities/gcodec.py index f795a556..38b357ce 100644 --- a/Cura/cura_sf/fabmetheus_utilities/gcodec.py +++ b/Cura/cura_sf/fabmetheus_utilities/gcodec.py @@ -224,7 +224,7 @@ def isThereAFirstWord(firstWord, lines, startIndex): return False -class BoundingRectangle: +class BoundingRectangle(object): 'A class to get the corners of a gcode text.' def getFromGcodeLines(self, lines, radius): 'Parse gcode text and get the minimum and maximum corners.' @@ -256,7 +256,7 @@ class BoundingRectangle: self.oldLocation = location -class DistanceFeedRate: +class DistanceFeedRate(object): 'A class to limit the z feed rate and round values.' def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py index 6af23ece..bb3b286e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py @@ -40,7 +40,7 @@ def processElementNode(elementNode): solid.processElementNodeByGeometry(elementNode, getGeometryOutput(None, elementNode)) -class DrillDerivation: +class DrillDerivation(object): "Class to hold drill variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py index 9a84f14c..0e26dd5b 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py @@ -50,7 +50,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class SVGDerivation: +class SVGDerivation(object): "Class to hold svg variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py index 4ef34e2a..7439d381 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py @@ -56,7 +56,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class CircleDerivation: +class CircleDerivation(object): "Class to hold circle variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py index 3a30716c..e082bbac 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py @@ -43,7 +43,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class ConcatenateDerivation: +class ConcatenateDerivation(object): 'Class to hold concatenate variables.' def __init__(self, elementNode): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py index 4dc05de3..b94b6d9c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py @@ -275,7 +275,7 @@ def setOffsetByMultiplier(begin, end, multiplier, offset): offset.setToVector3(offset + delta) -class ExtrudeDerivation: +class ExtrudeDerivation(object): 'Class to hold extrude variables.' def __init__(self, elementNode): 'Initialize.' @@ -303,7 +303,7 @@ class ExtrudeDerivation: insertTwistPortions(self, elementNode) -class Interpolation: +class Interpolation(object): 'Class to interpolate a path.' def __init__(self): 'Set index.' @@ -426,7 +426,7 @@ class Interpolation: self.endVertex = self.path[ self.interpolationIndex + 1 ] -class PortionDirection: +class PortionDirection(object): 'Class to hold a portion and direction.' def __init__( self, portion ): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py index 3e47a66c..90239646 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py @@ -1027,7 +1027,7 @@ def processElementNode(elementNode): solid.processElementNodeByGeometry(elementNode, geometryOutput) -class GearDerivation: +class GearDerivation(object): "Class to hold gear variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py index b5915dd2..a396b174 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py @@ -146,7 +146,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(elementNode)) -class GridDerivation: +class GridDerivation(object): 'Class to hold grid variables.' def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py index 6112580b..a4a4ad06 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py @@ -187,7 +187,7 @@ def processElementNode(elementNode): solid.processElementNodeByGeometry(elementNode, getGeometryOutput(elementNode)) -class HeightmapDerivation: +class HeightmapDerivation(object): 'Class to hold heightmap variables.' def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py index fd0169ba..04c14c33 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py @@ -118,7 +118,7 @@ def processElementNode(elementNode): solid.processElementNodeByGeometry(elementNode, getGeometryOutput(None, elementNode)) -class LatheDerivation: +class LatheDerivation(object): "Class to hold lathe variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py index 04516831..e3753d83 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py @@ -88,7 +88,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class LineDerivation: +class LineDerivation(object): "Class to hold line variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py index b6516a47..07f5e681 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py @@ -165,7 +165,7 @@ def processElementNode(elementNode): solid.processElementNodeByGeometry(elementNode, getGeometryOutput(elementNode)) -class LinearBearingCageDerivation: +class LinearBearingCageDerivation(object): 'Class to hold linear bearing cage variables.' def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py index 8df2e585..37780e0e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py @@ -222,14 +222,14 @@ def setClosedAttribute(elementNode, revolutions): elementNode.attributes['closed'] = str(closedBoolean).lower() -class LineationDerivation: +class LineationDerivation(object): 'Class to hold lineation variables.' def __init__(self, elementNode): 'Set defaults.' self.target = evaluate.getTransformedPathsByKey([], elementNode, 'target') -class SideLoop: +class SideLoop(object): 'Class to handle loop, side angle and side length.' def __init__(self, loop, sideAngle=None, sideLength=None): 'Initialize.' @@ -282,7 +282,7 @@ class SideLoop: self.loop.reverse() -class Spiral: +class Spiral(object): 'Class to add a spiral.' def __init__(self, spiral, stepRatio): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py index f3f0091d..f9c3fdbc 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py @@ -155,7 +155,7 @@ def processElementNode(elementNode): solid.processElementNodeByGeometry(elementNode, getGeometryOutput(elementNode)) -class CellExistence: +class CellExistence(object): 'Class to determine if a cell exists.' def __init__(self, columns, rows, value): 'Initialize.' @@ -184,7 +184,7 @@ class CellExistence: return (columnIndex, rowIndex) in self.existenceSet -class HollowPegSocket: +class HollowPegSocket(object): 'Class to hold hollow peg socket variables.' def __init__(self, center): 'Initialize.' @@ -197,7 +197,7 @@ class HollowPegSocket: return euclidean.getDictionaryString(self.__dict__) -class MechaslabDerivation: +class MechaslabDerivation(object): 'Class to hold mechaslab variables.' def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py index 12a7b152..02fd1ba2 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py @@ -82,7 +82,7 @@ def setTopOverBottomByRadius(derivation, endZ, radius, startZ): derivation.topOverBottom = cylinder.getTopOverBottom(math.radians(angleDegrees), endZ, complex(radius, radius), startZ) -class PegDerivation: +class PegDerivation(object): 'Class to hold peg variables.' def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py index 13287538..35945aca 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py @@ -48,7 +48,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class PolygonDerivation: +class PolygonDerivation(object): "Class to hold polygon variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py index 509add02..2752108a 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py @@ -63,7 +63,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class ShaftDerivation: +class ShaftDerivation(object): "Class to hold shaft variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py index 9d3bb9ad..91fea73e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py @@ -167,7 +167,7 @@ def processTargetByFunctionPair(geometryFunction, pathFunction, target): target.getXMLProcessor().convertElementNode(target, geometryOutput) -class SolidDerivation: +class SolidDerivation(object): 'Class to hold solid variables.' def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py index 49262416..7992a3ad 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py @@ -77,7 +77,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class SpongeCircle: +class SpongeCircle(object): "Class to hold sponge circle." def __init__(self, center, radius=0.0): 'Initialize.' @@ -120,7 +120,7 @@ class SpongeCircle: self.radius = greatestRadius -class SpongeSliceDerivation: +class SpongeSliceDerivation(object): "Class to hold sponge slice variables." def __init__(self, elementNode): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py index a420296e..dc89d304 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py @@ -64,7 +64,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class SquareDerivation: +class SquareDerivation(object): "Class to hold square variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py index 914897b4..6379e042 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py @@ -93,7 +93,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class TeardropDerivation: +class TeardropDerivation(object): "Class to hold teardrop variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py index cb0e10b9..f22e3e88 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py @@ -49,7 +49,7 @@ def processElementNode(elementNode): path.convertElementNode(elementNode, getGeometryOutput(None, elementNode)) -class TextDerivation: +class TextDerivation(object): "Class to hold text variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py index 93ebde4c..5036ad5d 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py @@ -48,7 +48,7 @@ def processElementNode(elementNode): evaluate.processArchivable( Dictionary, elementNode) -class Dictionary: +class Dictionary(object): 'A dictionary object.' def __init__(self): 'Add empty lists.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py index 86c21dc4..3e85fd3b 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py @@ -67,7 +67,7 @@ def processElementNode(elementNode): elementNode.parentNode.xmlObject.faces.append(face) -class Edge: +class Edge(object): "An edge of a triangle mesh." def __init__(self): "Set the face indexes to None." @@ -92,7 +92,7 @@ class Edge: return self -class Face: +class Face(object): "A face of a triangle mesh." def __init__(self): "Initialize." diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py index 92585d6b..ea7366c0 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py @@ -123,7 +123,7 @@ class Path(dictionary.Dictionary): return dictionary.getAllTransformedPaths([], self) -class SVGFabricationCarving: +class SVGFabricationCarving(object): 'An svg carving.' def __init__(self, addLayerTemplate, elementNode): 'Add empty lists.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py index 67ec6859..0e64464b 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py @@ -67,7 +67,7 @@ def getMinimumZ(geometryObject): return min(archivableMinimumZ, geometryMinimumZ) -class BooleanGeometry: +class BooleanGeometry(object): 'A boolean geometry scene.' def __init__(self): 'Add empty lists.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py index d7ce048c..82273ce9 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py @@ -939,7 +939,7 @@ def setLocalAttribute(elementNode): elementNode.xmlObject = KeyValue() -class BaseFunction: +class BaseFunction(object): 'Class to get equation results.' def __init__(self, elementNode): 'Initialize.' @@ -981,7 +981,7 @@ class ClassFunction(BaseFunction): return self.returnValue -class ClassObject: +class ClassObject(object): 'Class to hold class attributes and functions.' def __init__(self, elementNode): 'Initialize.' @@ -1010,14 +1010,14 @@ class ClassObject: self.selfDictionary[attributeName] = value -class EmptyObject: +class EmptyObject(object): 'An empty object.' def __init__(self): 'Do nothing.' pass -class Evaluator: +class Evaluator(object): 'Base evaluator class.' def __init__(self, elementNode, word): 'Set value to none.' @@ -1790,7 +1790,7 @@ class Function(BaseFunction): return self.returnValue -class FunctionVariable: +class FunctionVariable(object): 'Class to hold class functions and variable set.' def __init__(self, elementNode): 'Initialize.' @@ -1834,7 +1834,7 @@ class FunctionVariable: self.processStatement(childNode) -class KeyValue: +class KeyValue(object): 'Class to hold a key value.' def __init__(self, key=None, value=None): 'Get key value.' @@ -1865,7 +1865,7 @@ class KeyValue: return self.getByCharacter('=', line ) -class ModuleElementNode: +class ModuleElementNode(object): 'Class to get the in attribute, the index name and the value name.' def __init__( self, elementNode): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py index 0ed20e61..4385ee61 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py @@ -32,7 +32,7 @@ def _getAccessibleAttribute(attributeName, elementNode): return Creation(elementNode, pluginModule).getCreation -class Creation: +class Creation(object): 'Class to handle a creation.' def __init__(self, elementNode, pluginModule): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py index 473cfeb6..0bb91a20 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py @@ -19,7 +19,7 @@ def _getAccessibleAttribute(attributeName, elementNode): return None -class Document: +class Document(object): 'Class to handle elementNodes in a document.' def __init__(self, elementNode): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py index a2c37fc1..29ec20a9 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py @@ -109,7 +109,7 @@ def getTwistPrecisionRadians(elementNode): return math.radians(getTwistPrecision(elementNode)) -class Setting: +class Setting(object): 'Class to get handle elementNodes in a setting.' def __init__(self, elementNode): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py index b29cd93a..4fc6dfc7 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py @@ -24,7 +24,7 @@ def _getAccessibleAttribute(attributeName, dictionaryObject): return None -class DictionaryAttribute: +class DictionaryAttribute(object): 'Class to handle a dictionary.' def __init__(self, dictionaryObject): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py index eca10817..6813a197 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py @@ -24,7 +24,7 @@ def _getAccessibleAttribute(attributeName, listObject): return None -class ListAttribute: +class ListAttribute(object): 'Class to handle a list.' def __init__(self, listObject): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py index 62478a1c..54b92582 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py @@ -24,7 +24,7 @@ def _getAccessibleAttribute(attributeName, stringObject): return None -class StringAttribute: +class StringAttribute(object): 'Class to handle a string.' def __init__(self, stringObject): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py index 2f5e20a2..f9db2bae 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py @@ -67,7 +67,7 @@ def getVector3Index(index=0, x=0.0, y=0.0, z=0.0): return Vector3Index(index, x, y, z) -class NestedVectorTestExample: +class NestedVectorTestExample(object): 'Class to test local attribute.' def __init__(self, vector3): 'Get the accessible attribute.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py index 8f87ef0a..c124cc6a 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py @@ -427,7 +427,7 @@ def transformVector3sByMatrix(tetragrid, vector3s): transformVector3Blindly(tetragrid, vector3) -class Matrix: +class Matrix(object): 'A four by four matrix.' def __init__(self, tetragrid=None): 'Add empty lists.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py index 266fdca9..b57cc564 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py @@ -58,7 +58,7 @@ def scalePoints(elementNode, points, prefix): point.z *= scaleVector3.z -class ScaleDerivation: +class ScaleDerivation(object): "Class to hold scale variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py index 758fb8a3..5776d350 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py @@ -55,7 +55,7 @@ def rotatePoints(elementNode, points, prefix): matrix.transformVector3sByMatrix(derivation.rotateTetragrid, points) -class RotateDerivation: +class RotateDerivation(object): "Class to hold rotate variables." def __init__(self, elementNode, prefix): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py index cf8df5b8..0c471f61 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py @@ -55,7 +55,7 @@ def transformPoints(elementNode, points, prefix): matrix.transformVector3sByMatrix(derivation.transformTetragrid, points) -class TransformDerivation: +class TransformDerivation(object): "Class to hold transform variables." def __init__(self, elementNode, prefix): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py index b2375645..115ccea8 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py @@ -59,7 +59,7 @@ def translatePoints(elementNode, points, prefix): euclidean.translateVector3Path(points, translateVector3) -class TranslateDerivation: +class TranslateDerivation(object): "Class to hold translate variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py index d26144a4..7bd48164 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py @@ -111,7 +111,7 @@ def processElementNodeByDerivation(derivation, elementNode): elementNode.getXMLProcessor().processElementNode(elementNode) -class ArrayDerivation: +class ArrayDerivation(object): "Class to hold array variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py index 19a0610e..c6715cc2 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py @@ -83,7 +83,7 @@ def processElementNodeByDerivation(derivation, elementNode): path.convertElementNode(pathElement, vector3Loops) -class CarveDerivation: +class CarveDerivation(object): "Class to hold carve variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py index 0aa0f1f6..7c93bdf1 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py @@ -63,7 +63,7 @@ def processElementNodeByDerivation(derivation, elementNode): elementNode.getXMLProcessor().convertElementNode(elementNode, geometryOutput) -class CopyDerivation: +class CopyDerivation(object): "Class to hold copy variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py index 4a8f2fe7..4c6fcc32 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py @@ -101,7 +101,7 @@ def processElementNodeByDerivation(derivation, elementNode): difference.processElementNode(differenceElement) -class DisjoinDerivation: +class DisjoinDerivation(object): "Class to hold disjoin variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py index c04cc6f0..3de73c48 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py @@ -81,7 +81,7 @@ def processElementNodeByDerivation(derivation, elementNode): evaluate.processArchivable(group.Group, elementNode) -class ImportDerivation: +class ImportDerivation(object): "Class to hold import variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py index 9fed5da2..9d2d128a 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py @@ -81,7 +81,7 @@ def writeXMLObject(absoluteFolderDirectory, derivation, fileNames, target, xmlOb archive.writeFileText(absoluteFileName, xmlObject.getFabricationText(derivation.addLayerTemplate)) -class WriteDerivation: +class WriteDerivation(object): "Class to hold write variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py index 125f35c6..a7ebba36 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py @@ -61,7 +61,7 @@ def processElementNode(elementNode): lineation.processElementNodeByFunction(elementNode, getManipulatedPaths) -class BevelDerivation: +class BevelDerivation(object): "Class to hold bevel variables." def __init__(self, elementNode, prefix, sideLength): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py index b910f8b2..7ee4b3b7 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py @@ -42,7 +42,7 @@ def processElementNode(elementNode): lineation.processElementNodeByFunction(elementNode, getManipulatedPaths) -class OutlineDerivation: +class OutlineDerivation(object): "Class to hold outline variables." def __init__(self, elementNode, prefix, sideLength): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py index 8a27f4c8..83f4e713 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py @@ -137,7 +137,7 @@ def processElementNode(elementNode): lineation.processElementNodeByFunction(elementNode, getManipulatedPaths) -class AlongAway: +class AlongAway(object): "Class to derive the path along the point and away from the point." def __init__( self, loop, overhangPlaneAngle ): "Initialize." @@ -211,7 +211,7 @@ class AlongAway: return self.getIsPointSupportedBySegment( self.pointIndex + 1 ) -class OverhangClockwise: +class OverhangClockwise(object): "Class to get the intersection up from the point." def __init__( self, alongAway ): "Initialize." @@ -269,7 +269,7 @@ class OverhangClockwise: self.alongAway.loop[ unsupportedBeginIndex : endIndex ] = supportPoints -class OverhangDerivation: +class OverhangDerivation(object): "Class to hold overhang variables." def __init__(self, elementNode, prefix): 'Set defaults.' @@ -277,7 +277,7 @@ class OverhangDerivation: self.overhangInclinationRadians = math.radians(evaluate.getEvaluatedFloat(0.0, elementNode, prefix + 'inclination')) -class OverhangWiddershinsLeft: +class OverhangWiddershinsLeft(object): "Class to get the intersection from the point down to the left." def __init__( self, alongAway ): "Initialize." diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py index fb00985a..c1ee8fcf 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py @@ -85,7 +85,7 @@ def processElementNode(elementNode): lineation.processElementNodeByFunction(elementNode, getManipulatedPaths) -class RoundDerivation: +class RoundDerivation(object): "Class to hold round variables." def __init__(self, elementNode, prefix, sideLength): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py index dce7a7d0..a0311bb5 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py @@ -140,7 +140,7 @@ def processElementNode(elementNode): lineation.processElementNodeByFunction(elementNode, getManipulatedPaths) -class SegmentDerivation: +class SegmentDerivation(object): "Class to hold segment variables." def __init__(self, elementNode, prefix): 'Set defaults.' @@ -148,7 +148,7 @@ class SegmentDerivation: self.path = evaluate.getPathByPrefix(elementNode, getSegmentPathDefault(), prefix) -class StartEnd: +class StartEnd(object): 'Class to get a start through end range.' def __init__(self, elementNode, modulo, prefix): "Initialize." diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py index 25d3c94d..952303d1 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py @@ -34,7 +34,7 @@ def processElementNode(elementNode): lineation.processElementNodeByFunction(elementNode, getManipulatedPaths) -class WedgeDerivation: +class WedgeDerivation(object): "Class to hold wedge variables." def __init__(self, elementNode, prefix): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py index 9a97eaf6..c63b039c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py @@ -89,7 +89,7 @@ def processElementNodeByDerivation(derivation, elementNode): bottomElementNode(derivation, target) -class BottomDerivation: +class BottomDerivation(object): "Class to hold bottom variables." def __init__(self, elementNode, prefix): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py index 495fe57f..fabda378 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py @@ -74,7 +74,7 @@ def processElementNode(elementNode): solid.processElementNodeByFunctionPair(elementNode, getManipulatedGeometryOutput, getManipulatedPaths) -class InsetDerivation: +class InsetDerivation(object): "Class to hold inset variables." def __init__(self, elementNode, prefix): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py index faadb191..ac4d6f35 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py @@ -66,7 +66,7 @@ def processElementNode(elementNode): solid.processElementNodeByFunctionPair(elementNode, getManipulatedGeometryOutput, getManipulatedPaths) -class OutsetDerivation: +class OutsetDerivation(object): "Class to hold outset variables." def __init__(self, elementNode, prefix): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py index 80621848..075b58b9 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py @@ -64,7 +64,7 @@ def getNewDerivation(elementNode, prefix, sideLength): return EquationDerivation(elementNode, prefix) -class EquationDerivation: +class EquationDerivation(object): "Class to hold equation variables." def __init__(self, elementNode, prefix): 'Set defaults.' @@ -81,7 +81,7 @@ class EquationDerivation: self.equationResults.append(EquationResult(elementNode, equationFunction, prefixedEquationName)) -class EquationResult: +class EquationResult(object): "Class to get equation results." def __init__(self, elementNode, equationFunction, key): "Initialize." diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py index c59fec95..af666c3e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py @@ -82,7 +82,7 @@ def processElementNode(elementNode): solid.processElementNodeByFunctionPair(elementNode, getManipulatedGeometryOutput, getManipulatedPaths) -class FlipDerivation: +class FlipDerivation(object): "Class to hold flip variables." def __init__(self, elementNode, prefix): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py index 6ed84b01..886f5eb2 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py @@ -68,7 +68,7 @@ class Cube(triangle_mesh.TriangleMesh): solid.processArchiveRemoveSolid(elementNode, self.getGeometryOutput()) -class CubeDerivation: +class CubeDerivation(object): "Class to hold cube variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py index 70e16866..40abe76c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py @@ -99,7 +99,7 @@ class Cylinder( cube.Cube ): solid.processArchiveRemoveSolid(elementNode, self.getGeometryOutput()) -class CylinderDerivation: +class CylinderDerivation(object): "Class to hold cylinder variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py index a9801b4c..efffcad6 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py @@ -73,7 +73,7 @@ class Sphere(cube.Cube): solid.processArchiveRemoveSolid(elementNode, self.getGeometryOutput()) -class SphereDerivation: +class SphereDerivation(object): "Class to hold sphere variables." def __init__(self, elementNode): 'Set defaults.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py index 308b1dfb..36d583f9 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py @@ -724,7 +724,7 @@ def sortLoopsInOrderOfArea(isDescending, loops): loops.sort(key=euclidean.getAreaLoopAbsolute, reverse=isDescending) -class EdgePair: +class EdgePair(object): def __init__(self): 'Pair of edges on a face.' self.edgeIndexes = [] @@ -743,7 +743,7 @@ class EdgePair: return self -class FaceGenerator: +class FaceGenerator(object): 'A face generator.' def __init__(self, faces, indexedLoopBottom, indexedLoopTop): 'Initialize.' @@ -922,7 +922,7 @@ class TriangleMesh( group.Group ): face.setEdgeIndexesToVertexIndexes( self.edges, edgeTable ) -class ZoneArrangement: +class ZoneArrangement(object): 'A zone arrangement.' def __init__(self, layerHeight, vertexes): 'Initialize the zone interval and the zZone table.' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py index 5772cdb1..88d345c1 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py @@ -46,7 +46,7 @@ def processElementNode(elementNode): processChildNodesByIndexValue( elementNode, function, inKey, elementNode.xmlObject, inValue[ inKey ] ) -class IndexValue: +class IndexValue(object): "Class to get the in attribute, the index name and the value name." def __init__(self, elementNode): "Initialize." diff --git a/Cura/cura_sf/fabmetheus_utilities/intercircle.py b/Cura/cura_sf/fabmetheus_utilities/intercircle.py index 4ab457ee..39d618f7 100644 --- a/Cura/cura_sf/fabmetheus_utilities/intercircle.py +++ b/Cura/cura_sf/fabmetheus_utilities/intercircle.py @@ -548,7 +548,7 @@ def removeIntersection( loop ): return -class BoundingLoop: +class BoundingLoop(object): 'A class to hold a bounding loop composed of a minimum complex, a maximum complex and an outset loop.' def __eq__(self, other): 'Determine whether this bounding loop is identical to other one.' @@ -614,7 +614,7 @@ class BoundingLoop: return self.minimum.imag > anotherBoundingLoop.maximum.imag or self.minimum.real > anotherBoundingLoop.maximum.real -class CenterOutset: +class CenterOutset(object): 'A class to hold a center and an outset.' def __init__(self, center, outset): 'Set the center and outset.' @@ -626,7 +626,7 @@ class CenterOutset: return '%s\n%s' % (self.center, self.outset) -class CircleIntersection: +class CircleIntersection(object): 'An intersection of two complex circles.' def __init__( self, circleNodeAhead, index, circleNodeBehind ): self.aheadMinusBehind = 0.5 * ( circleNodeAhead.dividedPoint - circleNodeBehind.dividedPoint ) @@ -695,7 +695,7 @@ class CircleIntersection: return False -class CircleNode: +class CircleNode(object): 'A complex node of complex circle intersections.' def __init__(self, oneOverRadius, point): self.actualPoint = point diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py index 43c9db48..078acf18 100644 --- a/Cura/cura_sf/fabmetheus_utilities/settings.py +++ b/Cura/cura_sf/fabmetheus_utilities/settings.py @@ -458,7 +458,7 @@ def getAlterationFile(fileName): ## Configuration settings classes ## #################################### -class GeneralSetting: +class GeneralSetting(object): "Just a basic setting subclass" def getFromValue( self, name, repository, value ): #print('GeneralSetting:', name, repository, value ) @@ -477,7 +477,7 @@ class BooleanSetting( GeneralSetting ): def setValueToString(self, value): self.value = str(value) == "True" -class LatentStringVar: +class LatentStringVar(object): "This is actually used as 'group' object for Radio buttons. (Did I mention the code is a mess?)" "This class doesn't have a name, and isn't really used for anything. It doesn't even know which repository it belongs to" @@ -505,7 +505,7 @@ class RadioCapitalizedButton( Radio ): repository.preferences.append(self) return self -class FileNameInput(StringSetting ): +class FileNameInput(StringSetting): "A class to display, read & write a fileName." def getFromFileName( self, fileTypes, name, repository, value ): #print('FileNameInput:getFromFileName:', self, fileTypes, name, repository, value ) @@ -513,12 +513,12 @@ class FileNameInput(StringSetting ): self.value = value return self -class HelpPage: +class HelpPage(object): "A class to open a help page." def getOpenFromAbsolute( self, hypertextAddress ): return self -class MenuButtonDisplay: +class MenuButtonDisplay(object): "A class to add a combo box selection." def getFromName( self, name, repository ): #print('MenuButtonDisplay->getFromName:', name, repository ) @@ -553,7 +553,7 @@ class MenuRadio( BooleanSetting ): menuButtonDisplay.addRadio(self, value) return self -class LabelDisplay: +class LabelDisplay(object): "A class to add a label." def getFromName( self, name, repository ): "Initialize." @@ -574,7 +574,7 @@ class FloatSpin( FloatSetting ): repository.preferences.append(self) return self -class LabelSeparator: +class LabelSeparator(object): "A class to add a label and menu separator." def getFromRepository( self, repository ): "Initialize." @@ -596,7 +596,7 @@ class IntSpin(FloatSpin): # Helper classes ########################## -class LayerCount: +class LayerCount(object): 'A class to handle the layerIndex.' def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/fabmetheus_utilities/svg_reader.py b/Cura/cura_sf/fabmetheus_utilities/svg_reader.py index 980a1e64..03846c91 100644 --- a/Cura/cura_sf/fabmetheus_utilities/svg_reader.py +++ b/Cura/cura_sf/fabmetheus_utilities/svg_reader.py @@ -485,7 +485,7 @@ def processSVGElementtext(elementNode, svgReader): loopLayer.loops.append(matrixSVG.getTransformedPath(translatedLoop)) -class FontReader: +class FontReader(object): "Class to read a font in the fonts folder." def __init__(self, fontFamily): "Initialize." @@ -514,7 +514,7 @@ class FontReader: return self.glyphDictionary[character] -class Glyph: +class Glyph(object): "Class to handle a glyph." def __init__(self, elementNode, unitsPerEM, yAxisPointingUpward): "Initialize." @@ -541,7 +541,7 @@ class Glyph: return sizedLoops -class MatrixSVG: +class MatrixSVG(object): "Two by three svg matrix." def __init__(self, tricomplex=None): "Initialize." @@ -591,7 +591,7 @@ class MatrixSVG: return transformedPaths -class PathReader: +class PathReader(object): "Class to read svg path." def __init__(self, elementNode, loops, yAxisPointingUpward): "Add to path string to loops." @@ -837,7 +837,7 @@ class PathReader: self.processPathWordZ() -class SVGReader: +class SVGReader(object): "An svg carving." def __init__(self): "Add empty lists." diff --git a/Cura/cura_sf/fabmetheus_utilities/svg_writer.py b/Cura/cura_sf/fabmetheus_utilities/svg_writer.py index b7332746..eda04699 100644 --- a/Cura/cura_sf/fabmetheus_utilities/svg_writer.py +++ b/Cura/cura_sf/fabmetheus_utilities/svg_writer.py @@ -92,7 +92,7 @@ def setSVGCarvingCorners(cornerMaximum, cornerMinimum, layerHeight, loopLayers): cornerMinimum.z -= halfLayerThickness -class SVGWriter: +class SVGWriter(object): 'A base class to get an svg skein from a carving.' def __init__(self, addLayerTemplateToSVG, diff --git a/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py b/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py index 9fcfe0d5..1bf2e53b 100644 --- a/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py +++ b/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py @@ -93,7 +93,7 @@ def getFileText(fileName, printWarning=True, readMode='r'): return '' -class CDATASectionMonad: +class CDATASectionMonad(object): 'A monad to handle a CDATASection node.' def __init__(self, input, parentNode): 'Initialize.' @@ -112,7 +112,7 @@ class CDATASectionMonad: return self -class CDATASectionNode: +class CDATASectionNode(object): 'A CDATASection node.' def __init__(self, parentNode, textContent=''): 'Initialize.' @@ -228,7 +228,7 @@ class CommentNode(CDATASectionNode): nodeType = property(getNodeType) -class DocumentNode: +class DocumentNode(object): 'A class to parse an xml text and store the elements.' def __init__(self, fileName, xmlText): 'Initialize.' @@ -337,7 +337,7 @@ class DocumentTypeNode(CDATASectionNode): nodeType = property(getNodeType) -class ElementEndMonad: +class ElementEndMonad(object): 'A monad to look for the end of an ElementNode tag.' def __init__(self, parentNode): 'Initialize.' @@ -350,7 +350,7 @@ class ElementEndMonad: return self -class ElementLocalNameMonad: +class ElementLocalNameMonad(object): 'A monad to set the local name of an ElementNode.' def __init__(self, character, parentNode): 'Initialize.' @@ -388,7 +388,7 @@ class ElementLocalNameMonad: self.elementNode.localName = self.input.getvalue().lower().strip() -class ElementNode: +class ElementNode(object): 'An xml element.' def __init__(self, parentNode=None): 'Initialize.' @@ -725,7 +725,7 @@ class ElementNode: textContent = property(getTextContent) -class ElementReadMonad: +class ElementReadMonad(object): 'A monad to read the attributes of the ElementNode tag.' def __init__(self, elementNode): 'Initialize.' @@ -744,7 +744,7 @@ class ElementReadMonad: return KeyMonad(character, self.elementNode) -class KeyMonad: +class KeyMonad(object): 'A monad to set the key of an attribute of an ElementNode.' def __init__(self, character, elementNode): 'Initialize.' @@ -784,7 +784,7 @@ class OpenMonad(ElementEndMonad): return self -class TextMonad: +class TextMonad(object): 'A monad to handle the open tag character and set the text.' def __init__(self, parentNode): 'Initialize.' @@ -824,7 +824,7 @@ class TextNode(CDATASectionNode): nodeType = property(getNodeType) -class ValueMonad: +class ValueMonad(object): 'A monad to set the value of an attribute of an ElementNode.' def __init__(self, elementNode, key): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py index 563a7862..6b625836 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py @@ -61,7 +61,7 @@ def writeOutput(fileName): return skeinforge_craft.writeOutput(fileName) -class CraftMenuSaveListener: +class CraftMenuSaveListener(object): "A class to update a craft menu." def __init__( self, menu, window ): "Set the menu." @@ -75,7 +75,7 @@ class CraftMenuSaveListener: addToCraftMenu( self.menu ) -class CraftRadioButtonsSaveListener: +class CraftRadioButtonsSaveListener(object): "A class to update the craft radio buttons." def addToDialog( self, gridPosition ): "Add this to the dialog." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py index 00ff25c9..4ac2a731 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py @@ -136,7 +136,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'alteration', shouldAnalyze) -class AlterationRepository: +class AlterationRepository(object): "A class to handle the alteration settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -158,7 +158,7 @@ class AlterationRepository: writeOutput(fileName) -class AlterationSkein: +class AlterationSkein(object): "A class to alteration a skein of extrusions." def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py index c65ffe01..acd32c70 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py @@ -83,7 +83,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeSVGTextWithNounMessage(fileName, BottomRepository(), shouldAnalyze) -class BottomRepository: +class BottomRepository(object): "A class to handle the bottom settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -106,7 +106,7 @@ class BottomRepository: writeOutput(fileName) -class BottomSkein: +class BottomSkein(object): "A class to bottom a skein of extrusions." def getCraftedGcode(self, fileName, repository, svgText): "Parse svgText and store the bottom svgText." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py index f06753eb..14ef4476 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py @@ -145,7 +145,7 @@ def writeOutput(fileName, shouldAnalyze=True): settings.openSVGPage(suffixFileName, repository.svgViewer.value) -class CarveRepository: +class CarveRepository(object): "A class to handle the carve settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -189,7 +189,7 @@ class CarveRepository: writeOutput(fileName) -class CarveSkein: +class CarveSkein(object): "A class to carve a carving." def getCarvedSVG(self, carving, fileName, repository): "Parse gnu triangulated surface text and store the carved gcode." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py index 1fca0a2b..62d328d0 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py @@ -198,7 +198,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'chamber', shouldAnalyze) -class ChamberRepository: +class ChamberRepository(object): "A class to handle the chamber settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -225,7 +225,7 @@ class ChamberRepository: -class ChamberSkein: +class ChamberSkein(object): "A class to chamber a skein of extrusions." def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py index d37eced1..1bbf9418 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py @@ -135,7 +135,7 @@ def writeOutput(fileName, shouldAnalyze=True): settings.openSVGPage( suffixFileName, repository.svgViewer.value ) -class ChopRepository: +class ChopRepository(object): "A class to handle the chop settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -164,7 +164,7 @@ class ChopRepository: writeOutput(fileName) -class ChopSkein: +class ChopSkein(object): "A class to chop a carving." def addExtraTopLayerIfNecessary( self, carving, layerHeight, loopLayers ): "Add extra top layer if necessary." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py index fa5f225c..cd8332ec 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py @@ -130,7 +130,7 @@ def writeOutput(fileName, shouldAnalyze=True): settings.openSVGPage( suffixFileName, repository.svgViewer.value ) -class CleaveRepository: +class CleaveRepository(object): "A class to handle the cleave settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -158,7 +158,7 @@ class CleaveRepository: writeOutput(fileName) -class CleaveSkein: +class CleaveSkein(object): "A class to cleave a carving." def getCarvedSVG( self, carving, fileName, repository ): "Parse gnu triangulated surface text and store the cleaved gcode." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py index a3602c27..9fef02ab 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py @@ -82,7 +82,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'clip', shouldAnalyze) -class ClipRepository: +class ClipRepository(object): "A class to handle the clip settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -101,7 +101,7 @@ class ClipRepository: writeOutput(fileName) -class ClipSkein: +class ClipSkein(object): "A class to clip a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py index 7f5b0e6d..728e6457 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py @@ -70,7 +70,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'coil', shouldAnalyze) -class CoilRepository: +class CoilRepository(object): "A class to handle the coil settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -88,7 +88,7 @@ class CoilRepository: -class CoilSkein: +class CoilSkein(object): "A class to coil a skein of extrusions." def __init__(self): self.boundaryLayers = [] diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py index 0f14024e..5e12e853 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py @@ -125,7 +125,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'comb', shouldAnalyze) -class BoundarySegment: +class BoundarySegment(object): 'A boundary and segment.' def __init__(self, begin): 'Initialize' @@ -144,7 +144,7 @@ class BoundarySegment: return (self.segment[0], end) -class CombRepository: +class CombRepository(object): "A class to handle the comb settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -162,7 +162,7 @@ class CombRepository: writeOutput(fileName) -class CombSkein: +class CombSkein(object): "A class to comb a skein of extrusions." def __init__(self): 'Initialize' @@ -451,7 +451,7 @@ class CombSkein: self.distanceFeedRate.addLineCheckAlteration(line) -class DistancePoint: +class DistancePoint(object): 'A class to get the distance of the point along a segment inside a loop.' def __init__(self, begin, loop, runningJumpSpace, segment): 'Initialize' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py index 3541f530..db54b48b 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py @@ -131,7 +131,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'cool', shouldAnalyze) -class CoolRepository: +class CoolRepository(object): 'A class to handle the cool settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -172,7 +172,7 @@ class CoolRepository: writeOutput(fileName) -class CoolSkein: +class CoolSkein(object): 'A class to cool a skein of extrusions.' def __init__(self): self.boundaryLayer = None diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py index f42570fc..0d29205d 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py @@ -137,7 +137,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'dimension', shouldAnalyze) -class DimensionRepository: +class DimensionRepository(object): 'A class to handle the dimension settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -169,7 +169,7 @@ class DimensionRepository: writeOutput(fileName) -class DimensionSkein: +class DimensionSkein(object): 'A class to dimension a skein of extrusions.' def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py index ca462cfc..685c0c07 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py @@ -80,7 +80,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'drill', shouldAnalyze) -class ThreadLayer: +class ThreadLayer(object): "A layer of loops and paths." def __init__( self, z ): "Thread layer constructor." @@ -92,7 +92,7 @@ class ThreadLayer: return '%s, %s' % ( self.z, self.points ) -class DrillRepository: +class DrillRepository(object): "A class to handle the drill settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -110,7 +110,7 @@ class DrillRepository: writeOutput(fileName) -class DrillSkein: +class DrillSkein(object): "A class to drill a skein of extrusions." def __init__(self): self.boundary = None diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py index 436c1473..1ba8ba59 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py @@ -84,7 +84,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'dwindle', shouldAnalyze) -class DwindleRepository: +class DwindleRepository(object): 'A class to handle the dwindle settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -106,7 +106,7 @@ class DwindleRepository: writeOutput(fileName) -class DwindleSkein: +class DwindleSkein(object): 'A class to dwindle a skein of extrusions.' def __init__(self): 'Initialize.' @@ -207,7 +207,7 @@ class DwindleSkein: self.distanceFeedRate.addLine(line) -class ThreadSection: +class ThreadSection(object): 'A class to handle a volumetric section of a thread.' def __init__(self, feedRateMinute, flowRate, location, oldLocation): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py index 91fd4f09..b6ff2239 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py @@ -310,7 +310,7 @@ def writeOutput(fileName, shouldAnalyze=True): return window -class ExportRepository: +class ExportRepository(object): 'A class to handle the export settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -363,7 +363,7 @@ class ExportRepository: writeOutput(fileName) -class ExportSkein: +class ExportSkein(object): 'A class to export a skein of extrusions.' def __init__(self): self.crafting = False diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py index e8375ba6..a94bb57a 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py @@ -132,7 +132,7 @@ def writeOutput( fileName, gcodeText = ''): print('The converted file is saved as ' + archive.getSummarizedFileName(suffixFileName)) -class GcodeStepRepository: +class GcodeStepRepository(object): 'A class to handle the export settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -163,7 +163,7 @@ class GcodeStepRepository: writeOutput(fileName) -class GcodeStepSkein: +class GcodeStepSkein(object): 'A class to convert gcode into 16 byte binary segments.' def __init__(self): self.oldFeedRateString = None diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py index 5e21e8c3..99c74f4e 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py @@ -117,7 +117,7 @@ def writeOutput( fileName, gcodeText = ''): print('The converted file is saved as ' + archive.getSummarizedFileName(suffixFileName) ) -class GcodeTimeSegmentRepository: +class GcodeTimeSegmentRepository(object): "A class to handle the export settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -147,7 +147,7 @@ class GcodeTimeSegmentRepository: writeOutput(fileName) -class GcodeTimeSegmentSkein: +class GcodeTimeSegmentSkein(object): "A class to convert gcode into time segments." def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py index 246cee5d..b55e52dd 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py @@ -62,7 +62,7 @@ def getTextLines(text): return text.replace('\r', '\n').split('\n') -class GcodeSmallSkein: +class GcodeSmallSkein(object): "A class to remove redundant z and feed rate parameters from a skein of extrusions." def __init__(self): self.lastFeedRateString = None diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py index 5766d409..fb1a1aba 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py @@ -81,8 +81,7 @@ def writeOutput(fileName, shouldAnalyze=True): "Feed a gcode linear move file." skeinforge_craft.writeChainTextWithNounMessage(fileName, 'feed', shouldAnalyze) - -class FeedRepository: +class FeedRepository(object): "A class to handle the feed settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -102,7 +101,7 @@ class FeedRepository: writeOutput(fileName) -class FeedSkein: +class FeedSkein(object): "A class to feed a skein of cuttings." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py index 6cb80525..cd366164 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py @@ -761,7 +761,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'fill', shouldAnalyze) -class FillRepository: +class FillRepository(object): 'A class to handle the fill settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -823,7 +823,7 @@ class FillRepository: writeOutput(fileName) -class FillSkein: +class FillSkein(object): 'A class to fill a skein of extrusions.' def __init__(self): 'Initialize.' @@ -1334,7 +1334,7 @@ class FillSkein: self.gridJunctionMiddle = halfGridMinusWidth * repository.gridJunctionSeparationOverOctogonRadiusAtMiddle.value -class RotatedLayer: +class RotatedLayer(object): 'A rotated layer.' def __init__( self, z ): 'Initialize.' @@ -1348,7 +1348,7 @@ class RotatedLayer: return '%s, %s, %s' % ( self.z, self.rotation, self.nestedRings ) -class YIntersectionPath: +class YIntersectionPath(object): 'A class to hold the y intersection position, the loop which it intersected and the point index of the loop which it intersected.' def __init__( self, pathIndex, pointIndex, y ): 'Initialize from the path, point index, and y.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py index b040fe3d..51e33bc7 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py @@ -109,7 +109,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'fillet', shouldAnalyze) -class BevelSkein: +class BevelSkein(object): "A class to bevel a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() @@ -352,7 +352,7 @@ class ArcRadiusSkein( ArcPointSkein ): return ' R' + ( self.distanceFeedRate.getRounded(radius) ) -class FilletRepository: +class FilletRepository(object): "A class to handle the fillet settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py index 82a7f1df..8eda2a7e 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py @@ -67,7 +67,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'flow', shouldAnalyze) -class FlowRepository: +class FlowRepository(object): "A class to handle the flow settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -84,7 +84,7 @@ class FlowRepository: writeOutput(fileName) -class FlowSkein: +class FlowSkein(object): "A class to flow a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py index 16fb7611..c9bb6235 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py @@ -71,7 +71,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'home', shouldAnalyze) -class HomeRepository: +class HomeRepository(object): "A class to handle the home settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -89,7 +89,7 @@ class HomeRepository: writeOutput(fileName) -class HomeSkein: +class HomeSkein(object): "A class to home a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py index 411a72f0..53a77f0d 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py @@ -83,7 +83,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'hop', shouldAnalyze) -class HopRepository: +class HopRepository(object): "A class to handle the hop settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -102,7 +102,7 @@ class HopRepository: writeOutput(fileName) -class HopSkein: +class HopSkein(object): "A class to hop a skein of extrusions." def __init__(self): 'Initialize' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py index 7d1ec974..8af333f5 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py @@ -280,7 +280,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'inset', shouldAnalyze) -class InsetRepository: +class InsetRepository(object): "A class to handle the inset settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -308,7 +308,7 @@ class InsetRepository: writeOutput(fileName) -class InsetSkein: +class InsetSkein(object): "A class to inset a skein of extrusions." def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py index 0b3acd3e..8ffae956 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py @@ -106,7 +106,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'jitter', shouldAnalyze) -class JitterRepository: +class JitterRepository(object): 'A class to handle the jitter settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -124,7 +124,7 @@ class JitterRepository: writeOutput(fileName) -class JitterSkein: +class JitterSkein(object): 'A class to jitter a skein of extrusions.' def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py index 8a8f1c1c..d211cdbb 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py @@ -62,7 +62,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'joris', shouldAnalyze) -class JorisRepository: +class JorisRepository(object): 'A class to handle the Joris settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -81,7 +81,7 @@ class JorisRepository: writeOutput(fileName) -class JorisSkein: +class JorisSkein(object): 'A class to Joris a skein of extrusions.' def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py index dd5e5a13..0e731e94 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py @@ -78,7 +78,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'lash', shouldAnalyze) -class LashRepository: +class LashRepository(object): "A class to handle the lash settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -97,7 +97,7 @@ class LashRepository: writeOutput(fileName) -class LashSkein: +class LashSkein(object): "A class to lash a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py index 7c5ffb61..9fccf0df 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py @@ -70,7 +70,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'lift', shouldAnalyze) -class LiftRepository: +class LiftRepository(object): "A class to handle the lift settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -88,7 +88,7 @@ class LiftRepository: writeOutput(fileName) -class LiftSkein: +class LiftSkein(object): "A class to lift a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py index 66a52123..ac3e2c95 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py @@ -71,7 +71,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'limit', shouldAnalyze) -class LimitRepository: +class LimitRepository(object): 'A class to handle the limit settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -89,7 +89,7 @@ class LimitRepository: writeOutput(fileName) -class LimitSkein: +class LimitSkein(object): 'A class to limit a skein of extrusions.' def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py index 5b8a018f..0bc135b6 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py @@ -115,7 +115,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'mill', shouldAnalyze) -class Average: +class Average(object): 'A class to hold values and get the average.' def __init__(self): self.reset() @@ -138,7 +138,7 @@ class Average: self.total = 0.0 -class MillRepository: +class MillRepository(object): 'A class to handle the mill settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -163,7 +163,7 @@ class MillRepository: -class MillSkein: +class MillSkein(object): 'A class to mill a skein of extrusions.' def __init__(self): self.aroundPixelTable = {} diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py index ca2d52ec..8f4a4334 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py @@ -100,7 +100,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'multiply', shouldAnalyze) -class MultiplyRepository: +class MultiplyRepository(object): 'A class to handle the multiply settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -130,7 +130,7 @@ class MultiplyRepository: writeOutput(fileName) -class MultiplySkein: +class MultiplySkein(object): 'A class to multiply a skein of extrusions.' def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py index fd75a37f..a16ab6d2 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py @@ -107,7 +107,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'oozebane', shouldAnalyze) -class OozebaneRepository: +class OozebaneRepository(object): "A class to handle the oozebane settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -132,7 +132,7 @@ class OozebaneRepository: writeOutput(fileName) -class OozebaneSkein: +class OozebaneSkein(object): "A class to oozebane a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py index de181a5c..be389371 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py @@ -63,7 +63,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'outset', shouldAnalyze) -class OutsetRepository: +class OutsetRepository(object): 'A class to handle the outset settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -79,7 +79,7 @@ class OutsetRepository: writeOutput(fileName) -class OutsetSkein: +class OutsetSkein(object): 'A class to outset a skein of extrusions.' def __init__(self): self.boundary = None diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py index aa42745f..5b362031 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py @@ -94,7 +94,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'preface', shouldAnalyze) -class PrefaceRepository: +class PrefaceRepository(object): "A class to handle the preface settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -118,7 +118,7 @@ class PrefaceRepository: writeOutput(fileName) -class PrefaceSkein: +class PrefaceSkein(object): "A class to preface a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py index 615bc7e7..b4771d86 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py @@ -330,7 +330,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'raft', shouldAnalyze) -class RaftRepository: +class RaftRepository(object): 'A class to handle the raft settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -410,7 +410,7 @@ class RaftRepository: writeOutput(fileName) -class RaftSkein: +class RaftSkein(object): 'A class to raft a skein of extrusions.' def __init__(self): self.addLineLayerStart = True @@ -1094,7 +1094,7 @@ class RaftSkein: self.supportLayers = [] -class SupportLayer: +class SupportLayer(object): 'Support loops with segment tables.' def __init__( self, supportLoops ): self.supportLoops = supportLoops diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py index 12a636eb..60f99ade 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py @@ -93,7 +93,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeSVGTextWithNounMessage(fileName, ScaleRepository(), shouldAnalyze) -class ScaleRepository: +class ScaleRepository(object): "A class to handle the scale settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -113,7 +113,7 @@ class ScaleRepository: writeOutput(fileName) -class ScaleSkein: +class ScaleSkein(object): "A class to scale a skein of extrusions." def getCraftedGcode(self, fileName, repository, svgText): "Parse svgText and store the scale svgText." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py index a447f6e3..c8a69f0e 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py @@ -110,7 +110,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'skin', shouldAnalyze) -class SkinRepository: +class SkinRepository(object): 'A class to handle the skin settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -135,7 +135,7 @@ class SkinRepository: writeOutput(fileName) -class SkinSkein: +class SkinSkein(object): 'A class to skin a skein of extrusions.' def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py index 5b8e0959..e5c8bdc1 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py @@ -108,7 +108,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'skirt', shouldAnalyze) -class LoopCrossDictionary: +class LoopCrossDictionary(object): 'Loop with a horizontal and vertical dictionary.' def __init__(self): 'Initialize LoopCrossDictionary.' @@ -119,7 +119,7 @@ class LoopCrossDictionary: return str(self.loop) -class SkirtRepository: +class SkirtRepository(object): 'A class to handle the skirt settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -141,7 +141,7 @@ class SkirtRepository: writeOutput(fileName) -class SkirtSkein: +class SkirtSkein(object): 'A class to skirt a skein of extrusions.' def __init__(self): 'Initialize variables.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py index 0838098d..da21d169 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py @@ -79,7 +79,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'smooth', shouldAnalyze) -class SmoothRepository: +class SmoothRepository(object): 'A class to handle the smooth settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -98,7 +98,7 @@ class SmoothRepository: writeOutput(fileName) -class SmoothSkein: +class SmoothSkein(object): 'A class to smooth a skein of extrusions.' def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py index e42a7b61..2aa7224c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py @@ -157,7 +157,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'speed', shouldAnalyze) -class SpeedRepository: +class SpeedRepository(object): "A class to handle the speed settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -216,7 +216,7 @@ class SpeedRepository: writeOutput(fileName) -class SpeedSkein: +class SpeedSkein(object): "A class to speed a skein of extrusions." def __init__(self): 'Initialize.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py index d1babb18..bef836f6 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py @@ -97,7 +97,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'splodge', shouldAnalyze) -class SplodgeRepository: +class SplodgeRepository(object): "A class to handle the splodge settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -125,7 +125,7 @@ class SplodgeRepository: writeOutput(fileName) -class SplodgeSkein: +class SplodgeSkein(object): "A class to splodge a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py index 0cb1430c..0af481a8 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py @@ -108,7 +108,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'stretch', shouldAnalyze) -class LineIteratorBackward: +class LineIteratorBackward(object): "Backward line iterator class." def __init__( self, isLoop, lineIndex, lines ): self.firstLineIndex = None @@ -172,7 +172,7 @@ class LineIteratorBackward: return False -class LineIteratorForward: +class LineIteratorForward(object): "Forward line iterator class." def __init__( self, isLoop, lineIndex, lines ): self.firstLineIndex = None @@ -213,7 +213,7 @@ class LineIteratorForward: raise StopIteration, "You've reached the end of the line." -class StretchRepository: +class StretchRepository(object): "A class to handle the stretch settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -239,7 +239,7 @@ class StretchRepository: writeOutput(fileName) -class StretchSkein: +class StretchSkein(object): "A class to stretch a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py index 0775100b..4282c248 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py @@ -114,7 +114,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'temperature', shouldAnalyze) -class TemperatureRepository: +class TemperatureRepository(object): "A class to handle the temperature settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -144,7 +144,7 @@ class TemperatureRepository: writeOutput(fileName) -class TemperatureSkein: +class TemperatureSkein(object): "A class to temperature a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py index 4efe8ad3..7be66578 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py @@ -82,7 +82,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'tower', shouldAnalyze) -class Island: +class Island(object): "A class to hold the boundary and lines." def __init__(self): self.boundary = [] @@ -102,7 +102,7 @@ class Island: self.boundingLoop = intercircle.BoundingLoop().getFromLoop( self.boundary ) -class ThreadLayer: +class ThreadLayer(object): "A layer of loops and paths." def __init__(self): "Thread layer constructor." @@ -115,7 +115,7 @@ class ThreadLayer: return '%s' % self.islands -class TowerRepository: +class TowerRepository(object): "A class to handle the tower settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -135,7 +135,7 @@ class TowerRepository: writeOutput(fileName) -class TowerSkein: +class TowerSkein(object): "A class to tower a skein of extrusions." def __init__(self): self.afterExtrusionLines = [] diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py index c46ff90d..d7ae2d29 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py @@ -82,7 +82,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'unpause', shouldAnalyze) -class UnpauseRepository: +class UnpauseRepository(object): "A class to handle the unpause settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -101,7 +101,7 @@ class UnpauseRepository: writeOutput(fileName) -class UnpauseSkein: +class UnpauseSkein(object): "A class to unpause a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py index 147e4085..19eb5f79 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py @@ -67,7 +67,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'whittle', shouldAnalyze) -class WhittleRepository: +class WhittleRepository(object): "A class to handle the whittle settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -84,7 +84,7 @@ class WhittleRepository: writeOutput(fileName) -class WhittleSkein: +class WhittleSkein(object): "A class to whittle a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py index f6866278..9649f353 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py @@ -103,7 +103,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'widen', shouldAnalyze) -class WidenRepository: +class WidenRepository(object): 'A class to handle the widen settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' @@ -124,7 +124,7 @@ class WidenRepository: writeOutput(fileName) -class WidenSkein: +class WidenSkein(object): 'A class to widen a skein of extrusions.' def __init__(self): self.boundary = None diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py index 04de7e47..de65e59c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py @@ -121,7 +121,7 @@ def writeOutput(fileName, shouldAnalyze=True): skeinforge_craft.writeChainTextWithNounMessage(fileName, 'wipe', shouldAnalyze) -class WipeRepository: +class WipeRepository(object): "A class to handle the wipe settings." def __init__(self): "Set the default settings, execute title & settings fileName." @@ -155,7 +155,7 @@ class WipeRepository: writeOutput(fileName) -class WipeSkein: +class WipeSkein(object): "A class to wipe a skein of extrusions." def __init__(self): self.distanceFeedRate = gcodec.DistanceFeedRate() diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py index d823413c..21c356ef 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py @@ -32,7 +32,7 @@ def getNewRepository(): return DescriptionRepository() -class DescriptionRepository: +class DescriptionRepository(object): "A class to handle the description settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py index d1b44816..6a49bdc5 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py @@ -58,7 +58,7 @@ def getNewRepository(): return skeinforge_profile.ProfileRepository() -class ProfileMenuRadio: +class ProfileMenuRadio(object): "A class to display a profile menu radio button." def __init__( self, profilePluginFileName, menu, name, radioVar, value ): "Create a profile menu radio." @@ -92,7 +92,7 @@ class ProfileMenuRadio: skeinforge_profile.updateProfileSaveListeners() -class ProfileMenuSaveListener: +class ProfileMenuSaveListener(object): "A class to update a profile menu." def __init__( self, menu, window ): "Set the menu." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py index e4637128..cbf5ac28 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py @@ -35,7 +35,7 @@ def getNewRepository(): return CuttingRepository() -class CuttingRepository: +class CuttingRepository(object): "A class to handle the cutting settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py index 1168cc3a..76a4f342 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py @@ -35,7 +35,7 @@ def getNewRepository(): return ExtrusionRepository() -class ExtrusionRepository: +class ExtrusionRepository(object): 'A class to handle the export settings.' def __init__(self): 'Set the default settings, execute title & settings fileName.' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py index 443eddc8..5d39eed1 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py @@ -35,7 +35,7 @@ def getNewRepository(): return MillingRepository() -class MillingRepository: +class MillingRepository(object): "A class to handle the milling settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py index 39c0b3a8..30949c72 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py @@ -35,7 +35,7 @@ def getNewRepository(): return WindingRepository() -class WindingRepository: +class WindingRepository(object): "A class to handle the winding settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py index 5dbb98b1..1927eae4 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py @@ -51,7 +51,7 @@ def writeOutput(fileName, fileNamePenultimate, fileNameSuffix, filePenultimateWr return window -class AnalyzeRepository: +class AnalyzeRepository(object): "A class to handle the analyze settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py index 4f6db476..4a54ffda 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py @@ -154,7 +154,7 @@ def writeSVGTextWithNounMessage(fileName, repository, shouldAnalyze=True): settings.openSVGPage(fileNameSuffix, repository.svgViewer.value) -class CraftRadioButtonsSaveListener: +class CraftRadioButtonsSaveListener(object): "A class to update the craft radio buttons." def addToDialog( self, gridPosition ): "Add this to the dialog." @@ -198,7 +198,7 @@ class CraftRadioButtonsSaveListener: self.repository.pluginFrame.update() -class CraftRepository: +class CraftRepository(object): "A class to handle the craft settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py index 7f41ef6c..a7f0791a 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py @@ -20,7 +20,7 @@ def getNewRepository(): return HelpRepository() -class HelpRepository: +class HelpRepository(object): "A class to handle the help settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py index e0c6f68b..4c9f59be 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py @@ -28,7 +28,7 @@ def getPluginsDirectoryPath(): return archive.getSkeinforgePluginsPath('meta_plugins') -class MetaRepository: +class MetaRepository(object): "A class to handle the meta settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py index 2343cb62..19ac696e 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py @@ -57,7 +57,7 @@ def isEmptyOrCancelled( fileName, wasCancelled ): return str(fileName) == '' or str(fileName) == '()' or wasCancelled -class PolyfileRepository: +class PolyfileRepository(object): "A class to handle the polyfile settings." def __init__(self): "Set the default settings, execute title & settings fileName." diff --git a/Cura/util/profile.py b/Cura/util/profile.py index 27314fd9..d2f4d3d5 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -72,6 +72,8 @@ profileDefaultSettings = { 'bottom_thickness': '0.3', 'hop_on_move': 'False', 'plugin_config': '', + 'object_center_x': '-1', + 'object_center_y': '-1', 'add_start_end_gcode': 'True', 'gcode_extension': 'gcode', @@ -596,7 +598,7 @@ def runPostProcessingPlugins(gcodefilename): for pluginTest in pluginList: if pluginTest['filename'] == pluginConfig['filename']: plugin = pluginTest - if plugin == None: + if plugin is None: continue pythonFile = None @@ -604,7 +606,7 @@ def runPostProcessingPlugins(gcodefilename): testFilename = os.path.join(basePath, pluginConfig['filename']) if os.path.isfile(testFilename): pythonFile = testFilename - if pythonFile == None: + if pythonFile is None: continue locals = {'filename': gcodefilename}