Merge pull request #50 from Durman/sverchok-1.2

Fixes for Sverchok 1.2 and Blender 3.4

nodes/Topologic/ApertureByTopologyContext.py

@@ -18,7 +18,7 @@ def processItem(item):
 
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 
-class SvApertureByTopologyContext(bpy.types.Node, SverchCustomTreeNode):
+class SvApertureByTopologyContext(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates an Aperture from the input Topology and Context   

nodes/Topologic/ApertureTopology.py

@@ -20,7 +20,7 @@ def recur(input):
 		output = processItem(input)
 	return output
 
-class SvApertureTopology(bpy.types.Node, SverchCustomTreeNode):
+class SvApertureTopology(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the Topology of the input Aperture   

nodes/Topologic/CellByFaces.py

@@ -29,7 +29,7 @@ def processItem(item, tol):
 	else:
 		raise Exception("CellByFaces - Could not create a valid Cell")
 
-class SvCellByFaces(bpy.types.Node, SverchCustomTreeNode):
+class SvCellByFaces(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Cell from the list of input Faces  

nodes/Topologic/CellByLoft.py

@@ -57,7 +57,7 @@ def processItem(item):
 
 replication = [("Trim", "Trim", "", 1),("Iterate", "Iterate", "", 2),("Repeat", "Repeat", "", 3),("Interlace", "Interlace", "", 4)]
 
-class SvCellByLoft(bpy.types.Node, SverchCustomTreeNode):
+class SvCellByLoft(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Cell by lofting through the input Wires. The Wires must be closed and ordered

nodes/Topologic/CellByShell.py

@@ -49,7 +49,7 @@ def recur(input):
 		output = processItem(input)
 	return output
 
-class SvCellByShell(bpy.types.Node, SverchCustomTreeNode):
+class SvCellByShell(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Cell from the input Shell. The Shell has to be closed

nodes/Topologic/CellByThickenedFace.py

@@ -59,7 +59,7 @@ def matchLengths(list):
 			anItem.append(itemToAppend)
 	return list
 
-class SvCellByThickenedFace(bpy.types.Node, SverchCustomTreeNode):
+class SvCellByThickenedFace(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Cell by thickening the input Face    

nodes/Topologic/CellCompactness.py

@@ -32,7 +32,7 @@ def recur(input):
 		output = processItem(input)
 	return output
 
-class SvCellCompactness(bpy.types.Node, SverchCustomTreeNode):
+class SvCellCompactness(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the compactness (sphericity) measure of the input Cell    

nodes/Topologic/CellComplexByCells.py

@@ -41,7 +41,7 @@ def recur(item, tolerance):
 		output = processItem([item, tolerance])
 	return output
 
-class SvCellComplexByCells(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexByCells(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a CellComplex from the list of input Cells  

nodes/Topologic/CellComplexByFaces.py

@@ -63,7 +63,7 @@ def processItem(item):
 	else:
 		return cellComplex
 
-class SvCellComplexByFaces(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexByFaces(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a CellComplex from the list of input Faces  

nodes/Topologic/CellComplexByLoft.py

@@ -59,7 +59,7 @@ def processItem(item):
 
 replication = [("Trim", "Trim", "", 1),("Iterate", "Iterate", "", 2),("Repeat", "Repeat", "", 3),("Interlace", "Interlace", "", 4)]
 
-class SvCellComplexByLoft(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexByLoft(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a CellComplex by lofting through the input Wires. The Wires must be closed and ordered

nodes/Topologic/CellComplexDecompose.py

@@ -94,7 +94,7 @@ def processItem(item):
 
 	return [return1, return2, return3, return4, return5, return6, return7, return8, return9, return10]
 
-class SvCellComplexDecompose(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexDecompose(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs a list of categorised boundaries (Faces) of the input CellComplex    

nodes/Topologic/CellComplexExternalBoundary.py

@@ -18,7 +18,7 @@ def flatten(element):
 def processItem(item):
 	return item.ExternalBoundary()
 
-class SvCellComplexExternalBoundary(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexExternalBoundary(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the external boundary (Cell) of the input CellComplex    

nodes/Topologic/CellComplexInternalBoundaries.py

@@ -21,7 +21,7 @@ def processItem(item):
 	_ = item.InternalBoundaries(faces)
 	return faces
 
-class SvCellComplexInternalBoundaries(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexInternalBoundaries(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the internal boundaries (Faces) of the input CellComplex    

nodes/Topologic/CellComplexNonManifoldFaces.py

@@ -21,7 +21,7 @@ def recur(input):
 		output = processItem(input)
 	return output
 
-class SvCellComplexNonManifoldFaces(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexNonManifoldFaces(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the non-manifold Faces of the input CellComplex    

nodes/Topologic/CellComplexPrism.py

@@ -194,7 +194,7 @@ def processItem(item):
 originLocations = [("Bottom", "Bottom", "", 1),("Center", "Center", "", 2),("LowerLeft", "Lower Left", "", 3)]
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 
-class SvCellComplexPrism(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexPrism(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Prism (Cell) from the input cuboid parameters    

nodes/Topologic/CellComplexType.py

@@ -5,7 +5,7 @@
 
 import topologic
 
-class SvCellComplexType(bpy.types.Node, SverchCustomTreeNode):
+class SvCellComplexType(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the type number of the CellComplex class

nodes/Topologic/CellCone.py

@@ -224,7 +224,7 @@ def matchLengths(list):
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 originLocations = [("Bottom", "Bottom", "", 1),("Center", "Center", "", 2),("LowerLeft", "LowerLeft", "", 3)]
 
-class SvCellCone(bpy.types.Node, SverchCustomTreeNode):
+class SvCellCone(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Cone (Cell) from the input parameters    

nodes/Topologic/CellCylinder.py

@@ -89,7 +89,7 @@ def processItem(item, originLocation):
 originLocations = [("Bottom", "Bottom", "", 1),("Center", "Center", "", 2),("LowerLeft", "LowerLeft", "", 3)]
 replication = [("Trim", "Trim", "", 1),("Iterate", "Iterate", "", 2),("Repeat", "Repeat", "", 3),("Interlace", "Interlace", "", 4)]
 
-class SvCellCylinder(bpy.types.Node, SverchCustomTreeNode):
+class SvCellCylinder(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Cylinder (Cell) from the input parameters    

nodes/Topologic/CellExternalBoundary.py

@@ -18,7 +18,7 @@ def flatten(element):
 def processItem(item):
 	return item.ExternalBoundary()
 
-class SvCellExternalBoundary(bpy.types.Node, SverchCustomTreeNode):
+class SvCellExternalBoundary(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the external boundary (Shell) of the input Cell    

nodes/Topologic/CellHyperboloid.py

@@ -215,7 +215,7 @@ def matchLengths(list):
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 originLocations = [("Bottom", "Bottom", "", 1),("Center", "Center", "", 2),("LowerLeft", "LowerLeft", "", 3)]
 
-class SvCellHyperboloid(bpy.types.Node, SverchCustomTreeNode):
+class SvCellHyperboloid(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Hyperboloid (Cell) from the input parameters    

nodes/Topologic/CellInternalBoundaries.py

@@ -21,7 +21,7 @@ def recur(input):
 		output = processItem(input)
 	return output
 
-class SvCellInternalBoundaries(bpy.types.Node, SverchCustomTreeNode):
+class SvCellInternalBoundaries(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the internal boundaries (Shells) of the input Cell    

nodes/Topologic/CellInternalVertex.py

@@ -33,7 +33,7 @@ def recur(item, tolerance):
 		output = processItem(item, tolerance)
 	return output
 
-class SvCellInternalVertex(bpy.types.Node, SverchCustomTreeNode):
+class SvCellInternalVertex(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Vertex guaranteed to be inside the input Cell

nodes/Topologic/CellIsInside.py

@@ -24,7 +24,7 @@ def processItem(item):
 		status = (topologic.CellUtility.Contains(topology, vertex, tolerance) == 0)
 	return status
 
-class SvCellIsInside(bpy.types.Node, SverchCustomTreeNode):
+class SvCellIsInside(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Returns True if the input Vertex is inside the input Cell. Returns False otherwise

nodes/Topologic/CellPipe.py

@@ -212,7 +212,7 @@ def processItem(item):
 
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 
-class SvCellPipe(bpy.types.Node, SverchCustomTreeNode):
+class SvCellPipe(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Pipe (Cell) along the input Edge    

nodes/Topologic/CellPrism.py

@@ -107,7 +107,7 @@ def processItem(item):
 placements = [("Bottom", "Bottom", "", 1),("Center", "Center", "", 2),("LowerLeft", "Lower Left", "", 3)]
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 
-class SvCellPrism(bpy.types.Node, SverchCustomTreeNode):
+class SvCellPrism(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Prism (Cell) from the input cuboid parameters    

nodes/Topologic/CellSets.py

@@ -49,7 +49,7 @@ def processItem(inputCells, superCells, tol):
 					unused[i] = False
 	return sets
 
-class SvCellSets(bpy.types.Node, SverchCustomTreeNode):
+class SvCellSets(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: bundles the input Cells into Sets

nodes/Topologic/CellSphere.py

@@ -74,7 +74,7 @@ def processItem(item, originLocation):
 originLocations = [("Bottom", "Bottom", "", 1),("Center", "Center", "", 2),("LowerLeft", "Lower Left", "", 3)]
 replication = [("Default", "Default", "", 1), ("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 
-class SvCellSphere(bpy.types.Node, SverchCustomTreeNode):
+class SvCellSphere(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Sphere (Cell) from the input parameters    

nodes/Topologic/CellSuperCells.py

@@ -42,7 +42,7 @@ def processItem(inputCells, tol):
 	_ = cluster.Cells(superCells)
 	return superCells
 
-class SvCellSuperCells(bpy.types.Node, SverchCustomTreeNode):
+class SvCellSuperCells(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Returns the Super Cells representing detached bundles of the input Cells

nodes/Topologic/CellSurfaceArea.py

@@ -24,7 +24,7 @@ def recur(input):
 		output = processItem(input)
 	return output
 
-class SvCellSurfaceArea(bpy.types.Node, SverchCustomTreeNode):
+class SvCellSurfaceArea(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the surface area of the input Cell    

nodes/Topologic/CellTorus.py

@@ -73,7 +73,7 @@ def processItem(item, originLocation):
 originLocations = [("Bottom", "Bottom", "", 1),("Center", "Center", "", 2),("LowerLeft", "Lower Left", "", 3)]
 replication = [("Trim", "Trim", "", 1),("Iterate", "Iterate", "", 2),("Repeat", "Repeat", "", 3),("Interlace", "Interlace", "", 4)]
 
-class SvCellTorus(bpy.types.Node, SverchCustomTreeNode):
+class SvCellTorus(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Torus (Cell) from the input parameters    

nodes/Topologic/CellType.py

@@ -5,7 +5,7 @@
 
 import topologic
 
-class SvCellType(bpy.types.Node, SverchCustomTreeNode):
+class SvCellType(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the type number of the Cell class

nodes/Topologic/CellVolume.py

@@ -19,7 +19,7 @@ def recur(input):
 		output = processItem(input)
 	return output
 
-class SvCellVolume(bpy.types.Node, SverchCustomTreeNode):
+class SvCellVolume(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the volume of the input Cell    

nodes/Topologic/ClusterByTopologies.py

@@ -22,7 +22,7 @@ def recur(item):
 		output = processItem(item)
 	return output
 
-class SvClusterByTopologies(bpy.types.Node, SverchCustomTreeNode):
+class SvClusterByTopologies(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Cluster from the list of input Topologies  

nodes/Topologic/ClusterType.py

@@ -5,7 +5,7 @@
 
 import topologic
 
-class SvClusterType(bpy.types.Node, SverchCustomTreeNode):
+class SvClusterType(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the type number of the Cluster class

nodes/Topologic/ColorByObjectColor.py

@@ -23,7 +23,7 @@ def processItem(bObject):
 	color = bObject.color
 	return (color[0],color[1], color[2], color[3])
 
-class SvColorByObjectColor(bpy.types.Node, SverchCustomTreeNode):
+class SvColorByObjectColor(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a color from the input Blender object color property   

nodes/Topologic/ColorByValueInRange.py

@@ -150,7 +150,7 @@ def processItem(item):
 
 replication = [("Trim", "Trim", "", 1),("Iterate", "Iterate", "", 2),("Repeat", "Repeat", "", 3),("Interlace", "Interlace", "", 4)]
 
-class SvColorByValueInRange(bpy.types.Node, SverchCustomTreeNode):
+class SvColorByValueInRange(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a color from the input value within the input range   

nodes/Topologic/ContextByTopologyParameters.py

@@ -104,7 +104,7 @@ def processItem(item):
 
 replication = [("Trim", "Trim", "", 1),("Iterate", "Iterate", "", 2),("Repeat", "Repeat", "", 3),("Interlace", "Interlace", "", 4)]
 
-class SvContextByTopologyParameters(bpy.types.Node, SverchCustomTreeNode):
+class SvContextByTopologyParameters(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Context from the input Topology and parameters   

nodes/Topologic/ContextTopology.py

@@ -24,7 +24,7 @@ def processItem(item):
 		topology = None
 	return topology
 
-class SvContextTopology(bpy.types.Node, SverchCustomTreeNode):
+class SvContextTopology(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the Topology of the input Context   

nodes/Topologic/ContractByParameters.py

@@ -143,7 +143,7 @@ def processItem(item, data):
 
 replication = [("Trim", "Trim", "", 1),("Iterate", "Iterate", "", 2),("Repeat", "Repeat", "", 3),("Interlace", "Interlace", "", 4)]
 
-class SvContractByParameters(bpy.types.Node, SverchCustomTreeNode):
+class SvContractByParameters(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a Contract from the input parameters   

nodes/Topologic/DGLAccuracy.py

@@ -29,7 +29,7 @@ def processItem(item):
 
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 
-class SvDGLAccuracy(bpy.types.Node, SverchCustomTreeNode):
+class SvDGLAccuracy(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the accuracy of the input predictions based on the input labels

nodes/Topologic/DGLClassifierByFilePath.py

@@ -21,7 +21,7 @@ def processItem(item):
 	"""
 	return torch.load(item)
 
-class SvDGLClassifierByFilePath(bpy.types.Node, SverchCustomTreeNode):
+class SvDGLClassifierByFilePath(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Outputs the model saved at the input file path

nodes/Topologic/DGLDatasetByDGLGraphs.py

@@ -42,7 +42,7 @@ def processItem(item):
 
 replication = [("Default", "Default", "", 1),("Trim", "Trim", "", 2),("Iterate", "Iterate", "", 3),("Repeat", "Repeat", "", 4),("Interlace", "Interlace", "", 5)]
 
-class SvDGLDatasetByDGLGraphs(bpy.types.Node, SverchCustomTreeNode):
+class SvDGLDatasetByDGLGraphs(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a DGL Dataset by the input DGL Graphs and Labels

nodes/Topologic/DGLDatasetByImportedCSV_NC.py

@@ -16,7 +16,7 @@ def processItem(item):
 	graphs_folder_path = item
 	return dgl.data.CSVDataset(graphs_folder_path, force_reload=True)
 
-class SvDGLDatasetByImportedCSV_NC(bpy.types.Node, SverchCustomTreeNode):
+class SvDGLDatasetByImportedCSV_NC(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a DGL Dataset by Imported CSV FILE for Node Classification

nodes/Topologic/DGLDatasetBySamples.py

@@ -51,7 +51,7 @@ def processItem(item):
 		raise NotImplementedError
 	return GraphDGL(dgl_graphs, dgl_labels, node_attr_key)
 
-class SvDGLDatasetBySamples(bpy.types.Node, SverchCustomTreeNode):
+class SvDGLDatasetBySamples(SverchCustomTreeNode, bpy.types.Node):
 	"""
 	Triggers: Topologic
 	Tooltip: Creates a DGL Dataset by DGL Samples