From 01ad84859310847d4b361ce284269afdbebbed8c Mon Sep 17 00:00:00 2001 From: zeffii Date: Fri, 16 Sep 2016 19:52:03 +0200 Subject: [PATCH 01/15] experimenting for strings instead of lists --- menu.py | 375 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 188 insertions(+), 187 deletions(-) diff --git a/menu.py b/menu.py index 88fb3b912..049d8b676 100644 --- a/menu.py +++ b/menu.py @@ -18,6 +18,8 @@ # ##### END GPL LICENSE BLOCK ##### from collections import OrderedDict +import re +import pprint import bpy from nodeitems_utils import NodeCategory, NodeItem, NodeItemCustom @@ -37,262 +39,261 @@ def make_node_cats(): # blue-green node_cats["Generators"] = [ - ["LineNode", "Line", "GRIP"], - ["PlaneNode", "Plane", "MESH_PLANE"], - ['SvNGonNode', 'NGon', 'RNDCURVE'], - ["SvBoxNode", "Box", "MESH_CUBE"], - ["SvCircleNode", "Circle", "MESH_CIRCLE"], - ["CylinderNode", "Cylinder", "MESH_CYLINDER"], - ["SphereNode", "Sphere", "MESH_UVSPHERE"], - ['BasicSplineNode', "2pt Spline", "CURVE_BEZCURVE"], - ["svBasicArcNode", "3pt Arc", "SPHERECURVE"], - ['RandomVectorNode', 'Random Vector', 'RNDCURVE'], + "LineNode, Line, GRIP", + "PlaneNode, Plane, MESH_PLANE", + "SvNGonNode, NGon, RNDCURVE", + "SvBoxNode, Box, MESH_CUBE", + "SvCircleNode, Circle, MESH_CIRCLE", + "CylinderNode, Cylinder, MESH_CYLINDER", + "SphereNode, Sphere, MESH_UVSPHERE", + "BasicSplineNode, 2pt Spline, CURVE_BEZCURVE", + "svBasicArcNode, 3pt Arc, SPHERECURVE", + "RandomVectorNode, Random Vector, RNDCURVE" ] node_cats["Extended Generators"] = [ - ["SvBoxRoundedNode", "Rounded Box"], - ["HilbertNode", "Hilbert"], - ["Hilbert3dNode", "Hilbert3d"], - ["HilbertImageNode", "Hilbert image"], - ["ImageNode", "Image", "FILE_IMAGE"], - ["SvProfileNode", "ProfileParametric"], - ["SvGenerativeArtNode", "Generative Art"], - ["SvScriptNode", "Scripted Node", "SCRIPTPLUGINS"], - ["SvScriptNodeMK3", "Script 3 Node", "SCRIPTPLUGINS"], - + "SvBoxRoundedNode, Rounded Box", + "HilbertNode, Hilbert", + "Hilbert3dNode, Hilbert3d", + "HilbertImageNode, Hilbert image", + "ImageNode, Image, FILE_IMAGE", + "SvProfileNode, ProfileParametric", + "SvGenerativeArtNode, Generative Art", + "SvScriptNode, Scripted Node, SCRIPTPLUGINS", + "SvScriptNodeMK3, Script 3 Node, SCRIPTPLUGINS" ] node_cats["Analyzers"] = [ - # investigate data - ["SvBBoxNode", "Bounding box"], - ["SvVolumeNode", "Volume"], - ["AreaNode", "Area"], - ["DistancePPNode", "Distance"], - ["CentersPolsNodeMK2", "Centers Polygons 2"], - ["CentersPolsNodeMK3", "Centers Polygons 3"], - ["GetNormalsNode", "Calculate normals"], - ["VectorNormalNode", "Vertex Normal"], - # proximity analyses. - ["SvKDTreeNode", "KDT Closest Verts"], - ["SvKDTreeEdgesNode", "KDT Closest Edges"], + "SvBBoxNode, Bounding box", + "SvVolumeNode, Volume", + "AreaNode, Area", + "DistancePPNode, Distance", + "CentersPolsNodeMK2, Centers Polygons 2", + "CentersPolsNodeMK3, Centers Polygons 3", + "GetNormalsNode, Calculate normals", + "VectorNormalNode, Vertex Normal", + "SvKDTreeNode, KDT Closest Verts", + "SvKDTreeEdgesNode, KDT Closest Edges" ] node_cats["Transforms"] = [ - ["SvRotationNode", "Rotation", "MAN_ROT"], - ["SvScaleNode", "Scale", "MAN_SCALE"], - ["VectorMoveNode", "Move", "MAN_TRANS"], - ["SvMirrorNode", "Mirror", "MOD_MIRROR"], - ["MatrixApplyNode", "Matrix Apply"], + "SvRotationNode, Rotation, MAN_ROT", + "SvScaleNode, Scale, MAN_SCALE", + "VectorMoveNode, Move, MAN_TRANS", + "SvMirrorNode, Mirror, MOD_MIRROR", + "MatrixApplyNode, Matrix Apply" ] node_cats["Modifier Change"] = [ # modifiers deforms and reorganize and reconstruct data - ["PolygonBoomNode", "Polygon Boom"], - ["Pols2EdgsNode", "Polygons to Edges"], - ["SvMeshJoinNode", "Mesh Join"], - ["SvRemoveDoublesNode", "Remove Doubles"], - ["SvDeleteLooseNode", "Delete Loose"], - ["SvSeparateMeshNode", "Separate Loose Parts"], - ["SvExtrudeSeparateNode", "Extrude Separate Faces"], - ["SvRandomizeVerticesNode", "Randomize input vertices"], - ["SvVertMaskNode", "Mask Vertices"], - ["SvFillsHoleNode", "Fill Holes"], - ["SvLimitedDissolve", "Limited Dissolve"], - ["SvIntersectEdgesNode", "Intersect Edges"], - ["SvIterateNode", "Iterate matrix transformation"], + "PolygonBoomNode, Polygon Boom", + "Pols2EdgsNode, Polygons to Edges", + "SvMeshJoinNode, Mesh Join", + "SvRemoveDoublesNode, Remove Doubles", + "SvDeleteLooseNode, Delete Loose", + "SvSeparateMeshNode, Separate Loose Parts", + "SvExtrudeSeparateNode, Extrude Separate Faces", + "SvRandomizeVerticesNode, Randomize input vertices", + "SvVertMaskNode, Mask Vertices", + "SvFillsHoleNode, Fill Holes", + "SvLimitedDissolve, Limited Dissolve", + "SvIntersectEdgesNode, Intersect Edges", + "SvIterateNode, Iterate matrix transformation" ] node_cats["Modifier Make"] = [ # bl_idname, shortname, (optional) - ['LineConnectNodeMK2', 'UV Connection'], - ['AdaptivePolsNode', 'Adaptive Polygons'], - ['SvAdaptiveEdgeNode', 'Adaptive Edges'], - ['CrossSectionNode', 'Cross Section'], - ['SvBisectNode', 'Bisect'], - ['SvSolidifyNode', 'Solidify'], - ['SvWireframeNode', 'Wireframe'], - ['DelaunayTriangulation2DNode', 'Delaunay 2D '], - ['Voronoi2DNode', 'Voronoi 2D'], - ['SvPipeNode', 'Pipe'], - ["SvDuplicateAlongEdgeNode", "Duplicate objects along edge"], - ["SvWafelNode", "Wafel"], - ['SvConvexHullNode', 'Convex Hull'], - ['SvLatheNode', 'Lathe', 'MOD_SCREW'], + 'LineConnectNodeMK2, UV Connection', + 'AdaptivePolsNode, Adaptive Polygons', + 'SvAdaptiveEdgeNode, Ad aptive Edges', + 'CrossSectionNode, Cross Section', + 'SvBisectNode, Bisect', + 'SvSolidifyNode, Solidify', + 'SvWireframeNode, Wireframe', + 'DelaunayTriangulation2DNode, Delaunay 2D', + 'Voronoi2DNode, Voronoi 2D', + 'SvPipeNode, Pipe', + "SvDuplicateAlongEdgeNode, Duplicate objects along edge", + "SvWafelNode, Wafel", + "SvConvexHullNode, Convex Hull", + "SvLatheNode, Lathe, MOD_SCREW" ] node_cats["List Masks"] = [ - ["MaskListNode", "List Mask (out)"], - ["SvMaskJoinNode", "List Mask Join (in)"], + "MaskListNode, List Mask (out)", + "SvMaskJoinNode, List Mask Join (in)" ] node_cats["List main"] = [ - ["ListJoinNode", "List Join"], - ["ZipNode", "List Zip"], - ["ListLevelsNode", "List Del Levels"], - ["ListLengthNode", "List Length"], - ["ListSumNodeMK2", "List Sum"], - ["ListMatchNode", "List Match"], - ["ListFuncNode", "List Math"], + "ListJoinNode, List Join", + "ZipNode, List Zip", + "ListLevelsNode, List Del Levels", + "ListLengthNode, List Length", + "ListSumNodeMK2, List Sum", + "ListMatchNode, List Match", + "ListFuncNode, List Math" ] node_cats["List struct"] = [ - ["ShiftNodeMK2", "List Shift"], - ["ListRepeaterNode", "List Repeater"], - ["ListSliceNode", "List Slice"], - ["SvListSplitNode", "List Split"], - ["ListFLNode", "List First&Last"], - ["ListItem2Node", "List Item"], - ["ListReverseNode", "List Reverse"], - ["ListShuffleNode", "List Shuffle"], - ["ListSortNodeMK2", "List Sort"], - ["ListFlipNode", "List Flip"], + "ShiftNodeMK2, List Shift", + "ListRepeaterNode, List Repeater", + "ListSliceNode, List Slice", + "SvListSplitNode, List Split", + "ListFLNode, List First&Last", + "ListItem2Node, List Item", + "ListReverseNode, List Reverse", + "ListShuffleNode, List Shuffle", + "ListSortNodeMK2, List Sort", + "ListFlipNode, List Flip" ] node_cats["Number"] = [ - ['GenListRangeIntNode', 'Range Int'], - ['SvGenFloatRange', 'Range Float'], - ['SvListInputNode', 'List Input'], - ['RandomNode', 'Random', 'RNDCURVE'], - ['FloatNode', 'Float'], - ['IntegerNode', 'Int'], - ['Float2IntNode', 'Float 2 Int'], - ['Formula2Node', 'Formula'], - ['ScalarMathNode', 'Math'], - ['SvMapRangeNode', 'Map Range'], - ['SvEasingNode', 'Easing 0..1'], - ["SvGenFibonacci", "Fibonacci sequence"], - ["SvGenExponential", "Exponential sequence"], + 'GenListRangeIntNode, Range Int', + 'SvGenFloatRange, Range Float', + 'SvListInputNode, List Input', + 'RandomNode, Random, RNDCURVE', + 'FloatNode, Float', + 'IntegerNode, Int', + 'Float2IntNode, Float 2 Int', + 'Formula2Node, Formula', + 'ScalarMathNode, Math', + 'SvMapRangeNode, Map Range', + 'SvEasingNode, Easing 0..1', + 'SvGenFibonacci, Fibonacci sequence', + 'SvGenExponential, Exponential sequence' ] node_cats["Vector"] = [ - ['GenVectorsNode', 'Vector in'], - ['VectorsOutNode', 'Vector out'], - ['VectorMathNode', 'Vector Math'], - ['VectorDropNode', 'Vector Drop'], - ["VectorPolarInNode", "Vector polar input"], - ["VectorPolarOutNode", "Vector polar output"], - ['VertsDelDoublesNode', 'Vector X Doubles'], - ['EvaluateLineNode', 'Vector Evaluate'], - ['SvInterpolationNode', 'Vector Interpolation'], - ['SvInterpolationNodeMK2', 'Vector Interpolation mk2'], - ['SvInterpolationNodeMK3', 'Vector Interpolation mk3'], - ['SvVertSortNode', 'Vector Sort', 'SORTSIZE'], - ['SvNoiseNode', 'Vector Noise', 'FORCE_TURBULENCE'], - ['svAxisInputNode', 'Vector X | Y | Z', 'MANIPUL'], + 'GenVectorsNode, Vector in', + 'VectorsOutNode, Vector out', + 'VectorMathNode, Vector Math', + 'VectorDropNode, Vector Drop', + "VectorPolarInNode, Vector polar input", + "VectorPolarOutNode, Vector polar output", + 'VertsDelDoublesNode, Vector X Doubles', + 'EvaluateLineNode, Vector Evaluate', + 'SvInterpolationNode, Vector Interpolation', + 'SvInterpolationNodeMK2, Vector Interpolation mk2', + 'SvInterpolationNodeMK3, Vector Interpolation mk3', + 'SvVertSortNode, Vector Sort, SORTSIZE', + 'SvNoiseNode, Vector Noise, FORCE_TURBULENCE', + 'svAxisInputNode, Vector X | Y | Z, MANIPUL' ] node_cats["Matrix"] = [ - ["MatrixGenNode", "Matrix in"], - ["MatrixOutNode", "Matrix out"], - ["MatrixDeformNode", "Matrix Deform"], - ["SvMatrixValueIn", "Matrix Input"], - ["SvMatrixEulerNode", "Matrix Euler"], - ["MatrixShearNode", "Matrix Shear"], - ["MatrixInterpolationNode", "Matrix Interpolation"], + "MatrixGenNode, Matrix in", + "MatrixOutNode, Matrix out", + "MatrixDeformNode, Matrix Deform", + "SvMatrixValueIn, Matrix Input", + "SvMatrixEulerNode, Matrix Euler", + "MatrixShearNode, Matrix Shear", + "MatrixInterpolationNode, Matrix Interpolation" ] node_cats["Logic"] = [ - ["SvLogicNode", "Logic"], - ["SvSwitchNode", "Switch"], - ["SvNeuroElman1LNode", "Neuro"], + "SvLogicNode, Logic", + "SvSwitchNode, Switch", + "SvNeuroElman1LNode, Neuro" ] # orange node_cats["Viz"] = [ - ["ViewerNode2", "Viewer Draw", 'RETOPO'], - ["SvBmeshViewerNodeMK2", "Viewer BMeshMK2"], - ["IndexViewerNode", "Viewer Index"], - ["Sv3DviewPropsNode", "3dview Props"], + "ViewerNode2, Viewer Draw, RETOPO", + "SvBmeshViewerNodeMK2, Viewer BMeshMK2", + "IndexViewerNode, Viewer Index", + "Sv3DviewPropsNode, 3dview Props" ] # greish blue node_cats["Text"] = [ - ["ViewerNode_text", "Viewer text"], - ["SvTextInNode", "Text in"], - ["SvTextOutNode", "Text out"], - ["NoteNode", "Note"], - ["GTextNode", "GText"], - ["SvDebugPrintNode", "Debug print"], - ["SvStethoscopeNode", "Stethoscope"], + "ViewerNode_text, Viewer text", + "SvTextInNode, Text in", + "SvTextOutNode, Text out", + "NoteNode, Note", + "GTextNode, GText", + "SvDebugPrintNode, Debug print", + "SvStethoscopeNode, Stethoscope" ] # green node_cats["Scene"] = [ - ["ObjectsNode", "Objects in"], - ["SvObjRemoteNode", "Object Remote (Control)"], - # ["SvNodeRemoteNode", "Node Remote (Control)"], - ["SvFrameInfoNode", "Frame info"], - ["SvEmptyOutNode", "Empty out", "OUTLINER_OB_EMPTY"], - ["SvDupliInstancesMK3", "Dupli instancer"], - ["SvInstancerNode", "Mesh instancer"], - ["SvGetPropNode", "Get property", 'FORCE_VORTEX'], - ["SvSetPropNode", "Set property", 'FORCE_VORTEX'], - ["SvVertexGroupNode", "Vertex group"], - ["SvRayCastSceneNode", "Scene Raycast"], - ["SvRayCastObjectNode", "Object ID Raycast"], - ["SvVertexColorNode", "Vertex color"], - ["SvVertexColorNodeMK2", "Vertex color new"], + "ObjectsNode, Objects in", + "SvFrameInfoNode, Frame info", + "SvEmptyOutNode, Empty out, OUTLINER_OB_EMPTY", + "SvDupliInstancesMK3, Dupli instancer", + "SvInstancerNode, Mesh instancer", + "SvGetPropNode, Get property, FORCE_VORTEX", + "SvSetPropNode, Set property, FORCE_VORTEX", + "SvVertexGroupNode, Vertex group", + "SvRayCastSceneNode, Scene Raycast", + "SvRayCastObjectNode, Object ID Raycast", + "SvVertexColorNode, Vertex color", + "SvVertexColorNodeMK2, Vertex color new" ] # violet node_cats["Layout"] = [ - ["WifiInNode", "Wifi in"], - ["WifiOutNode", "Wifi out"], - ["NodeReroute", "Reroute Point"], - ["ConverterNode", "SocketConvert"], + "WifiInNode, Wifi in", + "WifiOutNode, Wifi out", + "NodeReroute, Reroute Point", + "ConverterNode, SocketConvert" ] node_cats['Network'] = [ - ["UdpClientNode", "UDP Client"] + "UdpClientNode, UDP Client" ] node_cats["Beta Nodes"] = [ # for testing convenience, and while no documentation - ["SvBevelNode", "Bevel"], - ["SvExtrudeEdgesNode", "Extrude Edges"], - ["SvOffsetNode", "Offset"], - ["SvRecalcNormalsNode", "Recalc normals"], - ["SvEdgeAnglesNode", "Angles at the edges"], - ["SvListDecomposeNode", "List Decompose"], - ["SvFormulaShapeNode", "Formula shape", "IPO"], - ["SvScriptNodeMK2", "Script 2"], - ["SvMeshFilterNode", "Mesh filter"], - ["SvTriangulateNode", "Triangulate mesh"], - ["SvHeavyTriangulateNode","Triangulate mesh (heavy)"], - ["SvBricksNode", "Bricks grid"], - ["SvMatrixApplyJoinNode", "Apply matrix to mesh"], - ["SvMatrixTubeNode", "Matrix Tube"], + "SvBevelNode, Bevel", + "SvExtrudeEdgesNode, Extrude Edges", + "SvOffsetNode, Offset", + "SvRecalcNormalsNode, Recalc normals", + "SvEdgeAnglesNode, Angles at the edges", + "SvListDecomposeNode, List Decompose", + "SvFormulaShapeNode, Formula shape, IPO", + "SvScriptNodeMK2, Script 2", + "SvMeshFilterNode, Mesh filter", + "SvTriangulateNode, Triangulate mesh", + "SvHeavyTriangulateNode, Triangulate mesh (heavy)", + "SvBricksNode, Bricks grid", + "SvMatrixApplyJoinNode, Apply matrix to mesh", + "SvMatrixTubeNode, Matrix Tube" ] node_cats["Alpha Nodes"] = [ - ["SvCurveViewerNode", "Curve Viewer", 'MOD_CURVE'], - ["SvCurveViewerNodeAlt", "Curve Viewer 2D", 'MOD_CURVE'], - ["SvPolylineViewerNode", "Polyline Viewer", 'MOD_CURVE'], - ['SvTypeViewerNode', 'Typography Viewer'], - ["SvImageComponentsNode", "Image Decompose", "GROUP_VCOL"], - ["SvJoinTrianglesNode", "Join Triangles"], - ["SvCacheNode", "Cache"], - ["SvInsetSpecial", "Inset Special"], - ["SkinViewerNode", "Skin Mesher"], - ["SvCSGBooleanNode", "CSG Boolean"], - ["SvNumpyArrayNode", "Numpy Array"], - ["SvNodeRemoteNode", "Node Remote (Control)"], - ["SvGetDataObjectNode", "Object ID Get"], - ["SvSetDataObjectNode", "Object ID Set"], - ['SvSortObjsNode', "Object ID Sort"], - ["SvObjectToMeshNode", "Object ID Out"], - ["SvFilterObjsNode", "Object ID Filter"], - ["SvPointOnMeshNode", "Object ID Point on Mesh"], - ["SvBMVertsNode", "BMesh Props"], - ["SvBMOpsNode", "BMesh Ops"], - ["SvBMinputNode", "BMesh In"], - ["SvBMoutputNode", "BMesh Out"], - ["SvBMtoElementNode", "BMesh Elements"], + "SvCurveViewerNode, Curve Viewer, MOD_CURVE", + "SvCurveViewerNodeAlt, Curve Viewer 2D, MOD_CURVE", + "SvPolylineViewerNode, Polyline Viewer, MOD_CURVE", + "SvTypeViewerNode, Typography Viewer", + "SvImageComponentsNode, Image Decompose, GROUP_VCOL", + "SvJoinTrianglesNode, Join Triangles", + "SvCacheNode, Cache", + "SvInsetSpecial, Inset Special", + "SkinViewerNode, Skin Mesher", + "SvCSGBooleanNode, CSG Boolean", + "SvNumpyArrayNode, Numpy Array", + "SvNodeRemoteNode, Node Remote (Control)", + "SvGetDataObjectNode, Object ID Get", + "SvSetDataObjectNode, Object ID Set", + "SvSortObjsNode, Object ID Sort", + "SvObjectToMeshNode, Object ID Out", + "SvFilterObjsNode, Object ID Filter", + "SvPointOnMeshNode, Object ID Point on Mesh", + "SvBMVertsNode, BMesh Props", + "SvBMOpsNode, BMesh Ops", + "SvBMinputNode, BMesh In", + "SvBMoutputNode, BMesh Out", + "SvBMtoElementNode, BMesh Elements" # ["SvBVHtreeNode", "BVH Tree In"], # ["SvBVHRaycastNode", "BVH Tree Raycast"], # ["SvBvhOverlapNode", "BVH Tree Overlap"], # ["SvBVHnearNode", "BVH Tree Nearest"], ] + for k, v in node_cats.items(): + node_cats[k] = [[i.strip() for i in j.split(',')] for j in v] + + pprint.pprint(node_cats) return node_cats -- GitLab From a0e7ee4c59b0c77020e058cb8401e43f9e8a6064 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 17 Sep 2016 10:48:25 +0200 Subject: [PATCH 02/15] index.md added..seems ok --- index.md | 240 ++++++++++++++++++++++++++++++++++++++++++++ menu.py | 299 +++++++------------------------------------------------ 2 files changed, 278 insertions(+), 261 deletions(-) create mode 100644 index.md diff --git a/index.md b/index.md new file mode 100644 index 000000000..970209efa --- /dev/null +++ b/index.md @@ -0,0 +1,240 @@ +## Generators + LineNode, Line, GRIP + PlaneNode, Plane, MESH_PLANE + SvNGonNode, NGon, RNDCURVE + SvBoxNode, Box, MESH_CUBE + SvCircleNode, Circle, MESH_CIRCLE + CylinderNode, Cylinder, MESH_CYLINDER + SphereNode, Sphere, MESH_UVSPHERE + BasicSplineNode, 2pt Spline, CURVE_BEZCURVE + svBasicArcNode, 3pt Arc, SPHERECURVE + RandomVectorNode, Random Vector, RNDCURVE + +## Extended Generators + SvBoxRoundedNode, Rounded Box + HilbertNode, Hilbert + Hilbert3dNode, Hilbert3d + HilbertImageNode, Hilbert image + ImageNode, Image, FILE_IMAGE + SvProfileNode, ProfileParametric + SvGenerativeArtNode, Generative Art + SvScriptNode, Scripted Node, SCRIPTPLUGINS + SvScriptNodeMK3, Script 3 Node, SCRIPTPLUGINS + + +## Analyzers + SvBBoxNode, Bounding box + SvVolumeNode, Volume + AreaNode, Area + DistancePPNode, Distance + CentersPolsNodeMK2, Centers Polygons 2 + CentersPolsNodeMK3, Centers Polygons 3 + GetNormalsNode, Calculate normals + VectorNormalNode, Vertex Normal + SvKDTreeNode, KDT Closest Verts + SvKDTreeEdgesNode, KDT Closest Edges + + +## Transforms + SvRotationNode, Rotation, MAN_ROT + SvScaleNode, Scale, MAN_SCALE + VectorMoveNode, Move, MAN_TRANS + SvMirrorNode, Mirror, MOD_MIRROR + MatrixApplyNode, Matrix Apply + + +## Modifier Change + PolygonBoomNode, Polygon Boom + Pols2EdgsNode, Polygons to Edges + SvMeshJoinNode, Mesh Join + SvRemoveDoublesNode, Remove Doubles + SvDeleteLooseNode, Delete Loose + SvSeparateMeshNode, Separate Loose Parts + SvExtrudeSeparateNode, Extrude Separate Faces + SvRandomizeVerticesNode, Randomize input vertices + SvVertMaskNode, Mask Vertices + SvFillsHoleNode, Fill Holes + SvLimitedDissolve, Limited Dissolve + SvIntersectEdgesNode, Intersect Edges + SvIterateNode, Iterate matrix transformation + + +## Modifier Make + LineConnectNodeMK2, UV Connection + AdaptivePolsNode, Adaptive Polygons + SvAdaptiveEdgeNode, Ad aptive Edges + CrossSectionNode, Cross Section + SvBisectNode, Bisect + SvSolidifyNode, Solidify + SvWireframeNode, Wireframe + DelaunayTriangulation2DNode, Delaunay 2D + Voronoi2DNode, Voronoi 2D + SvPipeNode, Pipe + SvDuplicateAlongEdgeNode, Duplicate objects along edge + SvWafelNode, Wafel + SvConvexHullNode, Convex Hull + SvLatheNode, Lathe, MOD_SCREW + + +## List Masks + MaskListNode, List Mask (out) + SvMaskJoinNode, List Mask Join (in) + + +## List main + ListJoinNode, List Join + ZipNode, List Zip + ListLevelsNode, List Del Levels + ListLengthNode, List Length + ListSumNodeMK2, List Sum + ListMatchNode, List Match + ListFuncNode, List Math + + +## List struct + ShiftNodeMK2, List Shift + ListRepeaterNode, List Repeater + ListSliceNode, List Slice + SvListSplitNode, List Split + ListFLNode, List First&Last + ListItem2Node, List Item + ListReverseNode, List Reverse + ListShuffleNode, List Shuffle + ListSortNodeMK2, List Sort + ListFlipNode, List Flip + + +## Number + GenListRangeIntNode, Range Int + SvGenFloatRange, Range Float + SvListInputNode, List Input + RandomNode, Random, RNDCURVE + FloatNode, Float + IntegerNode, Int + Float2IntNode, Float 2 Int + Formula2Node, Formula + ScalarMathNode, Math + SvMapRangeNode, Map Range + SvEasingNode, Easing 0..1 + SvGenFibonacci, Fibonacci sequence + SvGenExponential, Exponential sequence + + +## Vector + GenVectorsNode, Vector in + VectorsOutNode, Vector out + VectorMathNode, Vector Math + VectorDropNode, Vector Drop + VectorPolarInNode, Vector polar input + VectorPolarOutNode, Vector polar output + VertsDelDoublesNode, Vector X Doubles + EvaluateLineNode, Vector Evaluate + SvInterpolationNode, Vector Interpolation + SvInterpolationNodeMK2, Vector Interpolation mk2 + SvInterpolationNodeMK3, Vector Interpolation mk3 + SvVertSortNode, Vector Sort, SORTSIZE + SvNoiseNode, Vector Noise, FORCE_TURBULENCE + svAxisInputNode, Vector X | Y | Z, MANIPUL + + +## Matrix + MatrixGenNode, Matrix in + MatrixOutNode, Matrix out + MatrixDeformNode, Matrix Deform + SvMatrixValueIn, Matrix Input + SvMatrixEulerNode, Matrix Euler + MatrixShearNode, Matrix Shear + MatrixInterpolationNode, Matrix Interpolation + + +## Logic + SvLogicNode, Logic + SvSwitchNode, Switch + SvNeuroElman1LNode, Neuro + + +## Viz + ViewerNode2, Viewer Draw, RETOPO + SvBmeshViewerNodeMK2, Viewer BMeshMK2 + IndexViewerNode, Viewer Index + Sv3DviewPropsNode, 3dview Props + + +## Text + ViewerNode_text, Viewer text + SvTextInNode, Text in + SvTextOutNode, Text out + NoteNode, Note + GTextNode, GText + SvDebugPrintNode, Debug print + SvStethoscopeNode, Stethoscope + + +## Scene + ObjectsNode, Objects in + SvFrameInfoNode, Frame info + SvEmptyOutNode, Empty out, OUTLINER_OB_EMPTY + SvDupliInstancesMK3, Dupli instancer + SvInstancerNode, Mesh instancer + SvGetPropNode, Get property, FORCE_VORTEX + SvSetPropNode, Set property, FORCE_VORTEX + SvVertexGroupNode, Vertex group + SvRayCastSceneNode, Scene Raycast + SvRayCastObjectNode, Object ID Raycast + SvVertexColorNode, Vertex color + SvVertexColorNodeMK2, Vertex color new + + +## Layout + WifiInNode, Wifi in + WifiOutNode, Wifi out + NodeReroute, Reroute Point + ConverterNode, SocketConvert + + +## Network + UdpClientNode, UDP Client + +## Beta Nodes + SvBevelNode, Bevel + SvExtrudeEdgesNode, Extrude Edges + SvOffsetNode, Offset + SvRecalcNormalsNode, Recalc normals + SvEdgeAnglesNode, Angles at the edges + SvListDecomposeNode, List Decompose + SvFormulaShapeNode, Formula shape, IPO + SvScriptNodeMK2, Script 2 + SvMeshFilterNode, Mesh filter + SvTriangulateNode, Triangulate mesh + SvHeavyTriangulateNode, Triangulate mesh (heavy) + SvBricksNode, Bricks grid + SvMatrixApplyJoinNode, Apply matrix to mesh + SvMatrixTubeNode, Matrix Tube + + +## Alpha Nodes + SvCurveViewerNode, Curve Viewer, MOD_CURVE + SvCurveViewerNodeAlt, Curve Viewer 2D, MOD_CURVE + SvPolylineViewerNode, Polyline Viewer, MOD_CURVE + SvTypeViewerNode, Typography Viewer + SvImageComponentsNode, Image Decompose, GROUP_VCOL + SvJoinTrianglesNode, Join Triangles + SvCacheNode, Cache + SvInsetSpecial, Inset Special + SkinViewerNode, Skin Mesher + SvCSGBooleanNode, CSG Boolean + SvNumpyArrayNode, Numpy Array + SvNodeRemoteNode, Node Remote (Control) + SvGetDataObjectNode, Object ID Get + SvSetDataObjectNode, Object ID Set + SvSortObjsNode, Object ID Sort + SvObjectToMeshNode, Object ID Out + SvFilterObjsNode, Object ID Filter + SvPointOnMeshNode, Object ID Point on Mesh + SvBMVertsNode, BMesh Props + SvBMOpsNode, BMesh Ops + SvBMinputNode, BMesh In + SvBMoutputNode, BMesh Out + SvBMtoElementNode, BMesh Elements + + diff --git a/menu.py b/menu.py index 049d8b676..9d1cc9503 100644 --- a/menu.py +++ b/menu.py @@ -17,9 +17,10 @@ # # ##### END GPL LICENSE BLOCK ##### -from collections import OrderedDict -import re +import os import pprint +from os.path import dirname +from collections import OrderedDict import bpy from nodeitems_utils import NodeCategory, NodeItem, NodeItemCustom @@ -33,265 +34,41 @@ class SverchNodeCategory(NodeCategory): def make_node_cats(): + ''' + this loads the index.md file and converts it to an OrderedDict of node categories. + + ## category name + bl_idname, shortname, (optional) + ... ... ... + + becomes + + node_cats[category name] = [['bl_idname', 'shortname' <, 'icon' >],...... ] + + ''' + + index_path = os.path.join(dirname(__file__), 'index.md') node_cats = OrderedDict() - ''' bl_idname, shortname, (optional) ''' - -# blue-green - node_cats["Generators"] = [ - "LineNode, Line, GRIP", - "PlaneNode, Plane, MESH_PLANE", - "SvNGonNode, NGon, RNDCURVE", - "SvBoxNode, Box, MESH_CUBE", - "SvCircleNode, Circle, MESH_CIRCLE", - "CylinderNode, Cylinder, MESH_CYLINDER", - "SphereNode, Sphere, MESH_UVSPHERE", - "BasicSplineNode, 2pt Spline, CURVE_BEZCURVE", - "svBasicArcNode, 3pt Arc, SPHERECURVE", - "RandomVectorNode, Random Vector, RNDCURVE" - ] - - node_cats["Extended Generators"] = [ - "SvBoxRoundedNode, Rounded Box", - "HilbertNode, Hilbert", - "Hilbert3dNode, Hilbert3d", - "HilbertImageNode, Hilbert image", - "ImageNode, Image, FILE_IMAGE", - "SvProfileNode, ProfileParametric", - "SvGenerativeArtNode, Generative Art", - "SvScriptNode, Scripted Node, SCRIPTPLUGINS", - "SvScriptNodeMK3, Script 3 Node, SCRIPTPLUGINS" - ] - - node_cats["Analyzers"] = [ - "SvBBoxNode, Bounding box", - "SvVolumeNode, Volume", - "AreaNode, Area", - "DistancePPNode, Distance", - "CentersPolsNodeMK2, Centers Polygons 2", - "CentersPolsNodeMK3, Centers Polygons 3", - "GetNormalsNode, Calculate normals", - "VectorNormalNode, Vertex Normal", - "SvKDTreeNode, KDT Closest Verts", - "SvKDTreeEdgesNode, KDT Closest Edges" - ] - - node_cats["Transforms"] = [ - "SvRotationNode, Rotation, MAN_ROT", - "SvScaleNode, Scale, MAN_SCALE", - "VectorMoveNode, Move, MAN_TRANS", - "SvMirrorNode, Mirror, MOD_MIRROR", - "MatrixApplyNode, Matrix Apply" - ] - - node_cats["Modifier Change"] = [ - # modifiers deforms and reorganize and reconstruct data - "PolygonBoomNode, Polygon Boom", - "Pols2EdgsNode, Polygons to Edges", - "SvMeshJoinNode, Mesh Join", - "SvRemoveDoublesNode, Remove Doubles", - "SvDeleteLooseNode, Delete Loose", - "SvSeparateMeshNode, Separate Loose Parts", - "SvExtrudeSeparateNode, Extrude Separate Faces", - "SvRandomizeVerticesNode, Randomize input vertices", - "SvVertMaskNode, Mask Vertices", - "SvFillsHoleNode, Fill Holes", - "SvLimitedDissolve, Limited Dissolve", - "SvIntersectEdgesNode, Intersect Edges", - "SvIterateNode, Iterate matrix transformation" - ] - - node_cats["Modifier Make"] = [ - # bl_idname, shortname, (optional) - 'LineConnectNodeMK2, UV Connection', - 'AdaptivePolsNode, Adaptive Polygons', - 'SvAdaptiveEdgeNode, Ad aptive Edges', - 'CrossSectionNode, Cross Section', - 'SvBisectNode, Bisect', - 'SvSolidifyNode, Solidify', - 'SvWireframeNode, Wireframe', - 'DelaunayTriangulation2DNode, Delaunay 2D', - 'Voronoi2DNode, Voronoi 2D', - 'SvPipeNode, Pipe', - "SvDuplicateAlongEdgeNode, Duplicate objects along edge", - "SvWafelNode, Wafel", - "SvConvexHullNode, Convex Hull", - "SvLatheNode, Lathe, MOD_SCREW" - ] - - node_cats["List Masks"] = [ - "MaskListNode, List Mask (out)", - "SvMaskJoinNode, List Mask Join (in)" - ] - - node_cats["List main"] = [ - "ListJoinNode, List Join", - "ZipNode, List Zip", - "ListLevelsNode, List Del Levels", - "ListLengthNode, List Length", - "ListSumNodeMK2, List Sum", - "ListMatchNode, List Match", - "ListFuncNode, List Math" - ] - - node_cats["List struct"] = [ - "ShiftNodeMK2, List Shift", - "ListRepeaterNode, List Repeater", - "ListSliceNode, List Slice", - "SvListSplitNode, List Split", - "ListFLNode, List First&Last", - "ListItem2Node, List Item", - "ListReverseNode, List Reverse", - "ListShuffleNode, List Shuffle", - "ListSortNodeMK2, List Sort", - "ListFlipNode, List Flip" - ] - - node_cats["Number"] = [ - 'GenListRangeIntNode, Range Int', - 'SvGenFloatRange, Range Float', - 'SvListInputNode, List Input', - 'RandomNode, Random, RNDCURVE', - 'FloatNode, Float', - 'IntegerNode, Int', - 'Float2IntNode, Float 2 Int', - 'Formula2Node, Formula', - 'ScalarMathNode, Math', - 'SvMapRangeNode, Map Range', - 'SvEasingNode, Easing 0..1', - 'SvGenFibonacci, Fibonacci sequence', - 'SvGenExponential, Exponential sequence' - ] - - node_cats["Vector"] = [ - 'GenVectorsNode, Vector in', - 'VectorsOutNode, Vector out', - 'VectorMathNode, Vector Math', - 'VectorDropNode, Vector Drop', - "VectorPolarInNode, Vector polar input", - "VectorPolarOutNode, Vector polar output", - 'VertsDelDoublesNode, Vector X Doubles', - 'EvaluateLineNode, Vector Evaluate', - 'SvInterpolationNode, Vector Interpolation', - 'SvInterpolationNodeMK2, Vector Interpolation mk2', - 'SvInterpolationNodeMK3, Vector Interpolation mk3', - 'SvVertSortNode, Vector Sort, SORTSIZE', - 'SvNoiseNode, Vector Noise, FORCE_TURBULENCE', - 'svAxisInputNode, Vector X | Y | Z, MANIPUL' - ] - - node_cats["Matrix"] = [ - "MatrixGenNode, Matrix in", - "MatrixOutNode, Matrix out", - "MatrixDeformNode, Matrix Deform", - "SvMatrixValueIn, Matrix Input", - "SvMatrixEulerNode, Matrix Euler", - "MatrixShearNode, Matrix Shear", - "MatrixInterpolationNode, Matrix Interpolation" - ] - - node_cats["Logic"] = [ - "SvLogicNode, Logic", - "SvSwitchNode, Switch", - "SvNeuroElman1LNode, Neuro" - ] - -# orange - node_cats["Viz"] = [ - "ViewerNode2, Viewer Draw, RETOPO", - "SvBmeshViewerNodeMK2, Viewer BMeshMK2", - "IndexViewerNode, Viewer Index", - "Sv3DviewPropsNode, 3dview Props" - ] - -# greish blue - node_cats["Text"] = [ - "ViewerNode_text, Viewer text", - "SvTextInNode, Text in", - "SvTextOutNode, Text out", - "NoteNode, Note", - "GTextNode, GText", - "SvDebugPrintNode, Debug print", - "SvStethoscopeNode, Stethoscope" - ] - -# green - node_cats["Scene"] = [ - "ObjectsNode, Objects in", - "SvFrameInfoNode, Frame info", - "SvEmptyOutNode, Empty out, OUTLINER_OB_EMPTY", - "SvDupliInstancesMK3, Dupli instancer", - "SvInstancerNode, Mesh instancer", - "SvGetPropNode, Get property, FORCE_VORTEX", - "SvSetPropNode, Set property, FORCE_VORTEX", - "SvVertexGroupNode, Vertex group", - "SvRayCastSceneNode, Scene Raycast", - "SvRayCastObjectNode, Object ID Raycast", - "SvVertexColorNode, Vertex color", - "SvVertexColorNodeMK2, Vertex color new" - ] - -# violet - node_cats["Layout"] = [ - "WifiInNode, Wifi in", - "WifiOutNode, Wifi out", - "NodeReroute, Reroute Point", - "ConverterNode, SocketConvert" - ] - - node_cats['Network'] = [ - "UdpClientNode, UDP Client" - ] - - node_cats["Beta Nodes"] = [ - # for testing convenience, and while no documentation - "SvBevelNode, Bevel", - "SvExtrudeEdgesNode, Extrude Edges", - "SvOffsetNode, Offset", - "SvRecalcNormalsNode, Recalc normals", - "SvEdgeAnglesNode, Angles at the edges", - "SvListDecomposeNode, List Decompose", - "SvFormulaShapeNode, Formula shape, IPO", - "SvScriptNodeMK2, Script 2", - "SvMeshFilterNode, Mesh filter", - "SvTriangulateNode, Triangulate mesh", - "SvHeavyTriangulateNode, Triangulate mesh (heavy)", - "SvBricksNode, Bricks grid", - "SvMatrixApplyJoinNode, Apply matrix to mesh", - "SvMatrixTubeNode, Matrix Tube" - ] - - node_cats["Alpha Nodes"] = [ - "SvCurveViewerNode, Curve Viewer, MOD_CURVE", - "SvCurveViewerNodeAlt, Curve Viewer 2D, MOD_CURVE", - "SvPolylineViewerNode, Polyline Viewer, MOD_CURVE", - "SvTypeViewerNode, Typography Viewer", - "SvImageComponentsNode, Image Decompose, GROUP_VCOL", - "SvJoinTrianglesNode, Join Triangles", - "SvCacheNode, Cache", - "SvInsetSpecial, Inset Special", - "SkinViewerNode, Skin Mesher", - "SvCSGBooleanNode, CSG Boolean", - "SvNumpyArrayNode, Numpy Array", - "SvNodeRemoteNode, Node Remote (Control)", - "SvGetDataObjectNode, Object ID Get", - "SvSetDataObjectNode, Object ID Set", - "SvSortObjsNode, Object ID Sort", - "SvObjectToMeshNode, Object ID Out", - "SvFilterObjsNode, Object ID Filter", - "SvPointOnMeshNode, Object ID Point on Mesh", - "SvBMVertsNode, BMesh Props", - "SvBMOpsNode, BMesh Ops", - "SvBMinputNode, BMesh In", - "SvBMoutputNode, BMesh Out", - "SvBMtoElementNode, BMesh Elements" - # ["SvBVHtreeNode", "BVH Tree In"], - # ["SvBVHRaycastNode", "BVH Tree Raycast"], - # ["SvBvhOverlapNode", "BVH Tree Overlap"], - # ["SvBVHnearNode", "BVH Tree Nearest"], - ] - for k, v in node_cats.items(): - node_cats[k] = [[i.strip() for i in j.split(',')] for j in v] + with open(index_path) as md: + category = None + temp_list = [] + for line in md: + if not line.strip(): + continue + elif line.startswith('##'): + if category: + node_cats[category] = temp_list + category = line[2:].strip() + temp_list = [] + else: + line_without_padding = line.strip() + non_padded_list = [i.strip() for i in line_without_padding.split(',')] + temp_list.append(non_padded_list) + # final append + node_cats[category] = temp_list + + pprint.pprint(node_cats) @@ -303,10 +80,10 @@ def juggle_and_join(node_cats): this step post processes the extended catagorization used by ctrl+space dynamic menu, and attempts to merge previously joined catagories. Why? Because the default menu gets very - long if there are too many catagories. + long if there are too many categories. The only real alternative to this approach is to write a - replacement for nodeitems_utils which respects catagories + replacement for nodeitems_utils which respects categories and submenus. ''' -- GitLab From 9fa416a1fe87a6d528d15b1f0c16f38dcafed266 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 17 Sep 2016 11:01:59 +0200 Subject: [PATCH 03/15] ditch whitespace --- index.md | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/index.md b/index.md index 970209efa..d1ba5329c 100644 --- a/index.md +++ b/index.md @@ -20,7 +20,6 @@ SvGenerativeArtNode, Generative Art SvScriptNode, Scripted Node, SCRIPTPLUGINS SvScriptNodeMK3, Script 3 Node, SCRIPTPLUGINS - ## Analyzers SvBBoxNode, Bounding box @@ -33,7 +32,6 @@ VectorNormalNode, Vertex Normal SvKDTreeNode, KDT Closest Verts SvKDTreeEdgesNode, KDT Closest Edges - ## Transforms SvRotationNode, Rotation, MAN_ROT @@ -41,7 +39,6 @@ VectorMoveNode, Move, MAN_TRANS SvMirrorNode, Mirror, MOD_MIRROR MatrixApplyNode, Matrix Apply - ## Modifier Change PolygonBoomNode, Polygon Boom @@ -57,7 +54,6 @@ SvLimitedDissolve, Limited Dissolve SvIntersectEdgesNode, Intersect Edges SvIterateNode, Iterate matrix transformation - ## Modifier Make LineConnectNodeMK2, UV Connection @@ -74,12 +70,10 @@ SvWafelNode, Wafel SvConvexHullNode, Convex Hull SvLatheNode, Lathe, MOD_SCREW - ## List Masks MaskListNode, List Mask (out) SvMaskJoinNode, List Mask Join (in) - ## List main ListJoinNode, List Join @@ -89,7 +83,6 @@ ListSumNodeMK2, List Sum ListMatchNode, List Match ListFuncNode, List Math - ## List struct ShiftNodeMK2, List Shift @@ -102,7 +95,6 @@ ListShuffleNode, List Shuffle ListSortNodeMK2, List Sort ListFlipNode, List Flip - ## Number GenListRangeIntNode, Range Int @@ -118,7 +110,6 @@ SvEasingNode, Easing 0..1 SvGenFibonacci, Fibonacci sequence SvGenExponential, Exponential sequence - ## Vector GenVectorsNode, Vector in @@ -135,7 +126,6 @@ SvVertSortNode, Vector Sort, SORTSIZE SvNoiseNode, Vector Noise, FORCE_TURBULENCE svAxisInputNode, Vector X | Y | Z, MANIPUL - ## Matrix MatrixGenNode, Matrix in @@ -145,20 +135,17 @@ SvMatrixEulerNode, Matrix Euler MatrixShearNode, Matrix Shear MatrixInterpolationNode, Matrix Interpolation - ## Logic SvLogicNode, Logic SvSwitchNode, Switch SvNeuroElman1LNode, Neuro - ## Viz ViewerNode2, Viewer Draw, RETOPO SvBmeshViewerNodeMK2, Viewer BMeshMK2 IndexViewerNode, Viewer Index Sv3DviewPropsNode, 3dview Props - ## Text ViewerNode_text, Viewer text @@ -168,10 +155,10 @@ GTextNode, GText SvDebugPrintNode, Debug print SvStethoscopeNode, Stethoscope - ## Scene ObjectsNode, Objects in + SvObjRemoteNode, Object Remote (Control) SvFrameInfoNode, Frame info SvEmptyOutNode, Empty out, OUTLINER_OB_EMPTY SvDupliInstancesMK3, Dupli instancer @@ -183,14 +170,12 @@ SvRayCastObjectNode, Object ID Raycast SvVertexColorNode, Vertex color SvVertexColorNodeMK2, Vertex color new - ## Layout WifiInNode, Wifi in WifiOutNode, Wifi out NodeReroute, Reroute Point ConverterNode, SocketConvert - ## Network UdpClientNode, UDP Client @@ -210,7 +195,6 @@ SvBricksNode, Bricks grid SvMatrixApplyJoinNode, Apply matrix to mesh SvMatrixTubeNode, Matrix Tube - ## Alpha Nodes SvCurveViewerNode, Curve Viewer, MOD_CURVE @@ -236,5 +220,3 @@ SvBMinputNode, BMesh In SvBMoutputNode, BMesh Out SvBMtoElementNode, BMesh Elements - - -- GitLab From 81f5bc2895d3bce8d22a2284fdd1581e1f9db828 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 17 Sep 2016 11:52:48 +0200 Subject: [PATCH 04/15] ignore comment --- menu.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/menu.py b/menu.py index 9d1cc9503..2795cc46c 100644 --- a/menu.py +++ b/menu.py @@ -56,6 +56,8 @@ def make_node_cats(): for line in md: if not line.strip(): continue + if line.strip().startswith('>'): + continue elif line.startswith('##'): if category: node_cats[category] = temp_list @@ -68,10 +70,7 @@ def make_node_cats(): # final append node_cats[category] = temp_list - - - pprint.pprint(node_cats) - + # pprint.pprint(node_cats) return node_cats -- GitLab From 5e0e577b1dd67a7fda79617ba55bea57b6fa35e4 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 17 Sep 2016 12:02:54 +0200 Subject: [PATCH 05/15] add prelim rule comment --- index.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/index.md b/index.md index d1ba5329c..b7f9868d7 100644 --- a/index.md +++ b/index.md @@ -1,3 +1,16 @@ +> +> The following strict rules apply to editing this file: +> +> - do not use tabs, anywhere +> - indent the Node's line using 4 spaces +> - if using an icon then the line must be 80 chars long +> - set the icon right-aligned to the last character +> - if you aren't sure, follow the existing convention +> - use `>` to add a comment, place it at the start of the line. +> +> Failing to follow these points will break the node category parser. + + ## Generators LineNode, Line, GRIP PlaneNode, Plane, MESH_PLANE -- GitLab From 29265a76383d64bf7d0f6096eaff869bc58e4fb7 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 17 Sep 2016 23:36:39 +0200 Subject: [PATCH 06/15] reorders menu items --- index.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/index.md b/index.md index b7f9868d7..c2f50c010 100644 --- a/index.md +++ b/index.md @@ -22,6 +22,8 @@ BasicSplineNode, 2pt Spline, CURVE_BEZCURVE svBasicArcNode, 3pt Arc, SPHERECURVE RandomVectorNode, Random Vector, RNDCURVE + SvBricksNode, Bricks grid + SvImageComponentsNode, Image Decompose, GROUP_VCOL ## Extended Generators SvBoxRoundedNode, Rounded Box @@ -45,6 +47,8 @@ VectorNormalNode, Vertex Normal SvKDTreeNode, KDT Closest Verts SvKDTreeEdgesNode, KDT Closest Edges + SvMeshFilterNode, Mesh filter + SvEdgeAnglesNode, Angles at the edges ## Transforms SvRotationNode, Rotation, MAN_ROT @@ -67,6 +71,11 @@ SvLimitedDissolve, Limited Dissolve SvIntersectEdgesNode, Intersect Edges SvIterateNode, Iterate matrix transformation + SvBevelNode, Bevel + SvExtrudeEdgesNode, Extrude Edges + SvOffsetNode, Offset + SvTriangulateNode, Triangulate mesh + SvRecalcNormalsNode, Recalc normals ## Modifier Make LineConnectNodeMK2, UV Connection @@ -83,6 +92,7 @@ SvWafelNode, Wafel SvConvexHullNode, Convex Hull SvLatheNode, Lathe, MOD_SCREW + SvMatrixTubeNode, Matrix Tube ## List Masks MaskListNode, List Mask (out) @@ -96,6 +106,7 @@ ListSumNodeMK2, List Sum ListMatchNode, List Match ListFuncNode, List Math + SvListDecomposeNode, List Decompose ## List struct ShiftNodeMK2, List Shift @@ -148,6 +159,7 @@ SvMatrixEulerNode, Matrix Euler MatrixShearNode, Matrix Shear MatrixInterpolationNode, Matrix Interpolation + SvMatrixApplyJoinNode, Apply matrix to mesh ## Logic SvLogicNode, Logic @@ -194,27 +206,15 @@ UdpClientNode, UDP Client ## Beta Nodes - SvBevelNode, Bevel - SvExtrudeEdgesNode, Extrude Edges - SvOffsetNode, Offset - SvRecalcNormalsNode, Recalc normals - SvEdgeAnglesNode, Angles at the edges - SvListDecomposeNode, List Decompose SvFormulaShapeNode, Formula shape, IPO SvScriptNodeMK2, Script 2 - SvMeshFilterNode, Mesh filter - SvTriangulateNode, Triangulate mesh SvHeavyTriangulateNode, Triangulate mesh (heavy) - SvBricksNode, Bricks grid - SvMatrixApplyJoinNode, Apply matrix to mesh - SvMatrixTubeNode, Matrix Tube ## Alpha Nodes SvCurveViewerNode, Curve Viewer, MOD_CURVE SvCurveViewerNodeAlt, Curve Viewer 2D, MOD_CURVE SvPolylineViewerNode, Polyline Viewer, MOD_CURVE SvTypeViewerNode, Typography Viewer - SvImageComponentsNode, Image Decompose, GROUP_VCOL SvJoinTrianglesNode, Join Triangles SvCacheNode, Cache SvInsetSpecial, Inset Special -- GitLab From e7edbcb22e3b4236b173c24c577a8a82c2e415c4 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 01:04:53 +0200 Subject: [PATCH 07/15] get icons from nodes instead of index.md --- index.md | 66 ++++++++++++++-------------- nodes/analyzer/image_components.py | 4 +- nodes/basic_data/getsetprop.py | 4 +- nodes/basic_view/empty_out.py | 2 +- nodes/basic_view/viewer_curves.py | 2 +- nodes/basic_view/viewer_curves_2d.py | 6 +-- nodes/basic_view/viewer_mk2.py | 2 +- nodes/basic_view/viewer_polyline.py | 2 +- nodes/generator/basic_3pt_arc.py | 2 +- nodes/generator/basic_spline.py | 2 +- nodes/generator/box.py | 2 +- nodes/generator/circle.py | 2 +- nodes/generator/cylinder.py | 2 +- nodes/generator/formula.py | 2 +- nodes/generator/image.py | 2 +- nodes/generator/line.py | 2 +- nodes/generator/ngon.py | 2 +- nodes/generator/plane.py | 2 +- nodes/generator/random_vector.py | 2 +- nodes/generator/script.py | 2 +- nodes/generator/script3.py | 2 +- nodes/generator/script_mk2.py | 2 +- nodes/generator/sphere.py | 2 +- nodes/modifier_change/mirror.py | 2 +- nodes/modifier_change/rotation.py | 2 +- nodes/modifier_change/scale.py | 2 +- nodes/modifier_make/lathe.py | 2 +- nodes/number/random.py | 2 +- nodes/vector/axis_input.py | 2 +- nodes/vector/move.py | 2 +- nodes/vector/noise.py | 2 +- nodes/vector/vertices_sort.py | 2 +- ui/nodeview_space_menu.py | 8 ++-- 33 files changed, 72 insertions(+), 72 deletions(-) diff --git a/index.md b/index.md index c2f50c010..03932e7b5 100644 --- a/index.md +++ b/index.md @@ -3,38 +3,36 @@ > > - do not use tabs, anywhere > - indent the Node's line using 4 spaces -> - if using an icon then the line must be 80 chars long -> - set the icon right-aligned to the last character -> - if you aren't sure, follow the existing convention > - use `>` to add a comment, place it at the start of the line. +> - if you aren't sure, follow the existing convention > > Failing to follow these points will break the node category parser. ## Generators - LineNode, Line, GRIP - PlaneNode, Plane, MESH_PLANE - SvNGonNode, NGon, RNDCURVE - SvBoxNode, Box, MESH_CUBE - SvCircleNode, Circle, MESH_CIRCLE - CylinderNode, Cylinder, MESH_CYLINDER - SphereNode, Sphere, MESH_UVSPHERE - BasicSplineNode, 2pt Spline, CURVE_BEZCURVE - svBasicArcNode, 3pt Arc, SPHERECURVE - RandomVectorNode, Random Vector, RNDCURVE + LineNode, Line + PlaneNode, Plane + SvNGonNode, NGon + SvBoxNode, Box + SvCircleNode, Circle + CylinderNode, Cylinder + SphereNode, Sphere + BasicSplineNode, 2pt Spline + svBasicArcNode, 3pt Arc + RandomVectorNode, Random Vector SvBricksNode, Bricks grid - SvImageComponentsNode, Image Decompose, GROUP_VCOL + ImageNode, Image ## Extended Generators SvBoxRoundedNode, Rounded Box HilbertNode, Hilbert Hilbert3dNode, Hilbert3d HilbertImageNode, Hilbert image - ImageNode, Image, FILE_IMAGE SvProfileNode, ProfileParametric SvGenerativeArtNode, Generative Art - SvScriptNode, Scripted Node, SCRIPTPLUGINS - SvScriptNodeMK3, Script 3 Node, SCRIPTPLUGINS + SvImageComponentsNode, Image Decompose + SvScriptNode, Scripted Node + SvScriptNodeMK3, Script 3 Node ## Analyzers SvBBoxNode, Bounding box @@ -51,10 +49,10 @@ SvEdgeAnglesNode, Angles at the edges ## Transforms - SvRotationNode, Rotation, MAN_ROT - SvScaleNode, Scale, MAN_SCALE - VectorMoveNode, Move, MAN_TRANS - SvMirrorNode, Mirror, MOD_MIRROR + SvRotationNode, Rotation + SvScaleNode, Scale + VectorMoveNode, Move + SvMirrorNode, Mirror MatrixApplyNode, Matrix Apply ## Modifier Change @@ -91,7 +89,7 @@ SvDuplicateAlongEdgeNode, Duplicate objects along edge SvWafelNode, Wafel SvConvexHullNode, Convex Hull - SvLatheNode, Lathe, MOD_SCREW + SvLatheNode, Lathe SvMatrixTubeNode, Matrix Tube ## List Masks @@ -124,7 +122,7 @@ GenListRangeIntNode, Range Int SvGenFloatRange, Range Float SvListInputNode, List Input - RandomNode, Random, RNDCURVE + RandomNode, Random FloatNode, Float IntegerNode, Int Float2IntNode, Float 2 Int @@ -147,9 +145,9 @@ SvInterpolationNode, Vector Interpolation SvInterpolationNodeMK2, Vector Interpolation mk2 SvInterpolationNodeMK3, Vector Interpolation mk3 - SvVertSortNode, Vector Sort, SORTSIZE - SvNoiseNode, Vector Noise, FORCE_TURBULENCE - svAxisInputNode, Vector X | Y | Z, MANIPUL + SvVertSortNode, Vector Sort + SvNoiseNode, Vector Noise + svAxisInputNode, Vector X | Y | Z ## Matrix MatrixGenNode, Matrix in @@ -167,7 +165,7 @@ SvNeuroElman1LNode, Neuro ## Viz - ViewerNode2, Viewer Draw, RETOPO + ViewerNode2, Viewer Draw SvBmeshViewerNodeMK2, Viewer BMeshMK2 IndexViewerNode, Viewer Index Sv3DviewPropsNode, 3dview Props @@ -185,11 +183,11 @@ ObjectsNode, Objects in SvObjRemoteNode, Object Remote (Control) SvFrameInfoNode, Frame info - SvEmptyOutNode, Empty out, OUTLINER_OB_EMPTY + SvEmptyOutNode, Empty out SvDupliInstancesMK3, Dupli instancer SvInstancerNode, Mesh instancer - SvGetPropNode, Get property, FORCE_VORTEX - SvSetPropNode, Set property, FORCE_VORTEX + SvGetPropNode, Get property + SvSetPropNode, Set property SvVertexGroupNode, Vertex group SvRayCastSceneNode, Scene Raycast SvRayCastObjectNode, Object ID Raycast @@ -206,14 +204,14 @@ UdpClientNode, UDP Client ## Beta Nodes - SvFormulaShapeNode, Formula shape, IPO + SvFormulaShapeNode, Formula shape SvScriptNodeMK2, Script 2 SvHeavyTriangulateNode, Triangulate mesh (heavy) ## Alpha Nodes - SvCurveViewerNode, Curve Viewer, MOD_CURVE - SvCurveViewerNodeAlt, Curve Viewer 2D, MOD_CURVE - SvPolylineViewerNode, Polyline Viewer, MOD_CURVE + SvCurveViewerNode, Curve Viewer + SvCurveViewerNodeAlt, Curve Viewer 2D + SvPolylineViewerNode, Polyline Viewer SvTypeViewerNode, Typography Viewer SvJoinTrianglesNode, Join Triangles SvCacheNode, Cache diff --git a/nodes/analyzer/image_components.py b/nodes/analyzer/image_components.py index 3baac9bf3..4e4e81c40 100644 --- a/nodes/analyzer/image_components.py +++ b/nodes/analyzer/image_components.py @@ -36,7 +36,7 @@ Premise of the node - [x, y, a] [r, g, b] - polygons -this would allow one to combine x any y with r to show +this would allow one to combine x and y with r to show a strength table of r over x,y ''' @@ -190,7 +190,7 @@ class SvImageComponentsNode(bpy.types.Node, SverchCustomTreeNode): ''' Image Components''' bl_idname = 'SvImageComponentsNode' bl_label = 'Image Components' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'GROUP_VCOL' # node storage, reference by the hash of self. node_dict = {} diff --git a/nodes/basic_data/getsetprop.py b/nodes/basic_data/getsetprop.py index 8e0f5bbf6..6ef8928b2 100644 --- a/nodes/basic_data/getsetprop.py +++ b/nodes/basic_data/getsetprop.py @@ -147,7 +147,7 @@ class SvGetPropNode(bpy.types.Node, SverchCustomTreeNode): ''' Get property ''' bl_idname = 'SvGetPropNode' bl_label = 'Get' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'FORCE_VORTEX' bad_prop = BoolProperty(default=False) @@ -188,7 +188,7 @@ class SvSetPropNode(bpy.types.Node, SverchCustomTreeNode): ''' Set property ''' bl_idname = 'SvSetPropNode' bl_label = 'Set' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'FORCE_VORTEX' ok_prop = BoolProperty(default=False) diff --git a/nodes/basic_view/empty_out.py b/nodes/basic_view/empty_out.py index 0e20b7c5d..c0492fa18 100644 --- a/nodes/basic_view/empty_out.py +++ b/nodes/basic_view/empty_out.py @@ -28,7 +28,7 @@ class SvEmptyOutNode(bpy.types.Node, SverchCustomTreeNode): '''Create a blender empty object''' bl_idname = 'SvEmptyOutNode' bl_label = 'Set Empty' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'OUTLINER_DATA_EMPTY' def rename_empty(self, context): empty = self.find_empty() diff --git a/nodes/basic_view/viewer_curves.py b/nodes/basic_view/viewer_curves.py index 183c79e19..f3dfae0ab 100644 --- a/nodes/basic_view/viewer_curves.py +++ b/nodes/basic_view/viewer_curves.py @@ -249,7 +249,7 @@ class SvCurveViewerNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvCurveViewerNode' bl_label = 'SvCurve Viewer Draw' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MOD_CURVE' activate = BoolProperty( name='Show', diff --git a/nodes/basic_view/viewer_curves_2d.py b/nodes/basic_view/viewer_curves_2d.py index 443d3ff85..06fe5aaf8 100644 --- a/nodes/basic_view/viewer_curves_2d.py +++ b/nodes/basic_view/viewer_curves_2d.py @@ -261,7 +261,7 @@ class SvCurveViewerNode2D(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvCurveViewerNodeAlt' bl_label = 'Curve Draw 2D' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MOD_CURVE' activate = BoolProperty( name='Show', @@ -272,8 +272,8 @@ class SvCurveViewerNode2D(bpy.types.Node, SverchCustomTreeNode): basemesh_name = StringProperty( default='Alpha', update=updateNode, - description='sets which base name the object will use, \ - use N-panel to pick alternative random names') + description='sets which base name the object will use, use N-panel to pick alternative random names' + ) material = StringProperty(default='', update=updateNode) grouping = BoolProperty(default=False) diff --git a/nodes/basic_view/viewer_mk2.py b/nodes/basic_view/viewer_mk2.py index 80b40f99e..db77836bb 100644 --- a/nodes/basic_view/viewer_mk2.py +++ b/nodes/basic_view/viewer_mk2.py @@ -155,7 +155,7 @@ class ViewerNode2(bpy.types.Node, SverchCustomTreeNode): ''' ViewerNode2 ''' bl_idname = 'ViewerNode2' bl_label = 'Viewer Draw2' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'RETOPO' n_id = StringProperty(default='') diff --git a/nodes/basic_view/viewer_polyline.py b/nodes/basic_view/viewer_polyline.py index faff79fb5..e916cab07 100644 --- a/nodes/basic_view/viewer_polyline.py +++ b/nodes/basic_view/viewer_polyline.py @@ -154,7 +154,7 @@ class SvPolylineViewerNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvPolylineViewerNode' bl_label = 'SvPolyline Viewer Draw' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MOD_CURVE' activate = BoolProperty( name='Show', diff --git a/nodes/generator/basic_3pt_arc.py b/nodes/generator/basic_3pt_arc.py index 840526162..116ed0a52 100644 --- a/nodes/generator/basic_3pt_arc.py +++ b/nodes/generator/basic_3pt_arc.py @@ -101,7 +101,7 @@ class svBasicArcNode(bpy.types.Node, SverchCustomTreeNode): ''' Arc from 3 points ''' bl_idname = 'svBasicArcNode' bl_label = 'Basic 3point Arc' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'SPHERECURVE' num_verts = IntProperty( name='num_verts', diff --git a/nodes/generator/basic_spline.py b/nodes/generator/basic_spline.py index 0a30e74a6..69f63e82f 100644 --- a/nodes/generator/basic_spline.py +++ b/nodes/generator/basic_spline.py @@ -43,7 +43,7 @@ class BasicSplineNode(bpy.types.Node, SverchCustomTreeNode): ''' Line ''' bl_idname = 'BasicSplineNode' bl_label = 'BasicSpline' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'CURVE_BEZCURVE' num_verts = IntProperty( name='num_verts', diff --git a/nodes/generator/box.py b/nodes/generator/box.py index 14af7a1c5..cf5f1c392 100644 --- a/nodes/generator/box.py +++ b/nodes/generator/box.py @@ -29,7 +29,7 @@ class SvBoxNode(bpy.types.Node, SverchCustomTreeNode): ''' Box ''' bl_idname = 'SvBoxNode' bl_label = 'Box' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MESH_CUBE' Divx = IntProperty(name='Divx', description='divisions x', default=1, min=1, options={'ANIMATABLE'}, diff --git a/nodes/generator/circle.py b/nodes/generator/circle.py index 7c9744f6d..e76380d3d 100644 --- a/nodes/generator/circle.py +++ b/nodes/generator/circle.py @@ -30,7 +30,7 @@ class SvCircleNode(bpy.types.Node, SverchCustomTreeNode): ''' Circle ''' bl_idname = 'SvCircleNode' bl_label = 'Circle' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MESH_CIRCLE' rad_ = FloatProperty(name='Radius', description='Radius', default=1.0, diff --git a/nodes/generator/cylinder.py b/nodes/generator/cylinder.py index aa889ddd4..6b8d0c325 100644 --- a/nodes/generator/cylinder.py +++ b/nodes/generator/cylinder.py @@ -91,7 +91,7 @@ class CylinderNode(bpy.types.Node, SverchCustomTreeNode): ''' Cylinder ''' bl_idname = 'CylinderNode' bl_label = 'Cylinder' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MESH_CYLINDER' radTop_ = FloatProperty(name='Radius Top', default=1.0, diff --git a/nodes/generator/formula.py b/nodes/generator/formula.py index cc84dda1c..7a8c563df 100644 --- a/nodes/generator/formula.py +++ b/nodes/generator/formula.py @@ -49,7 +49,7 @@ class SvFormulaShapeNode(bpy.types.Node, SverchCustomTreeNode): ''' Formula shape ''' bl_idname = 'SvFormulaShapeNode' bl_label = 'Formula Shape' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'IPO' # vertex numers number = IntProperty(name='number', description='vertex number', default=100, diff --git a/nodes/generator/image.py b/nodes/generator/image.py index 355fbf15b..459e0d4dc 100644 --- a/nodes/generator/image.py +++ b/nodes/generator/image.py @@ -28,7 +28,7 @@ class ImageNode(bpy.types.Node, SverchCustomTreeNode): ''' Image ''' bl_idname = 'ImageNode' bl_label = 'Image' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'FILE_IMAGE' name_image = StringProperty(name='image_name', description='image name', default='', update=updateNode) diff --git a/nodes/generator/line.py b/nodes/generator/line.py index 50c7bd36f..01e04f412 100644 --- a/nodes/generator/line.py +++ b/nodes/generator/line.py @@ -47,7 +47,7 @@ class LineNode(bpy.types.Node, SverchCustomTreeNode): ''' Line ''' bl_idname = 'LineNode' bl_label = 'Line' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'GRIP' int_ = IntProperty(name='N Verts', description='Nº Vertices', default=2, min=2, diff --git a/nodes/generator/ngon.py b/nodes/generator/ngon.py index 431492b64..11ca47462 100644 --- a/nodes/generator/ngon.py +++ b/nodes/generator/ngon.py @@ -35,7 +35,7 @@ class SvNGonNode(bpy.types.Node, SverchCustomTreeNode): ''' NGon ''' bl_idname = 'SvNGonNode' bl_label = 'NGon' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'RNDCURVE' rad_ = FloatProperty(name='Radius', description='Radius', default=1.0, diff --git a/nodes/generator/plane.py b/nodes/generator/plane.py index 122c15c06..d27b729f1 100644 --- a/nodes/generator/plane.py +++ b/nodes/generator/plane.py @@ -86,7 +86,7 @@ class PlaneNode(bpy.types.Node, SverchCustomTreeNode): ''' Plane ''' bl_idname = 'PlaneNode' bl_label = 'Plane' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MESH_PLANE' int_X = IntProperty(name='N Vert X', description='Nº Vertices X', default=2, min=2, diff --git a/nodes/generator/random_vector.py b/nodes/generator/random_vector.py index 892e6b2fc..5024aadda 100644 --- a/nodes/generator/random_vector.py +++ b/nodes/generator/random_vector.py @@ -29,7 +29,7 @@ class RandomVectorNode(bpy.types.Node, SverchCustomTreeNode): ''' Random Vectors with len=1''' bl_idname = 'RandomVectorNode' bl_label = 'Random Vector' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'RNDCURVE' count_inner = IntProperty(name='Count', description='random', default=1, min=1, diff --git a/nodes/generator/script.py b/nodes/generator/script.py index cfadd4ecb..5caeb9470 100644 --- a/nodes/generator/script.py +++ b/nodes/generator/script.py @@ -160,7 +160,7 @@ class SvScriptNode(bpy.types.Node, SverchCustomTreeNode): ''' Script node ''' bl_idname = 'SvScriptNode' bl_label = 'Script Generator' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'SCRIPTPLUGINS' def avail_templates(self, context): fullpath = [sv_path, "node_scripts", "templates"] diff --git a/nodes/generator/script3.py b/nodes/generator/script3.py index d15d63d6d..efd4468eb 100644 --- a/nodes/generator/script3.py +++ b/nodes/generator/script3.py @@ -76,7 +76,7 @@ class SvScriptNodeMK3(SvScriptBase, bpy.types.Node, SverchCustomTreeNode): ''' Script node loader''' bl_idname = 'SvScriptNodeMK3' bl_label = 'Script Generator' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'SCRIPTPLUGINS' is_loaded = BoolProperty() diff --git a/nodes/generator/script_mk2.py b/nodes/generator/script_mk2.py index 176baa2c6..99aac7e3f 100644 --- a/nodes/generator/script_mk2.py +++ b/nodes/generator/script_mk2.py @@ -112,7 +112,7 @@ class SvScriptNodeMK2(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvScriptNodeMK2' bl_label = 'Script Node 2' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'SCRIPTPLUGINS' def avail_templates(self, context): templates_path = os.path.join(sv_path, "node_scripts", "SN2-templates") diff --git a/nodes/generator/sphere.py b/nodes/generator/sphere.py index 4f234c052..cd47e2212 100644 --- a/nodes/generator/sphere.py +++ b/nodes/generator/sphere.py @@ -66,7 +66,7 @@ class SphereNode(bpy.types.Node, SverchCustomTreeNode): ''' Sphere ''' bl_idname = 'SphereNode' bl_label = 'Sphere' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MESH_UVSPHERE' rad_ = FloatProperty(name='Radius', description='Radius', default=1.0, diff --git a/nodes/modifier_change/mirror.py b/nodes/modifier_change/mirror.py index dbec819ef..f6f9b990b 100644 --- a/nodes/modifier_change/mirror.py +++ b/nodes/modifier_change/mirror.py @@ -68,7 +68,7 @@ class SvMirrorNode(bpy.types.Node, SverchCustomTreeNode): ''' Mirroring ''' bl_idname = 'SvMirrorNode' bl_label = 'Mirror' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MOD_MIRROR' def mode_change(self, context): # just because click doesn't mean we need to change mode diff --git a/nodes/modifier_change/rotation.py b/nodes/modifier_change/rotation.py index 8ed71de3c..d2faa12ce 100644 --- a/nodes/modifier_change/rotation.py +++ b/nodes/modifier_change/rotation.py @@ -54,7 +54,7 @@ class SvRotationNode(bpy.types.Node, SverchCustomTreeNode): ''' Axis Rotation ''' bl_idname = 'SvRotationNode' bl_label = 'Rotation' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MAN_ROT' angle_ = FloatProperty(name='Angle', description='rotation angle', default=0.0, diff --git a/nodes/modifier_change/scale.py b/nodes/modifier_change/scale.py index bf468f3ba..cf601ec28 100644 --- a/nodes/modifier_change/scale.py +++ b/nodes/modifier_change/scale.py @@ -29,7 +29,7 @@ class SvScaleNode(bpy.types.Node, SverchCustomTreeNode): ''' Scale ''' bl_idname = 'SvScaleNode' bl_label = 'Scale' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MAN_SCALE' factor_ = FloatProperty(name='Factor', description='scaling factor', default=1.0, diff --git a/nodes/modifier_make/lathe.py b/nodes/modifier_make/lathe.py index cd4496782..cd68bd1ec 100644 --- a/nodes/modifier_make/lathe.py +++ b/nodes/modifier_make/lathe.py @@ -50,7 +50,7 @@ class SvLatheNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvLatheNode' bl_label = 'Sv Lathe Node' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MOD_SCREW' remove_doubles = BoolProperty(name='merge', description='Remove doubles', update=updateNode) dist = FloatProperty(name="merge distance", default=0.0001, update=updateNode) diff --git a/nodes/number/random.py b/nodes/number/random.py index b78e5e11c..bcca82a23 100755 --- a/nodes/number/random.py +++ b/nodes/number/random.py @@ -29,7 +29,7 @@ class RandomNode(bpy.types.Node, SverchCustomTreeNode): ''' Random numbers 0-1''' bl_idname = 'RandomNode' bl_label = 'Random' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'RNDCURVE' count_inner = IntProperty(name='Count', default=1, min=1, diff --git a/nodes/vector/axis_input.py b/nodes/vector/axis_input.py index 51b2f68f5..271457d84 100644 --- a/nodes/vector/axis_input.py +++ b/nodes/vector/axis_input.py @@ -37,7 +37,7 @@ class svAxisInputNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'svAxisInputNode' bl_label = 'Z axis' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MANIPUL' def mode_change(self, context): if not (self.selected_axis == self.current_axis): diff --git a/nodes/vector/move.py b/nodes/vector/move.py index a270e6c84..48c9018c3 100644 --- a/nodes/vector/move.py +++ b/nodes/vector/move.py @@ -27,7 +27,7 @@ class VectorMoveNode(bpy.types.Node, SverchCustomTreeNode): ''' Vector Move vectors ''' bl_idname = 'VectorMoveNode' bl_label = 'Vectors Move' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'MAN_TRANS' mult_ = FloatProperty(name='multiplier', default=1.0, diff --git a/nodes/vector/noise.py b/nodes/vector/noise.py index 8284e9aba..085dde3ea 100644 --- a/nodes/vector/noise.py +++ b/nodes/vector/noise.py @@ -42,7 +42,7 @@ class SvNoiseNode(bpy.types.Node, SverchCustomTreeNode): '''Vector Noise node''' bl_idname = 'SvNoiseNode' bl_label = 'Vector Noise' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'FORCE_TURBULENCE' def changeMode(self, context): if self.out_mode == 'SCALAR': diff --git a/nodes/vector/vertices_sort.py b/nodes/vector/vertices_sort.py index 287773f9b..e2eacd435 100644 --- a/nodes/vector/vertices_sort.py +++ b/nodes/vector/vertices_sort.py @@ -37,7 +37,7 @@ class SvVertSortNode(bpy.types.Node, SverchCustomTreeNode): '''Vector sort''' bl_idname = 'SvVertSortNode' bl_label = 'Vector Sort' - bl_icon = 'OUTLINER_OB_EMPTY' + bl_icon = 'SORTSIZE' def mode_change(self, context): if self.mode == 'XYZ': diff --git a/ui/nodeview_space_menu.py b/ui/nodeview_space_menu.py index 9271b13dc..7017f3bfc 100644 --- a/ui/nodeview_space_menu.py +++ b/ui/nodeview_space_menu.py @@ -54,11 +54,13 @@ def layout_draw_categories(layout, node_details): continue if show_icons: - if num_items == 3: - bl_idname, shortname, icon = node_info + bl_idname, shortname = node_info + + node_ref = getattr(bpy.types, bl_idname) + icon = getattr(node_ref, 'bl_icon') + if icon and (not icon == 'OUTLINER_OB_EMPTY'): layout_params = dict(text=shortname, icon=icon) else: - bl_idname, shortname = node_info layout_params = dict(text=shortname) else: # explicit chop of icon data -- GitLab From 6dfef1f7559dfbd4f87ac7e3dfacbe570116ea30 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 01:13:18 +0200 Subject: [PATCH 08/15] try / except for bl_icon --- nodes/modifier_change/limited_dissolve.py | 1 + ui/nodeview_space_menu.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nodes/modifier_change/limited_dissolve.py b/nodes/modifier_change/limited_dissolve.py index b0ae42c7d..420c3a6af 100644 --- a/nodes/modifier_change/limited_dissolve.py +++ b/nodes/modifier_change/limited_dissolve.py @@ -29,6 +29,7 @@ class SvLimitedDissolve(bpy.types.Node, SverchCustomTreeNode): ''' Limited Dissolve ''' bl_idname = 'SvLimitedDissolve' bl_label = 'Limited Dissolve' + bl_icon = 'OUTLINER_OB_EMPTY' angle = FloatProperty(default=5.0, min=0.0, update=updateNode) use_dissolve_boundaries = BoolProperty(update=updateNode) diff --git a/ui/nodeview_space_menu.py b/ui/nodeview_space_menu.py index 7017f3bfc..015c121a1 100644 --- a/ui/nodeview_space_menu.py +++ b/ui/nodeview_space_menu.py @@ -57,7 +57,13 @@ def layout_draw_categories(layout, node_details): bl_idname, shortname = node_info node_ref = getattr(bpy.types, bl_idname) - icon = getattr(node_ref, 'bl_icon') + + # some nodes don't declare a bl_icon, but most do so try/except is fine. + try: + icon = getattr(node_ref, 'bl_icon') + except: + icon = None + if icon and (not icon == 'OUTLINER_OB_EMPTY'): layout_params = dict(text=shortname, icon=icon) else: -- GitLab From e67990de92f0f4d1e6110277a4b1e623518bd5c1 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 01:23:12 +0200 Subject: [PATCH 09/15] drop need for comma between bl_idname and shortname --- index.md | 367 +++++++++++++++++++++++++++---------------------------- menu.py | 7 +- 2 files changed, 188 insertions(+), 186 deletions(-) diff --git a/index.md b/index.md index 03932e7b5..57428d3a5 100644 --- a/index.md +++ b/index.md @@ -8,226 +8,225 @@ > > Failing to follow these points will break the node category parser. - ## Generators - LineNode, Line - PlaneNode, Plane - SvNGonNode, NGon - SvBoxNode, Box - SvCircleNode, Circle - CylinderNode, Cylinder - SphereNode, Sphere - BasicSplineNode, 2pt Spline - svBasicArcNode, 3pt Arc - RandomVectorNode, Random Vector - SvBricksNode, Bricks grid - ImageNode, Image + LineNode Line + PlaneNode Plane + SvNGonNode NGon + SvBoxNode Box + SvCircleNode Circle + CylinderNode Cylinder + SphereNode Sphere + BasicSplineNode 2pt Spline + svBasicArcNode 3pt Arc + RandomVectorNode Random Vector + SvBricksNode Bricks grid + ImageNode Image ## Extended Generators - SvBoxRoundedNode, Rounded Box - HilbertNode, Hilbert - Hilbert3dNode, Hilbert3d - HilbertImageNode, Hilbert image - SvProfileNode, ProfileParametric - SvGenerativeArtNode, Generative Art - SvImageComponentsNode, Image Decompose - SvScriptNode, Scripted Node - SvScriptNodeMK3, Script 3 Node + SvBoxRoundedNode Rounded Box + HilbertNode Hilbert + Hilbert3dNode Hilbert3d + HilbertImageNode Hilbert image + SvProfileNode ProfileParametric + SvGenerativeArtNode Generative Art + SvImageComponentsNode Image Decompose + SvScriptNode Scripted Node + SvScriptNodeMK3 Script 3 Node ## Analyzers - SvBBoxNode, Bounding box - SvVolumeNode, Volume - AreaNode, Area - DistancePPNode, Distance - CentersPolsNodeMK2, Centers Polygons 2 - CentersPolsNodeMK3, Centers Polygons 3 - GetNormalsNode, Calculate normals - VectorNormalNode, Vertex Normal - SvKDTreeNode, KDT Closest Verts - SvKDTreeEdgesNode, KDT Closest Edges - SvMeshFilterNode, Mesh filter - SvEdgeAnglesNode, Angles at the edges + SvBBoxNode Bounding box + SvVolumeNode Volume + AreaNode Area + DistancePPNode Distance + CentersPolsNodeMK2 Centers Polygons 2 + CentersPolsNodeMK3 Centers Polygons 3 + GetNormalsNode Calculate normals + VectorNormalNode Vertex Normal + SvKDTreeNode KDT Closest Verts + SvKDTreeEdgesNode KDT Closest Edges + SvMeshFilterNode Mesh filter + SvEdgeAnglesNode Angles at the edges ## Transforms - SvRotationNode, Rotation - SvScaleNode, Scale - VectorMoveNode, Move - SvMirrorNode, Mirror - MatrixApplyNode, Matrix Apply + SvRotationNode Rotation + SvScaleNode Scale + VectorMoveNode Move + SvMirrorNode Mirror + MatrixApplyNode Matrix Apply ## Modifier Change - PolygonBoomNode, Polygon Boom - Pols2EdgsNode, Polygons to Edges - SvMeshJoinNode, Mesh Join - SvRemoveDoublesNode, Remove Doubles - SvDeleteLooseNode, Delete Loose - SvSeparateMeshNode, Separate Loose Parts - SvExtrudeSeparateNode, Extrude Separate Faces - SvRandomizeVerticesNode, Randomize input vertices - SvVertMaskNode, Mask Vertices - SvFillsHoleNode, Fill Holes - SvLimitedDissolve, Limited Dissolve - SvIntersectEdgesNode, Intersect Edges - SvIterateNode, Iterate matrix transformation - SvBevelNode, Bevel - SvExtrudeEdgesNode, Extrude Edges - SvOffsetNode, Offset - SvTriangulateNode, Triangulate mesh - SvRecalcNormalsNode, Recalc normals + PolygonBoomNode Polygon Boom + Pols2EdgsNode Polygons to Edges + SvMeshJoinNode Mesh Join + SvRemoveDoublesNode Remove Doubles + SvDeleteLooseNode Delete Loose + SvSeparateMeshNode Separate Loose Parts + SvExtrudeSeparateNode Extrude Separate Faces + SvRandomizeVerticesNode Randomize input vertices + SvVertMaskNode Mask Vertices + SvFillsHoleNode Fill Holes + SvLimitedDissolve Limited Dissolve + SvIntersectEdgesNode Intersect Edges + SvIterateNode Iterate matrix transformation + SvBevelNode Bevel + SvExtrudeEdgesNode Extrude Edges + SvOffsetNode Offset + SvTriangulateNode Triangulate mesh + SvRecalcNormalsNode Recalc normals ## Modifier Make - LineConnectNodeMK2, UV Connection - AdaptivePolsNode, Adaptive Polygons - SvAdaptiveEdgeNode, Ad aptive Edges - CrossSectionNode, Cross Section - SvBisectNode, Bisect - SvSolidifyNode, Solidify - SvWireframeNode, Wireframe - DelaunayTriangulation2DNode, Delaunay 2D - Voronoi2DNode, Voronoi 2D - SvPipeNode, Pipe - SvDuplicateAlongEdgeNode, Duplicate objects along edge - SvWafelNode, Wafel - SvConvexHullNode, Convex Hull - SvLatheNode, Lathe - SvMatrixTubeNode, Matrix Tube + LineConnectNodeMK2 UV Connection + AdaptivePolsNode Adaptive Polygons + SvAdaptiveEdgeNode Ad aptive Edges + CrossSectionNode Cross Section + SvBisectNode Bisect + SvSolidifyNode Solidify + SvWireframeNode Wireframe + DelaunayTriangulation2DNode Delaunay 2D + Voronoi2DNode Voronoi 2D + SvPipeNode Pipe + SvDuplicateAlongEdgeNode Duplicate objects along edge + SvWafelNode Wafel + SvConvexHullNode Convex Hull + SvLatheNode Lathe + SvMatrixTubeNode Matrix Tube ## List Masks - MaskListNode, List Mask (out) - SvMaskJoinNode, List Mask Join (in) + MaskListNode List Mask (out) + SvMaskJoinNode List Mask Join (in) ## List main - ListJoinNode, List Join - ZipNode, List Zip - ListLevelsNode, List Del Levels - ListLengthNode, List Length - ListSumNodeMK2, List Sum - ListMatchNode, List Match - ListFuncNode, List Math - SvListDecomposeNode, List Decompose + ListJoinNode List Join + ZipNode List Zip + ListLevelsNode List Del Levels + ListLengthNode List Length + ListSumNodeMK2 List Sum + ListMatchNode List Match + ListFuncNode List Math + SvListDecomposeNode List Decompose ## List struct - ShiftNodeMK2, List Shift - ListRepeaterNode, List Repeater - ListSliceNode, List Slice - SvListSplitNode, List Split - ListFLNode, List First&Last - ListItem2Node, List Item - ListReverseNode, List Reverse - ListShuffleNode, List Shuffle - ListSortNodeMK2, List Sort - ListFlipNode, List Flip + ShiftNodeMK2 List Shift + ListRepeaterNode List Repeater + ListSliceNode List Slice + SvListSplitNode List Split + ListFLNode List First&Last + ListItem2Node List Item + ListReverseNode List Reverse + ListShuffleNode List Shuffle + ListSortNodeMK2 List Sort + ListFlipNode List Flip ## Number - GenListRangeIntNode, Range Int - SvGenFloatRange, Range Float - SvListInputNode, List Input - RandomNode, Random - FloatNode, Float - IntegerNode, Int - Float2IntNode, Float 2 Int - Formula2Node, Formula - ScalarMathNode, Math - SvMapRangeNode, Map Range - SvEasingNode, Easing 0..1 - SvGenFibonacci, Fibonacci sequence - SvGenExponential, Exponential sequence + GenListRangeIntNode Range Int + SvGenFloatRange Range Float + SvListInputNode List Input + RandomNode Random + FloatNode Float + IntegerNode Int + Float2IntNode Float 2 Int + Formula2Node Formula + ScalarMathNode Math + SvMapRangeNode Map Range + SvEasingNode Easing 0..1 + SvGenFibonacci Fibonacci sequence + SvGenExponential Exponential sequence ## Vector - GenVectorsNode, Vector in - VectorsOutNode, Vector out - VectorMathNode, Vector Math - VectorDropNode, Vector Drop - VectorPolarInNode, Vector polar input - VectorPolarOutNode, Vector polar output - VertsDelDoublesNode, Vector X Doubles - EvaluateLineNode, Vector Evaluate - SvInterpolationNode, Vector Interpolation - SvInterpolationNodeMK2, Vector Interpolation mk2 - SvInterpolationNodeMK3, Vector Interpolation mk3 - SvVertSortNode, Vector Sort - SvNoiseNode, Vector Noise - svAxisInputNode, Vector X | Y | Z + GenVectorsNode Vector in + VectorsOutNode Vector out + VectorMathNode Vector Math + VectorDropNode Vector Drop + VectorPolarInNode Vector polar input + VectorPolarOutNode Vector polar output + VertsDelDoublesNode Vector X Doubles + EvaluateLineNode Vector Evaluate + SvInterpolationNode Vector Interpolation + SvInterpolationNodeMK2 Vector Interpolation mk2 + SvInterpolationNodeMK3 Vector Interpolation mk3 + SvVertSortNode Vector Sort + SvNoiseNode Vector Noise + svAxisInputNode Vector X | Y | Z ## Matrix - MatrixGenNode, Matrix in - MatrixOutNode, Matrix out - MatrixDeformNode, Matrix Deform - SvMatrixValueIn, Matrix Input - SvMatrixEulerNode, Matrix Euler - MatrixShearNode, Matrix Shear - MatrixInterpolationNode, Matrix Interpolation - SvMatrixApplyJoinNode, Apply matrix to mesh + MatrixGenNode Matrix in + MatrixOutNode Matrix out + MatrixDeformNode Matrix Deform + SvMatrixValueIn Matrix Input + SvMatrixEulerNode Matrix Euler + MatrixShearNode Matrix Shear + MatrixInterpolationNode Matrix Interpolation + SvMatrixApplyJoinNode Apply matrix to mesh ## Logic - SvLogicNode, Logic - SvSwitchNode, Switch - SvNeuroElman1LNode, Neuro + SvLogicNode Logic + SvSwitchNode Switch + SvNeuroElman1LNode Neuro ## Viz - ViewerNode2, Viewer Draw - SvBmeshViewerNodeMK2, Viewer BMeshMK2 - IndexViewerNode, Viewer Index - Sv3DviewPropsNode, 3dview Props + ViewerNode2 Viewer Draw + SvBmeshViewerNodeMK2 Viewer BMeshMK2 + IndexViewerNode Viewer Index + Sv3DviewPropsNode 3dview Props ## Text - ViewerNode_text, Viewer text - SvTextInNode, Text in - SvTextOutNode, Text out - NoteNode, Note - GTextNode, GText - SvDebugPrintNode, Debug print - SvStethoscopeNode, Stethoscope + ViewerNode_text Viewer text + SvTextInNode Text in + SvTextOutNode Text out + NoteNode Note + GTextNode GText + SvDebugPrintNode Debug print + SvStethoscopeNode Stethoscope ## Scene - ObjectsNode, Objects in - SvObjRemoteNode, Object Remote (Control) - SvFrameInfoNode, Frame info - SvEmptyOutNode, Empty out - SvDupliInstancesMK3, Dupli instancer - SvInstancerNode, Mesh instancer - SvGetPropNode, Get property - SvSetPropNode, Set property - SvVertexGroupNode, Vertex group - SvRayCastSceneNode, Scene Raycast - SvRayCastObjectNode, Object ID Raycast - SvVertexColorNode, Vertex color - SvVertexColorNodeMK2, Vertex color new + ObjectsNode Objects in + SvObjRemoteNode Object Remote (Control) + SvFrameInfoNode Frame info + SvEmptyOutNode Empty out + SvDupliInstancesMK3 Dupli instancer + SvInstancerNode Mesh instancer + SvGetPropNode Get property + SvSetPropNode Set property + SvVertexGroupNode Vertex group + SvRayCastSceneNode Scene Raycast + SvRayCastObjectNode Object ID Raycast + SvVertexColorNode Vertex color + SvVertexColorNodeMK2 Vertex color new ## Layout - WifiInNode, Wifi in - WifiOutNode, Wifi out - NodeReroute, Reroute Point - ConverterNode, SocketConvert + WifiInNode Wifi in + WifiOutNode Wifi out + NodeReroute Reroute Point + ConverterNode SocketConvert ## Network - UdpClientNode, UDP Client + UdpClientNode UDP Client ## Beta Nodes - SvFormulaShapeNode, Formula shape - SvScriptNodeMK2, Script 2 - SvHeavyTriangulateNode, Triangulate mesh (heavy) + SvFormulaShapeNode Formula shape + SvScriptNodeMK2 Script 2 + SvHeavyTriangulateNode Triangulate mesh (heavy) ## Alpha Nodes - SvCurveViewerNode, Curve Viewer - SvCurveViewerNodeAlt, Curve Viewer 2D - SvPolylineViewerNode, Polyline Viewer - SvTypeViewerNode, Typography Viewer - SvJoinTrianglesNode, Join Triangles - SvCacheNode, Cache - SvInsetSpecial, Inset Special - SkinViewerNode, Skin Mesher - SvCSGBooleanNode, CSG Boolean - SvNumpyArrayNode, Numpy Array - SvNodeRemoteNode, Node Remote (Control) - SvGetDataObjectNode, Object ID Get - SvSetDataObjectNode, Object ID Set - SvSortObjsNode, Object ID Sort - SvObjectToMeshNode, Object ID Out - SvFilterObjsNode, Object ID Filter - SvPointOnMeshNode, Object ID Point on Mesh - SvBMVertsNode, BMesh Props - SvBMOpsNode, BMesh Ops - SvBMinputNode, BMesh In - SvBMoutputNode, BMesh Out - SvBMtoElementNode, BMesh Elements + SvCurveViewerNode Curve Viewer + SvCurveViewerNodeAlt Curve Viewer 2D + SvPolylineViewerNode Polyline Viewer + SvTypeViewerNode Typography Viewer + SvJoinTrianglesNode Join Triangles + SvCacheNode Cache + SvInsetSpecial Inset Special + SkinViewerNode Skin Mesher + SvCSGBooleanNode CSG Boolean + SvNumpyArrayNode Numpy Array + SvNodeRemoteNode Node Remote (Control) + SvGetDataObjectNode Object ID Get + SvSetDataObjectNode Object ID Set + SvSortObjsNode Object ID Sort + SvObjectToMeshNode Object ID Out + SvFilterObjsNode Object ID Filter + SvPointOnMeshNode Object ID Point on Mesh + SvBMVertsNode BMesh Props + SvBMOpsNode BMesh Ops + SvBMinputNode BMesh In + SvBMoutputNode BMesh Out + SvBMtoElementNode BMesh Elements diff --git a/menu.py b/menu.py index 2795cc46c..5870e9d92 100644 --- a/menu.py +++ b/menu.py @@ -65,8 +65,11 @@ def make_node_cats(): temp_list = [] else: line_without_padding = line.strip() - non_padded_list = [i.strip() for i in line_without_padding.split(',')] - temp_list.append(non_padded_list) + f = line_without_padding.split(' ', 1) + bl_idname = f[0].strip() + shortname = f[1].strip() + temp_list.append([bl_idname, shortname]) + # final append node_cats[category] = temp_list -- GitLab From d52289d452d0279997265da43f73ed905da6ac2b Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 02:07:50 +0200 Subject: [PATCH 10/15] correct comment --- menu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/menu.py b/menu.py index 5870e9d92..b680830ba 100644 --- a/menu.py +++ b/menu.py @@ -38,12 +38,12 @@ def make_node_cats(): this loads the index.md file and converts it to an OrderedDict of node categories. ## category name - bl_idname, shortname, (optional) + bl_idname shortname ... ... ... becomes - node_cats[category name] = [['bl_idname', 'shortname' <, 'icon' >],...... ] + node_cats[category name] = [['bl_idname', 'shortname'],...... ] ''' -- GitLab From 68d823cfee2ac71e097c65bd494af0d83c3940ea Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 10:58:19 +0200 Subject: [PATCH 11/15] ditch duplicative shortname convention - sianara! --- index.md | 367 +++++++++++++++++++------------------- menu.py | 12 +- ui/nodeview_space_menu.py | 18 +- 3 files changed, 196 insertions(+), 201 deletions(-) diff --git a/index.md b/index.md index 57428d3a5..248d43449 100644 --- a/index.md +++ b/index.md @@ -9,224 +9,225 @@ > Failing to follow these points will break the node category parser. ## Generators - LineNode Line - PlaneNode Plane - SvNGonNode NGon - SvBoxNode Box - SvCircleNode Circle - CylinderNode Cylinder - SphereNode Sphere - BasicSplineNode 2pt Spline - svBasicArcNode 3pt Arc - RandomVectorNode Random Vector - SvBricksNode Bricks grid - ImageNode Image + LineNode + PlaneNode + SvNGonNode + SvBoxNode + SvCircleNode + CylinderNode + SphereNode + BasicSplineNode + svBasicArcNode + RandomVectorNode + SvBricksNode + ImageNode ## Extended Generators - SvBoxRoundedNode Rounded Box - HilbertNode Hilbert - Hilbert3dNode Hilbert3d - HilbertImageNode Hilbert image - SvProfileNode ProfileParametric - SvGenerativeArtNode Generative Art - SvImageComponentsNode Image Decompose - SvScriptNode Scripted Node - SvScriptNodeMK3 Script 3 Node + SvBoxRoundedNode + HilbertNode + Hilbert3dNode + HilbertImageNode + SvProfileNode + SvGenerativeArtNode + SvImageComponentsNode + SvScriptNode + SvScriptNodeMK3 ## Analyzers - SvBBoxNode Bounding box - SvVolumeNode Volume - AreaNode Area - DistancePPNode Distance - CentersPolsNodeMK2 Centers Polygons 2 - CentersPolsNodeMK3 Centers Polygons 3 - GetNormalsNode Calculate normals - VectorNormalNode Vertex Normal - SvKDTreeNode KDT Closest Verts - SvKDTreeEdgesNode KDT Closest Edges - SvMeshFilterNode Mesh filter - SvEdgeAnglesNode Angles at the edges + SvBBoxNode + SvVolumeNode + AreaNode + DistancePPNode + CentersPolsNodeMK2 + CentersPolsNodeMK3 + GetNormalsNode + VectorNormalNode + SvKDTreeNode + SvKDTreeEdgesNode + SvMeshFilterNode + SvEdgeAnglesNode ## Transforms - SvRotationNode Rotation - SvScaleNode Scale - VectorMoveNode Move - SvMirrorNode Mirror - MatrixApplyNode Matrix Apply + SvRotationNode + SvScaleNode + VectorMoveNode + SvMirrorNode + MatrixApplyNode ## Modifier Change - PolygonBoomNode Polygon Boom - Pols2EdgsNode Polygons to Edges - SvMeshJoinNode Mesh Join - SvRemoveDoublesNode Remove Doubles - SvDeleteLooseNode Delete Loose - SvSeparateMeshNode Separate Loose Parts - SvExtrudeSeparateNode Extrude Separate Faces - SvRandomizeVerticesNode Randomize input vertices - SvVertMaskNode Mask Vertices - SvFillsHoleNode Fill Holes - SvLimitedDissolve Limited Dissolve - SvIntersectEdgesNode Intersect Edges - SvIterateNode Iterate matrix transformation - SvBevelNode Bevel - SvExtrudeEdgesNode Extrude Edges - SvOffsetNode Offset - SvTriangulateNode Triangulate mesh - SvRecalcNormalsNode Recalc normals + PolygonBoomNode + Pols2EdgsNode + SvMeshJoinNode + SvRemoveDoublesNode + SvDeleteLooseNode + SvSeparateMeshNode + SvExtrudeSeparateNode + SvRandomizeVerticesNode + SvVertMaskNode + SvFillsHoleNode + SvLimitedDissolve + SvIntersectEdgesNode + SvIterateNode + SvBevelNode + SvExtrudeEdgesNode + SvOffsetNode + SvTriangulateNode + SvRecalcNormalsNode ## Modifier Make - LineConnectNodeMK2 UV Connection - AdaptivePolsNode Adaptive Polygons - SvAdaptiveEdgeNode Ad aptive Edges - CrossSectionNode Cross Section - SvBisectNode Bisect - SvSolidifyNode Solidify - SvWireframeNode Wireframe - DelaunayTriangulation2DNode Delaunay 2D - Voronoi2DNode Voronoi 2D - SvPipeNode Pipe - SvDuplicateAlongEdgeNode Duplicate objects along edge - SvWafelNode Wafel - SvConvexHullNode Convex Hull - SvLatheNode Lathe - SvMatrixTubeNode Matrix Tube + LineConnectNodeMK2 + AdaptivePolsNode + SvAdaptiveEdgeNode + CrossSectionNode + SvBisectNode + SvSolidifyNode + SvWireframeNode + DelaunayTriangulation2DNode + Voronoi2DNode + SvPipeNode + SvDuplicateAlongEdgeNode + SvWafelNode + SvConvexHullNode + SvLatheNode + SvMatrixTubeNode ## List Masks - MaskListNode List Mask (out) - SvMaskJoinNode List Mask Join (in) + MaskListNode + SvMaskJoinNode ## List main - ListJoinNode List Join - ZipNode List Zip - ListLevelsNode List Del Levels - ListLengthNode List Length - ListSumNodeMK2 List Sum - ListMatchNode List Match - ListFuncNode List Math - SvListDecomposeNode List Decompose + ListJoinNode + ZipNode + ListLevelsNode + ListLengthNode + ListSumNodeMK2 + ListMatchNode + ListFuncNode + SvListDecomposeNode ## List struct - ShiftNodeMK2 List Shift - ListRepeaterNode List Repeater - ListSliceNode List Slice - SvListSplitNode List Split - ListFLNode List First&Last - ListItem2Node List Item - ListReverseNode List Reverse - ListShuffleNode List Shuffle - ListSortNodeMK2 List Sort - ListFlipNode List Flip + ShiftNodeMK2 + ListRepeaterNode + ListSliceNode + SvListSplitNode + ListFLNode + ListItem2Node + ListReverseNode + ListShuffleNode + ListSortNodeMK2 + ListFlipNode ## Number - GenListRangeIntNode Range Int - SvGenFloatRange Range Float - SvListInputNode List Input - RandomNode Random - FloatNode Float - IntegerNode Int - Float2IntNode Float 2 Int - Formula2Node Formula - ScalarMathNode Math - SvMapRangeNode Map Range - SvEasingNode Easing 0..1 - SvGenFibonacci Fibonacci sequence - SvGenExponential Exponential sequence + GenListRangeIntNode + SvGenFloatRange + SvListInputNode + RandomNode + FloatNode + IntegerNode + Float2IntNode + Formula2Node + ScalarMathNode + SvMapRangeNode + SvEasingNode + SvGenFibonacci + SvGenExponential ## Vector - GenVectorsNode Vector in - VectorsOutNode Vector out - VectorMathNode Vector Math - VectorDropNode Vector Drop - VectorPolarInNode Vector polar input - VectorPolarOutNode Vector polar output - VertsDelDoublesNode Vector X Doubles - EvaluateLineNode Vector Evaluate - SvInterpolationNode Vector Interpolation - SvInterpolationNodeMK2 Vector Interpolation mk2 - SvInterpolationNodeMK3 Vector Interpolation mk3 - SvVertSortNode Vector Sort - SvNoiseNode Vector Noise - svAxisInputNode Vector X | Y | Z + GenVectorsNode + VectorsOutNode + VectorMathNode + VectorDropNode + VectorPolarInNode + VectorPolarOutNode + VertsDelDoublesNode + EvaluateLineNode + SvInterpolationNode + SvInterpolationNodeMK2 + SvInterpolationNodeMK3 + SvVertSortNode + SvNoiseNode + svAxisInputNode ## Matrix - MatrixGenNode Matrix in - MatrixOutNode Matrix out - MatrixDeformNode Matrix Deform - SvMatrixValueIn Matrix Input - SvMatrixEulerNode Matrix Euler - MatrixShearNode Matrix Shear - MatrixInterpolationNode Matrix Interpolation - SvMatrixApplyJoinNode Apply matrix to mesh + MatrixGenNode + MatrixOutNode + MatrixDeformNode + SvMatrixValueIn + SvMatrixEulerNode + MatrixShearNode + MatrixInterpolationNode + SvMatrixApplyJoinNode ## Logic - SvLogicNode Logic - SvSwitchNode Switch - SvNeuroElman1LNode Neuro + SvLogicNode + SvSwitchNode + SvNeuroElman1LNode ## Viz - ViewerNode2 Viewer Draw - SvBmeshViewerNodeMK2 Viewer BMeshMK2 - IndexViewerNode Viewer Index - Sv3DviewPropsNode 3dview Props + ViewerNode2 + SvBmeshViewerNodeMK2 + IndexViewerNode + Sv3DviewPropsNode ## Text - ViewerNode_text Viewer text - SvTextInNode Text in - SvTextOutNode Text out - NoteNode Note - GTextNode GText - SvDebugPrintNode Debug print - SvStethoscopeNode Stethoscope + ViewerNode_text + SvTextInNode + SvTextOutNode + NoteNode + GTextNode + SvDebugPrintNode + SvStethoscopeNode ## Scene - ObjectsNode Objects in - SvObjRemoteNode Object Remote (Control) - SvFrameInfoNode Frame info - SvEmptyOutNode Empty out - SvDupliInstancesMK3 Dupli instancer - SvInstancerNode Mesh instancer - SvGetPropNode Get property - SvSetPropNode Set property - SvVertexGroupNode Vertex group - SvRayCastSceneNode Scene Raycast - SvRayCastObjectNode Object ID Raycast - SvVertexColorNode Vertex color - SvVertexColorNodeMK2 Vertex color new + ObjectsNode + SvObjRemoteNode + SvFrameInfoNode + SvEmptyOutNode + SvDupliInstancesMK3 + SvInstancerNode + SvGetPropNode + SvSetPropNode + SvVertexGroupNode + SvRayCastSceneNode + SvRayCastObjectNode + SvVertexColorNode + SvVertexColorNodeMK2 ## Layout - WifiInNode Wifi in - WifiOutNode Wifi out - NodeReroute Reroute Point - ConverterNode SocketConvert + WifiInNode + WifiOutNode + NodeReroute + ConverterNode ## Network - UdpClientNode UDP Client + UdpClientNode ## Beta Nodes - SvFormulaShapeNode Formula shape - SvScriptNodeMK2 Script 2 - SvHeavyTriangulateNode Triangulate mesh (heavy) + SvFormulaShapeNode + SvScriptNodeMK2 + SvHeavyTriangulateNode ## Alpha Nodes - SvCurveViewerNode Curve Viewer - SvCurveViewerNodeAlt Curve Viewer 2D - SvPolylineViewerNode Polyline Viewer - SvTypeViewerNode Typography Viewer - SvJoinTrianglesNode Join Triangles - SvCacheNode Cache - SvInsetSpecial Inset Special - SkinViewerNode Skin Mesher - SvCSGBooleanNode CSG Boolean - SvNumpyArrayNode Numpy Array - SvNodeRemoteNode Node Remote (Control) - SvGetDataObjectNode Object ID Get - SvSetDataObjectNode Object ID Set - SvSortObjsNode Object ID Sort - SvObjectToMeshNode Object ID Out - SvFilterObjsNode Object ID Filter - SvPointOnMeshNode Object ID Point on Mesh - SvBMVertsNode BMesh Props - SvBMOpsNode BMesh Ops - SvBMinputNode BMesh In - SvBMoutputNode BMesh Out - SvBMtoElementNode BMesh Elements + SvCurveViewerNode + SvCurveViewerNodeAlt + SvPolylineViewerNode + SvTypeViewerNode + SvJoinTrianglesNode + SvCacheNode + SvInsetSpecial + SkinViewerNode + SvCSGBooleanNode + SvNumpyArrayNode + SvNodeRemoteNode + SvGetDataObjectNode + SvSetDataObjectNode + SvSortObjsNode + SvObjectToMeshNode + SvFilterObjsNode + SvPointOnMeshNode + SvBMVertsNode + SvBMOpsNode + SvBMinputNode + SvBMoutputNode + SvBMtoElementNode + \ No newline at end of file diff --git a/menu.py b/menu.py index b680830ba..6198efb88 100644 --- a/menu.py +++ b/menu.py @@ -64,11 +64,8 @@ def make_node_cats(): category = line[2:].strip() temp_list = [] else: - line_without_padding = line.strip() - f = line_without_padding.split(' ', 1) - bl_idname = f[0].strip() - shortname = f[1].strip() - temp_list.append([bl_idname, shortname]) + bl_idname = line.strip() + temp_list.append([bl_idname]) # final append node_cats[category] = temp_list @@ -172,10 +169,9 @@ def make_categories(): name_big = "SVERCHOK_" + category.replace(' ', '_') node_categories.append(SverchNodeCategory( name_big, category, - # bl_idname, name - items=[NodeItem(props[0], props[1]) for props in nodes])) + items=[NodeItem(props[0]) for props in nodes])) node_count += len(nodes) - node_categories.append(SverchNodeCategory("SVERCHOK_GROUPS", "Groups",items=sv_group_items)) + node_categories.append(SverchNodeCategory("SVERCHOK_GROUPS", "Groups", items=sv_group_items)) return node_categories, node_count diff --git a/ui/nodeview_space_menu.py b/ui/nodeview_space_menu.py index 015c121a1..fc94f76e2 100644 --- a/ui/nodeview_space_menu.py +++ b/ui/nodeview_space_menu.py @@ -48,15 +48,15 @@ def layout_draw_categories(layout, node_details): add_n_grab = 'node.add_node' for node_info in node_details: - num_items = len(node_info) - if not num_items in {2, 3}: + + if not node_info: print(repr(node_info), 'is incomplete, or unparsable') continue - if show_icons: - bl_idname, shortname = node_info + bl_idname = node_info[0] + node_ref = getattr(bpy.types, bl_idname) - node_ref = getattr(bpy.types, bl_idname) + if show_icons: # some nodes don't declare a bl_icon, but most do so try/except is fine. try: @@ -65,13 +65,11 @@ def layout_draw_categories(layout, node_details): icon = None if icon and (not icon == 'OUTLINER_OB_EMPTY'): - layout_params = dict(text=shortname, icon=icon) + layout_params = dict(text=node_ref.bl_label, icon=icon) else: - layout_params = dict(text=shortname) + layout_params = dict(text=node_ref.bl_label) else: - # explicit chop of icon data - bl_idname, shortname = node_info[:2] - layout_params = dict(text=shortname) + layout_params = dict(text=node_ref.bl_label) node_op = layout.operator(add_n_grab, **layout_params) node_op.type = bl_idname -- GitLab From 35c9f5f5549a73a64a6cb1bbab00b9e048c34787 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 13:48:21 +0200 Subject: [PATCH 12/15] completes first half of shortname -> bl_label --- nodes/analyzer/distance_pp.py | 9 ++++---- nodes/analyzer/kd_tree.py | 2 +- nodes/analyzer/kd_tree_edges.py | 2 +- nodes/analyzer/normals.py | 2 +- nodes/analyzer/polygons_centers.py | 2 +- nodes/analyzer/polygons_centers_mk3.py | 2 +- nodes/analyzer/volume.py | 2 +- nodes/generator/basic_3pt_arc.py | 2 +- nodes/generator/basic_spline.py | 2 +- nodes/generator/box_rounded.py | 2 +- nodes/generator/hilbert_image.py | 2 +- nodes/generator/profile.py | 2 +- nodes/generator/script.py | 2 +- nodes/generator/script3.py | 2 +- nodes/list_basic/func.py | 2 +- nodes/list_basic/mask.py | 2 +- nodes/list_basic/mask_join.py | 2 +- nodes/list_basic/sum_mk2.py | 2 +- nodes/list_interfere/flip.py | 2 +- nodes/list_interfere/item.py | 2 +- nodes/list_interfere/repeater.py | 2 +- nodes/list_interfere/shift_mk2.py | 2 +- nodes/list_interfere/sort_mk2.py | 2 +- nodes/list_interfere/start_end.py | 2 +- nodes/matrix/apply.py | 2 +- nodes/modifier_change/extrude_separate.py | 2 +- nodes/modifier_change/iterate.py | 2 +- nodes/modifier_change/mesh_separate.py | 2 +- nodes/modifier_change/objects_along_edge.py | 2 +- nodes/modifier_change/polygons_boom.py | 2 +- nodes/modifier_change/polygons_to_edges.py | 2 +- nodes/modifier_change/randomize.py | 2 +- nodes/modifier_change/remove_doubles.py | 2 +- nodes/modifier_make/lathe.py | 2 +- nodes/modifier_make/pipe_tubes.py | 2 +- nodes/modifier_make/uv_connect.py | 2 +- nodes/modifier_make/voronoi_2d.py | 2 +- nodes/number/easing.py | 2 +- nodes/number/exponential.py | 2 +- nodes/number/fibonacci.py | 2 +- nodes/number/float_to_int.py | 2 +- nodes/number/formula2.py | 25 ++++++++++++--------- nodes/number/integer.py | 2 +- nodes/number/range_float.py | 2 +- nodes/number/range_int.py | 2 +- nodes/number/scalar.py | 2 +- nodes/vector/move.py | 2 +- nodes/vector/normal.py | 2 +- 48 files changed, 66 insertions(+), 60 deletions(-) diff --git a/nodes/analyzer/distance_pp.py b/nodes/analyzer/distance_pp.py index 1c076f5c4..bec068b2c 100644 --- a/nodes/analyzer/distance_pp.py +++ b/nodes/analyzer/distance_pp.py @@ -21,15 +21,16 @@ from bpy.props import BoolProperty from mathutils import Vector from sverchok.node_tree import SverchCustomTreeNode -from sverchok.data_structure import (Matrix_generate, Matrix_location, - SvGetSocketAnyType, SvSetSocketAnyType, - Vector_generate) +from sverchok.data_structure import ( + Matrix_generate, Matrix_location, + SvGetSocketAnyType, SvSetSocketAnyType, Vector_generate +) class DistancePPNode(bpy.types.Node, SverchCustomTreeNode): ''' Distance Point to Point ''' bl_idname = 'DistancePPNode' - bl_label = 'Distances' + bl_label = 'Distance' bl_icon = 'OUTLINER_OB_EMPTY' Cross_dist = BoolProperty(name='Cross_dist', description='DANGEROUS! If crossover dimension calculation, be sure', diff --git a/nodes/analyzer/kd_tree.py b/nodes/analyzer/kd_tree.py index e3cfe67a9..8b78e513d 100644 --- a/nodes/analyzer/kd_tree.py +++ b/nodes/analyzer/kd_tree.py @@ -29,7 +29,7 @@ from sverchok.node_tree import SverchCustomTreeNode class SvKDTreeNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvKDTreeNode' - bl_label = 'Kdtree search' + bl_label = 'KDT Closest Verts' bl_icon = 'OUTLINER_OB_EMPTY' current_mode = StringProperty(default="FIND") diff --git a/nodes/analyzer/kd_tree_edges.py b/nodes/analyzer/kd_tree_edges.py index d6dbc8ab1..efedf67b0 100644 --- a/nodes/analyzer/kd_tree_edges.py +++ b/nodes/analyzer/kd_tree_edges.py @@ -29,7 +29,7 @@ from sverchok.data_structure import updateNode, SvSetSocketAnyType, SvGetSocketA class SvKDTreeEdgesNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvKDTreeEdgesNode' - bl_label = 'Kdtree Edges' + bl_label = 'KDT Closest Edges' bl_icon = 'OUTLINER_OB_EMPTY' mindist = FloatProperty( diff --git a/nodes/analyzer/normals.py b/nodes/analyzer/normals.py index 16e5d1ed8..eea8c8d37 100644 --- a/nodes/analyzer/normals.py +++ b/nodes/analyzer/normals.py @@ -42,7 +42,7 @@ def calc_mesh_normals(vertices, edges, faces): class GetNormalsNode(bpy.types.Node, SverchCustomTreeNode): ''' Calculate normals of faces and vertices ''' bl_idname = 'GetNormalsNode' - bl_label = 'Calc Normals' + bl_label = 'Calculate normals' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/analyzer/polygons_centers.py b/nodes/analyzer/polygons_centers.py index 4a976460e..3adb624ca 100644 --- a/nodes/analyzer/polygons_centers.py +++ b/nodes/analyzer/polygons_centers.py @@ -26,7 +26,7 @@ from sverchok.data_structure import (SvSetSocketAnyType, SvGetSocketAnyType, class CentersPolsNodeMK2(bpy.types.Node, SverchCustomTreeNode): ''' Centers of polygons of mesh (not including matrixes, so apply scale-rot-loc ctrl+A) ''' bl_idname = 'CentersPolsNodeMK2' - bl_label = 'Centers polygons' + bl_label = 'Centers polygons 2' bl_icon = 'OUTLINER_OB_EMPTY' Separate = BoolProperty(name="Separate", diff --git a/nodes/analyzer/polygons_centers_mk3.py b/nodes/analyzer/polygons_centers_mk3.py index 3f4063dcd..69029cad1 100644 --- a/nodes/analyzer/polygons_centers_mk3.py +++ b/nodes/analyzer/polygons_centers_mk3.py @@ -26,7 +26,7 @@ from sverchok.data_structure import (SvSetSocketAnyType, SvGetSocketAnyType, class CentersPolsNodeMK3(bpy.types.Node, SverchCustomTreeNode): ''' Centers of polygons of mesh (not including matrixes, so apply scale-rot-loc ctrl+A) ''' bl_idname = 'CentersPolsNodeMK3' - bl_label = 'Centers polygons' + bl_label = 'Centers polygons 3' bl_icon = 'OUTLINER_OB_EMPTY' Separate = BoolProperty(name="Separate", diff --git a/nodes/analyzer/volume.py b/nodes/analyzer/volume.py index 750920aa6..81871292f 100644 --- a/nodes/analyzer/volume.py +++ b/nodes/analyzer/volume.py @@ -28,7 +28,7 @@ from sverchok.data_structure import (dataCorrect, updateNode, class SvVolumeNode(bpy.types.Node, SverchCustomTreeNode): ''' Volume ''' bl_idname = 'SvVolumeNode' - bl_label = 'Volume Node' + bl_label = 'Volume' bl_icon = 'OUTLINER_OB_EMPTY' def draw_buttons(self, context, layout): diff --git a/nodes/generator/basic_3pt_arc.py b/nodes/generator/basic_3pt_arc.py index 116ed0a52..a3401e8be 100644 --- a/nodes/generator/basic_3pt_arc.py +++ b/nodes/generator/basic_3pt_arc.py @@ -100,7 +100,7 @@ class svBasicArcNode(bpy.types.Node, SverchCustomTreeNode): ''' Arc from 3 points ''' bl_idname = 'svBasicArcNode' - bl_label = 'Basic 3point Arc' + bl_label = '3pt Arc' bl_icon = 'SPHERECURVE' num_verts = IntProperty( diff --git a/nodes/generator/basic_spline.py b/nodes/generator/basic_spline.py index 69f63e82f..6b7efb3f0 100644 --- a/nodes/generator/basic_spline.py +++ b/nodes/generator/basic_spline.py @@ -42,7 +42,7 @@ def generate_bezier(verts=[], num_verts=20): class BasicSplineNode(bpy.types.Node, SverchCustomTreeNode): ''' Line ''' bl_idname = 'BasicSplineNode' - bl_label = 'BasicSpline' + bl_label = '2pt Spline' bl_icon = 'CURVE_BEZCURVE' num_verts = IntProperty( diff --git a/nodes/generator/box_rounded.py b/nodes/generator/box_rounded.py index 797d727f5..3457f4f79 100644 --- a/nodes/generator/box_rounded.py +++ b/nodes/generator/box_rounded.py @@ -351,7 +351,7 @@ def round_cube( class SvBoxRoundedNode(bpy.types.Node, SverchCustomTreeNode): ''' Box ''' bl_idname = 'SvBoxRoundedNode' - bl_label = 'RoundBox' + bl_label = 'Rounded Box' bl_icon = 'OUTLINER_OB_EMPTY' radius = FloatProperty( diff --git a/nodes/generator/hilbert_image.py b/nodes/generator/hilbert_image.py index 6d5876dc6..f8283f11d 100644 --- a/nodes/generator/hilbert_image.py +++ b/nodes/generator/hilbert_image.py @@ -26,7 +26,7 @@ from sverchok.data_structure import updateNode, SvSetSocketAnyType, SvGetSocketA class HilbertImageNode(bpy.types.Node, SverchCustomTreeNode): ''' Hilbert Image ''' bl_idname = 'HilbertImageNode' - bl_label = 'HilbertImage' + bl_label = 'Hilbert image' bl_icon = 'OUTLINER_OB_EMPTY' def images(self, context): diff --git a/nodes/generator/profile.py b/nodes/generator/profile.py index c3ad9a13b..b1dd907c2 100644 --- a/nodes/generator/profile.py +++ b/nodes/generator/profile.py @@ -448,7 +448,7 @@ class SvProfileNode(bpy.types.Node, SverchCustomTreeNode): - The longest input array will be used to extend the shorter ones, using last value repeat. ''' bl_idname = 'SvProfileNode' - bl_label = 'ProfileNode' + bl_label = 'Profile Parametric' bl_icon = 'OUTLINER_OB_EMPTY' def mode_change(self, context): diff --git a/nodes/generator/script.py b/nodes/generator/script.py index 5caeb9470..de4caec39 100644 --- a/nodes/generator/script.py +++ b/nodes/generator/script.py @@ -159,7 +159,7 @@ class SvScriptNode(bpy.types.Node, SverchCustomTreeNode): ''' Script node ''' bl_idname = 'SvScriptNode' - bl_label = 'Script Generator' + bl_label = 'Scripted Node' bl_icon = 'SCRIPTPLUGINS' def avail_templates(self, context): diff --git a/nodes/generator/script3.py b/nodes/generator/script3.py index efd4468eb..a859fc0ef 100644 --- a/nodes/generator/script3.py +++ b/nodes/generator/script3.py @@ -75,7 +75,7 @@ class SvScriptNodeMK3(SvScriptBase, bpy.types.Node, SverchCustomTreeNode): ''' Script node loader''' bl_idname = 'SvScriptNodeMK3' - bl_label = 'Script Generator' + bl_label = 'Script 3 Node' bl_icon = 'SCRIPTPLUGINS' diff --git a/nodes/list_basic/func.py b/nodes/list_basic/func.py index 7c2ca1757..894b33d0d 100644 --- a/nodes/list_basic/func.py +++ b/nodes/list_basic/func.py @@ -30,7 +30,7 @@ def acc(l): class ListFuncNode(bpy.types.Node, SverchCustomTreeNode): ''' List function ''' bl_idname = 'ListFuncNode' - bl_label = 'List function ' + bl_label = 'List Math' bl_icon = 'OUTLINER_OB_EMPTY' mode_items = [ diff --git a/nodes/list_basic/mask.py b/nodes/list_basic/mask.py index 7049d6f83..84554e033 100644 --- a/nodes/list_basic/mask.py +++ b/nodes/list_basic/mask.py @@ -28,7 +28,7 @@ from sverchok.data_structure import (updateNode, changable_sockets, class MaskListNode(bpy.types.Node, SverchCustomTreeNode): ''' MaskList node ''' bl_idname = 'MaskListNode' - bl_label = 'MaskList' + bl_label = 'List Mask (out)' bl_icon = 'OUTLINER_OB_EMPTY' Level = IntProperty(name='Level', description='Choose list level of data (see help)', diff --git a/nodes/list_basic/mask_join.py b/nodes/list_basic/mask_join.py index b7eaa7064..3e3e00d2e 100644 --- a/nodes/list_basic/mask_join.py +++ b/nodes/list_basic/mask_join.py @@ -29,7 +29,7 @@ from sverchok.data_structure import (changable_sockets, updateNode, class SvMaskJoinNode(bpy.types.Node, SverchCustomTreeNode): '''Mask Join''' bl_idname = 'SvMaskJoinNode' - bl_label = 'Mask Join' + bl_label = 'List Mask Join (in)' bl_icon = 'OUTLINER_OB_EMPTY' level = IntProperty(name="Level", diff --git a/nodes/list_basic/sum_mk2.py b/nodes/list_basic/sum_mk2.py index c37ed30e4..7ebdd0ec6 100644 --- a/nodes/list_basic/sum_mk2.py +++ b/nodes/list_basic/sum_mk2.py @@ -27,7 +27,7 @@ from bpy.props import IntProperty class ListSumNodeMK2(bpy.types.Node, SverchCustomTreeNode): ''' List summa MK2 ''' bl_idname = 'ListSumNodeMK2' - bl_label = 'List summa MK2' + bl_label = 'List Sum' bl_icon = 'OUTLINER_OB_EMPTY' level = IntProperty(name='level_to_count', diff --git a/nodes/list_interfere/flip.py b/nodes/list_interfere/flip.py index 4b8d56955..dff2d4cce 100644 --- a/nodes/list_interfere/flip.py +++ b/nodes/list_interfere/flip.py @@ -50,7 +50,7 @@ def maxlen(list): class ListFlipNode(bpy.types.Node, SverchCustomTreeNode): ''' ListFlipNode ''' bl_idname = 'ListFlipNode' - bl_label = 'List Flip Node' + bl_label = 'List Flip' bl_icon = 'OUTLINER_OB_EMPTY' level = IntProperty(name='level_to_count', diff --git a/nodes/list_interfere/item.py b/nodes/list_interfere/item.py index 92ff29690..eedfcee99 100644 --- a/nodes/list_interfere/item.py +++ b/nodes/list_interfere/item.py @@ -36,7 +36,7 @@ from sverchok.data_structure import (changable_sockets, repeat_last, updateNode, class ListItem2Node(bpy.types.Node, SverchCustomTreeNode): ''' List item ''' bl_idname = 'ListItem2Node' - bl_label = 'List item' + bl_label = 'List Item' bl_icon = 'OUTLINER_OB_EMPTY' level = IntProperty(name='level_to_count', diff --git a/nodes/list_interfere/repeater.py b/nodes/list_interfere/repeater.py index f102dfbd4..8dac0359c 100644 --- a/nodes/list_interfere/repeater.py +++ b/nodes/list_interfere/repeater.py @@ -27,7 +27,7 @@ from sverchok.data_structure import (updateNode, changable_sockets, class ListRepeaterNode(bpy.types.Node, SverchCustomTreeNode): ''' List repeater ''' bl_idname = 'ListRepeaterNode' - bl_label = 'List repeater' + bl_label = 'List Repeater' bl_icon = 'OUTLINER_OB_EMPTY' level = IntProperty(name='level', diff --git a/nodes/list_interfere/shift_mk2.py b/nodes/list_interfere/shift_mk2.py index 943bd11a4..7f93d15cd 100644 --- a/nodes/list_interfere/shift_mk2.py +++ b/nodes/list_interfere/shift_mk2.py @@ -28,7 +28,7 @@ import numpy as np class ShiftNodeMK2(bpy.types.Node, SverchCustomTreeNode): ''' Shift node mk2 ''' bl_idname = 'ShiftNodeMK2' - bl_label = 'List Shift mk2' + bl_label = 'List Shift' bl_icon = 'OUTLINER_OB_EMPTY' shift_c = IntProperty(name='Shift', diff --git a/nodes/list_interfere/sort_mk2.py b/nodes/list_interfere/sort_mk2.py index 20464026a..5358f941a 100644 --- a/nodes/list_interfere/sort_mk2.py +++ b/nodes/list_interfere/sort_mk2.py @@ -26,7 +26,7 @@ from sverchok.data_structure import (updateNode, changable_sockets, class ListSortNodeMK2(bpy.types.Node, SverchCustomTreeNode): ''' List Sort MK2 ''' bl_idname = 'ListSortNodeMK2' - bl_label = 'List Sort MK2' + bl_label = 'List Sort' bl_icon = 'OUTLINER_OB_EMPTY' level = IntProperty(name='level_to_count', diff --git a/nodes/list_interfere/start_end.py b/nodes/list_interfere/start_end.py index f4687c9a9..1b6918984 100644 --- a/nodes/list_interfere/start_end.py +++ b/nodes/list_interfere/start_end.py @@ -28,7 +28,7 @@ from sverchok.data_structure import (updateNode, changable_sockets, class ListFLNode(bpy.types.Node, SverchCustomTreeNode): ''' List First and last item of list ''' bl_idname = 'ListFLNode' - bl_label = 'List First Last' + bl_label = 'List First & Last' bl_icon = 'OUTLINER_OB_EMPTY' level = IntProperty(name='level_to_count', diff --git a/nodes/matrix/apply.py b/nodes/matrix/apply.py index 72871e3a2..6a6f9a50f 100644 --- a/nodes/matrix/apply.py +++ b/nodes/matrix/apply.py @@ -28,7 +28,7 @@ from sverchok.data_structure import (Vector_generate, Vector_degenerate, class MatrixApplyNode(bpy.types.Node, SverchCustomTreeNode): ''' Multiply vectors on matrixes with several objects in output ''' bl_idname = 'MatrixApplyNode' - bl_label = 'Apply matrix for vectors' + bl_label = 'Matrix Apply' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/modifier_change/extrude_separate.py b/nodes/modifier_change/extrude_separate.py index 8bccadb1d..47cadc500 100644 --- a/nodes/modifier_change/extrude_separate.py +++ b/nodes/modifier_change/extrude_separate.py @@ -33,7 +33,7 @@ def Matrix_degenerate(ms): class SvExtrudeSeparateNode(bpy.types.Node, SverchCustomTreeNode): ''' Extrude separate faces ''' bl_idname = 'SvExtrudeSeparateNode' - bl_label = 'Extrude Separate' + bl_label = 'Extrude Separate Faces' bl_icon = 'OUTLINER_OB_EMPTY' height_ = FloatProperty(name="Height", description="Extrusion amount", diff --git a/nodes/modifier_change/iterate.py b/nodes/modifier_change/iterate.py index eb435d4e2..e9cd453f8 100644 --- a/nodes/modifier_change/iterate.py +++ b/nodes/modifier_change/iterate.py @@ -101,7 +101,7 @@ def calc_matrix_powers(matrices, count): class SvIterateNode(bpy.types.Node, SverchCustomTreeNode): ''' Iterate matrix transformation ''' bl_idname = 'SvIterateNode' - bl_label = 'Iterate' + bl_label = 'Iterate matrix transformation' bl_icon = 'OUTLINER_OB_EMPTY' count_ = IntProperty( diff --git a/nodes/modifier_change/mesh_separate.py b/nodes/modifier_change/mesh_separate.py index 53cdb3767..6a30a4720 100644 --- a/nodes/modifier_change/mesh_separate.py +++ b/nodes/modifier_change/mesh_separate.py @@ -27,7 +27,7 @@ from sverchok.data_structure import SvSetSocketAnyType, SvGetSocketAnyType class SvSeparateMeshNode(bpy.types.Node, SverchCustomTreeNode): '''Separate Loose mesh parts''' bl_idname = 'SvSeparateMeshNode' - bl_label = 'Separate Loose' + bl_label = 'Separate Loose Parts' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/modifier_change/objects_along_edge.py b/nodes/modifier_change/objects_along_edge.py index 4bd3a26aa..2d63ca5a2 100644 --- a/nodes/modifier_change/objects_along_edge.py +++ b/nodes/modifier_change/objects_along_edge.py @@ -67,7 +67,7 @@ def Matrix_degenerate(ms): class SvDuplicateAlongEdgeNode(bpy.types.Node, SverchCustomTreeNode): ''' Duplicate meshes along edge ''' bl_idname = 'SvDuplicateAlongEdgeNode' - bl_label = 'Duplicate along edge' + bl_label = 'Duplicate objects along edge' bl_icon = 'OUTLINER_OB_EMPTY' count_modes = [ diff --git a/nodes/modifier_change/polygons_boom.py b/nodes/modifier_change/polygons_boom.py index 09547ca2c..027fe8309 100644 --- a/nodes/modifier_change/polygons_boom.py +++ b/nodes/modifier_change/polygons_boom.py @@ -25,7 +25,7 @@ from sverchok.data_structure import SvSetSocketAnyType, SvGetSocketAnyType class PolygonBoomNode(bpy.types.Node, SverchCustomTreeNode): ''' Destroy object to many object of polygons ''' bl_idname = 'PolygonBoomNode' - bl_label = 'PolygonBoom' + bl_label = 'Polygon Boom' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/modifier_change/polygons_to_edges.py b/nodes/modifier_change/polygons_to_edges.py index bdc65695f..5b771bf36 100644 --- a/nodes/modifier_change/polygons_to_edges.py +++ b/nodes/modifier_change/polygons_to_edges.py @@ -35,7 +35,7 @@ def pols_edges(obj): class Pols2EdgsNode(bpy.types.Node, SverchCustomTreeNode): ''' take polygon and to edges ''' bl_idname = 'Pols2EdgsNode' - bl_label = 'Polygons 2 Edges' + bl_label = 'Polygons to Edges' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/modifier_change/randomize.py b/nodes/modifier_change/randomize.py index fd04ab0cf..ae155380a 100644 --- a/nodes/modifier_change/randomize.py +++ b/nodes/modifier_change/randomize.py @@ -38,7 +38,7 @@ def randomize(vertices, random_x, random_y, random_z): class SvRandomizeVerticesNode(bpy.types.Node, SverchCustomTreeNode): ''' Randomize input vertices locations ''' bl_idname = 'SvRandomizeVerticesNode' - bl_label = 'Randomize Vertices' + bl_label = 'Randomize input vertices' bl_icon = 'OUTLINER_OB_EMPTY' random_x_ = FloatProperty(name='X amplitude', description='Amplitude of randomization along X axis', diff --git a/nodes/modifier_change/remove_doubles.py b/nodes/modifier_change/remove_doubles.py index e1e99e348..452c9be03 100644 --- a/nodes/modifier_change/remove_doubles.py +++ b/nodes/modifier_change/remove_doubles.py @@ -73,7 +73,7 @@ def remove_doubles(vertices, faces, d, find_doubles=False): class SvRemoveDoublesNode(bpy.types.Node, SverchCustomTreeNode): '''Remove doubles''' bl_idname = 'SvRemoveDoublesNode' - bl_label = 'Remove Doubles BETA' + bl_label = 'Remove Doubles' bl_icon = 'OUTLINER_OB_EMPTY' distance = FloatProperty(name='Distance', description='Remove distance', diff --git a/nodes/modifier_make/lathe.py b/nodes/modifier_make/lathe.py index cd68bd1ec..9393b527f 100644 --- a/nodes/modifier_make/lathe.py +++ b/nodes/modifier_make/lathe.py @@ -49,7 +49,7 @@ def get_lathed_geometry(node, verts, edges, cent, axis, dvec, angle, steps): class SvLatheNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvLatheNode' - bl_label = 'Sv Lathe Node' + bl_label = 'Lathe' bl_icon = 'MOD_SCREW' remove_doubles = BoolProperty(name='merge', description='Remove doubles', update=updateNode) diff --git a/nodes/modifier_make/pipe_tubes.py b/nodes/modifier_make/pipe_tubes.py index 53d5ba2a3..bc99357c7 100644 --- a/nodes/modifier_make/pipe_tubes.py +++ b/nodes/modifier_make/pipe_tubes.py @@ -27,7 +27,7 @@ from math import sin, cos, radians, sqrt class SvPipeNode(bpy.types.Node, SverchCustomTreeNode): ''' Pipe from edges ''' bl_idname = 'SvPipeNode' - bl_label = 'Pipe tube Node' + bl_label = 'Pipe' bl_icon = 'OUTLINER_OB_EMPTY' #nsides = IntProperty(name='nsides', description='number of sides', diff --git a/nodes/modifier_make/uv_connect.py b/nodes/modifier_make/uv_connect.py index 0f130d827..685a95633 100644 --- a/nodes/modifier_make/uv_connect.py +++ b/nodes/modifier_make/uv_connect.py @@ -27,7 +27,7 @@ from sverchok.data_structure import (updateNode, fullList, multi_socket, levelsO class LineConnectNodeMK2(bpy.types.Node, SverchCustomTreeNode): ''' UV Connect node ''' bl_idname = 'LineConnectNodeMK2' - bl_label = 'UV Connect' + bl_label = 'UV Connection' bl_icon = 'OUTLINER_OB_EMPTY' JoinLevel = IntProperty(name='JoinLevel', description='Choose connect level of data (see help)', diff --git a/nodes/modifier_make/voronoi_2d.py b/nodes/modifier_make/voronoi_2d.py index cbdb897c3..ca0ff5151 100644 --- a/nodes/modifier_make/voronoi_2d.py +++ b/nodes/modifier_make/voronoi_2d.py @@ -27,7 +27,7 @@ from sverchok.utils.voronoi import Site, computeVoronoiDiagram, computeDelaunayT class Voronoi2DNode(bpy.types.Node, SverchCustomTreeNode): ''' Voronoi 2d line ''' bl_idname = 'Voronoi2DNode' - bl_label = 'Voronoi' + bl_label = 'Voronoi 2D' bl_icon = 'OUTLINER_OB_EMPTY' clip = FloatProperty(name='clip', description='Clipping Distance', diff --git a/nodes/number/easing.py b/nodes/number/easing.py index 0a98d6f7e..fdc142b6e 100644 --- a/nodes/number/easing.py +++ b/nodes/number/easing.py @@ -34,7 +34,7 @@ for k in sorted(easing_dict.keys()): class SvEasingNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvEasingNode' - bl_label = 'Easing' + bl_label = 'Easing 0..1' selected_mode = EnumProperty( items=easing_list, diff --git a/nodes/number/exponential.py b/nodes/number/exponential.py index f700e1ab6..7664f24ec 100644 --- a/nodes/number/exponential.py +++ b/nodes/number/exponential.py @@ -52,7 +52,7 @@ def exponential_b(x0, base, nmin, nmax, maxValue): class SvGenExponential(bpy.types.Node, SverchCustomTreeNode): ''' Generate exponential sequence ''' bl_idname = 'SvGenExponential' - bl_label = 'Exponential series' + bl_label = 'Exponential sequence' bl_icon = 'OUTLINER_OB_EMPTY' x0_ = FloatProperty( diff --git a/nodes/number/fibonacci.py b/nodes/number/fibonacci.py index 72e1ab7bd..c2aa1a4c5 100644 --- a/nodes/number/fibonacci.py +++ b/nodes/number/fibonacci.py @@ -42,7 +42,7 @@ def fibonacci(x1, x2, count, maxValue): class SvGenFibonacci(bpy.types.Node, SverchCustomTreeNode): ''' Generator range list of floats''' bl_idname = 'SvGenFibonacci' - bl_label = 'Fibonacci series' + bl_label = 'Fibonacci sequence' bl_icon = 'OUTLINER_OB_EMPTY' x1_ = FloatProperty( diff --git a/nodes/number/float_to_int.py b/nodes/number/float_to_int.py index e6ca822a2..06df54980 100644 --- a/nodes/number/float_to_int.py +++ b/nodes/number/float_to_int.py @@ -24,7 +24,7 @@ from sverchok.node_tree import SverchCustomTreeNode, StringsSocket class Float2IntNode(bpy.types.Node, SverchCustomTreeNode): ''' Float2Int ''' bl_idname = 'Float2IntNode' - bl_label = 'Float2int' + bl_label = 'Float to Int' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/number/formula2.py b/nodes/number/formula2.py index 85bd6dc47..15be8a5ba 100644 --- a/nodes/number/formula2.py +++ b/nodes/number/formula2.py @@ -17,26 +17,31 @@ # ##### END GPL LICENSE BLOCK ##### import parser +from math import ( + acos, acosh, asin, asinh, atan, atan2, + atanh, ceil, copysign, cos, cosh, degrees, e, + erf, erfc, exp, expm1, fabs, factorial, floor, + fmod, frexp, fsum, gamma, hypot, isfinite, isinf, + isnan, ldexp, lgamma, log, log10, log1p, log2, modf, + pi, pow, radians, sin, sinh, sqrt, tan, tanh, trunc +) import bpy from bpy.props import BoolProperty, StringProperty from sverchok.node_tree import SverchCustomTreeNode -from sverchok.data_structure import (sv_Vars, updateNode, multi_socket, changable_sockets, - dataSpoil, dataCorrect, levelsOflist, - SvSetSocketAnyType, SvGetSocketAnyType) -from math import acos, acosh, asin, asinh, atan, atan2, \ - atanh,ceil,copysign,cos,cosh,degrees,e, \ - erf,erfc,exp,expm1,fabs,factorial,floor, \ - fmod,frexp,fsum,gamma,hypot,isfinite,isinf, \ - isnan,ldexp,lgamma,log,log10,log1p,log2,modf, \ - pi,pow,radians,sin,sinh,sqrt,tan,tanh,trunc +from sverchok.data_structure import ( + sv_Vars, updateNode, multi_socket, changable_sockets, + dataSpoil, dataCorrect, levelsOflist, + SvSetSocketAnyType, SvGetSocketAnyType +) + class Formula2Node(bpy.types.Node, SverchCustomTreeNode): ''' Formula2 ''' bl_idname = 'Formula2Node' - bl_label = 'Formula2' + bl_label = 'Formula' bl_icon = 'OUTLINER_OB_EMPTY' formula = StringProperty(name='formula', diff --git a/nodes/number/integer.py b/nodes/number/integer.py index 155cb4526..f53cb63b1 100644 --- a/nodes/number/integer.py +++ b/nodes/number/integer.py @@ -25,7 +25,7 @@ from sverchok.data_structure import updateNode class IntegerNode(bpy.types.Node, SverchCustomTreeNode): ''' Integer ''' bl_idname = 'IntegerNode' - bl_label = 'Integer' + bl_label = 'Int' bl_icon = 'OUTLINER_OB_EMPTY' def update_value(self, context): diff --git a/nodes/number/range_float.py b/nodes/number/range_float.py index c7de2e043..3600076f7 100644 --- a/nodes/number/range_float.py +++ b/nodes/number/range_float.py @@ -62,7 +62,7 @@ def frange_step(start, step, count): class SvGenFloatRange(bpy.types.Node, SverchCustomTreeNode): ''' Generator range list of floats''' bl_idname = 'SvGenFloatRange' - bl_label = 'Float Series' + bl_label = 'Range Float' bl_icon = 'OUTLINER_OB_EMPTY' start_ = FloatProperty( diff --git a/nodes/number/range_int.py b/nodes/number/range_int.py index c72f100ef..1952ffebf 100644 --- a/nodes/number/range_int.py +++ b/nodes/number/range_int.py @@ -58,7 +58,7 @@ def countRange(start=0, step=1, count=10): class GenListRangeInt(bpy.types.Node, SverchCustomTreeNode): ''' Generator range list of ints ''' bl_idname = 'GenListRangeIntNode' - bl_label = 'List Range Int' + bl_label = 'Range Int' bl_icon = 'OUTLINER_OB_EMPTY' start_ = IntProperty( diff --git a/nodes/number/scalar.py b/nodes/number/scalar.py index 66b5a6588..630138b0b 100644 --- a/nodes/number/scalar.py +++ b/nodes/number/scalar.py @@ -32,7 +32,7 @@ from sverchok.utils.sv_itertools import (recurse_fx, recurse_fxy) class ScalarMathNode(bpy.types.Node, SverchCustomTreeNode): ''' ScalarMathNode ''' bl_idname = 'ScalarMathNode' - bl_label = 'function' + bl_label = 'Math' bl_icon = 'OUTLINER_OB_EMPTY' diff --git a/nodes/vector/move.py b/nodes/vector/move.py index 48c9018c3..84334b8fd 100644 --- a/nodes/vector/move.py +++ b/nodes/vector/move.py @@ -26,7 +26,7 @@ from sverchok.data_structure import (updateNode, Vector_generate, class VectorMoveNode(bpy.types.Node, SverchCustomTreeNode): ''' Vector Move vectors ''' bl_idname = 'VectorMoveNode' - bl_label = 'Vectors Move' + bl_label = 'Move' bl_icon = 'MAN_TRANS' mult_ = FloatProperty(name='multiplier', diff --git a/nodes/vector/normal.py b/nodes/vector/normal.py index 5ddde801e..422bb97f0 100644 --- a/nodes/vector/normal.py +++ b/nodes/vector/normal.py @@ -27,7 +27,7 @@ from sverchok.utils.sv_bmesh_utils import bmesh_from_pydata class VectorNormalNode(bpy.types.Node, SverchCustomTreeNode): ''' Find Vector's normals ''' bl_idname = 'VectorNormalNode' - bl_label = 'Vector Normal' + bl_label = 'Vertex Normal' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): -- GitLab From b5f9fe0fba646770ead8e8bc1557fcba2ff68734 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 15:27:31 +0200 Subject: [PATCH 13/15] completes second half of shortname -> bl_label --- nodes/analyzer/colors.py | 2 +- nodes/analyzer/colors2.py | 2 +- nodes/analyzer/edge_angles.py | 2 +- nodes/analyzer/image_components.py | 2 +- nodes/analyzer/mesh_filter.py | 2 +- nodes/analyzer/scene_raycast.py | 2 +- nodes/basic_data/bmesh_in.py | 2 +- nodes/basic_data/bmesh_out.py | 2 +- nodes/basic_data/dupli_instances.py | 2 +- nodes/basic_data/getsetprop.py | 4 ++-- nodes/basic_data/instancer.py | 2 +- nodes/basic_data/node_remote.py | 2 +- nodes/basic_data/obj_remote.py | 2 +- nodes/basic_data/objects.py | 2 +- nodes/basic_data/text.py | 4 ++-- nodes/basic_data/wifi_in.py | 2 +- nodes/basic_data/wifi_out.py | 2 +- nodes/basic_debug/3dview_props.py | 2 +- nodes/basic_debug/frame_info.py | 2 +- nodes/basic_debug/stethoscope.py | 2 +- nodes/basic_view/empty_out.py | 2 +- nodes/basic_view/viewer_bmesh_mk2.py | 2 +- nodes/basic_view/viewer_curves.py | 2 +- nodes/basic_view/viewer_curves_2d.py | 2 +- nodes/basic_view/viewer_indices.py | 2 +- nodes/basic_view/viewer_mk2.py | 2 +- nodes/basic_view/viewer_polyline.py | 2 +- nodes/basic_view/viewer_skin.py | 2 +- nodes/basic_view/viewer_typography.py | 2 +- nodes/generator/bricks.py | 2 +- nodes/generator/formula.py | 2 +- nodes/generator/script_mk2.py | 2 +- nodes/list_basic/converter.py | 2 +- nodes/list_interfere/numpy_array.py | 2 +- nodes/matrix/euler.py | 2 +- nodes/matrix/input.py | 2 +- nodes/matrix/shear.py | 2 +- nodes/modifier_change/offset.py | 2 +- nodes/modifier_change/recalc_normals.py | 2 +- nodes/modifier_change/triangulate.py | 2 +- nodes/modifier_change/triangulate_heavy.py | 2 +- nodes/modifier_make/csg_boolean.py | 2 +- nodes/network/udp_client.py | 2 +- nodes/number/logic.py | 2 +- nodes/vector/axis_input.py | 2 +- nodes/vector/interpolation_mk2.py | 2 +- nodes/vector/interpolation_mk3.py | 2 +- nodes/vector/line_evaluate.py | 2 +- nodes/vector/vector_in.py | 2 +- nodes/vector/vector_out.py | 2 +- nodes/vector/vector_polar_in.py | 2 +- nodes/vector/vector_polar_out.py | 2 +- nodes/vector/vertices_delete_doubles.py | 2 +- 53 files changed, 55 insertions(+), 55 deletions(-) diff --git a/nodes/analyzer/colors.py b/nodes/analyzer/colors.py index 87093a0ed..65adca03a 100644 --- a/nodes/analyzer/colors.py +++ b/nodes/analyzer/colors.py @@ -30,7 +30,7 @@ from sverchok.data_structure import (updateNode, second_as_first_cycle, fullList class SvVertexColorNode(bpy.types.Node, SverchCustomTreeNode): ''' Vertex Colors ''' bl_idname = 'SvVertexColorNode' - bl_label = 'Vertex colors' + bl_label = 'Vertex color' bl_icon = 'OUTLINER_OB_EMPTY' use_foreach = BoolProperty(default=False) diff --git a/nodes/analyzer/colors2.py b/nodes/analyzer/colors2.py index 1f60272dd..e6ca01031 100644 --- a/nodes/analyzer/colors2.py +++ b/nodes/analyzer/colors2.py @@ -30,7 +30,7 @@ from sverchok.data_structure import (updateNode, second_as_first_cycle, fullList class SvVertexColorNodeMK2(bpy.types.Node, SverchCustomTreeNode): ''' Vertex Colors ''' bl_idname = 'SvVertexColorNodeMK2' - bl_label = 'Vertex colors' + bl_label = 'Vertex color new' bl_icon = 'OUTLINER_OB_EMPTY' vertex_color = StringProperty(default='SvCol', update=updateNode) diff --git a/nodes/analyzer/edge_angles.py b/nodes/analyzer/edge_angles.py index bf424b197..6f3e33635 100644 --- a/nodes/analyzer/edge_angles.py +++ b/nodes/analyzer/edge_angles.py @@ -37,7 +37,7 @@ def untangle_edges(orig_edges, bmesh_edges, angles): class SvEdgeAnglesNode(bpy.types.Node, SverchCustomTreeNode): '''Calculate angles between faces at edges''' bl_idname = 'SvEdgeAnglesNode' - bl_label = 'Angles at Edges' + bl_label = 'Angles at the edges' bl_icon = 'OUTLINER_OB_EMPTY' signed = BoolProperty(name="Signed", diff --git a/nodes/analyzer/image_components.py b/nodes/analyzer/image_components.py index 4e4e81c40..3c84fe1b3 100644 --- a/nodes/analyzer/image_components.py +++ b/nodes/analyzer/image_components.py @@ -189,7 +189,7 @@ class SvImageComponentsNode(bpy.types.Node, SverchCustomTreeNode): ''' Image Components''' bl_idname = 'SvImageComponentsNode' - bl_label = 'Image Components' + bl_label = 'Image Decompose' bl_icon = 'GROUP_VCOL' # node storage, reference by the hash of self. diff --git a/nodes/analyzer/mesh_filter.py b/nodes/analyzer/mesh_filter.py index f2fec317a..ad6e5536c 100644 --- a/nodes/analyzer/mesh_filter.py +++ b/nodes/analyzer/mesh_filter.py @@ -202,7 +202,7 @@ class Faces(object): class SvMeshFilterNode(bpy.types.Node, SverchCustomTreeNode): ''' Filter mesh elements: manifold vs boundary etc. ''' bl_idname = 'SvMeshFilterNode' - bl_label = 'Mesh Filter' + bl_label = 'Mesh filter' bl_icon = 'OUTLINER_OB_EMPTY' modes = [ diff --git a/nodes/analyzer/scene_raycast.py b/nodes/analyzer/scene_raycast.py index f946f2a3c..57b47092f 100644 --- a/nodes/analyzer/scene_raycast.py +++ b/nodes/analyzer/scene_raycast.py @@ -24,7 +24,7 @@ from sverchok.data_structure import (updateNode, match_long_repeat) class SvRayCastNode(bpy.types.Node, SverchCustomTreeNode): ''' RayCast Scene ''' bl_idname = 'SvRayCastSceneNode' - bl_label = 'scene_raycast' + bl_label = 'Scene Raycast' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/basic_data/bmesh_in.py b/nodes/basic_data/bmesh_in.py index 712c7702d..4e7ec3110 100644 --- a/nodes/basic_data/bmesh_in.py +++ b/nodes/basic_data/bmesh_in.py @@ -26,7 +26,7 @@ from sverchok.data_structure import (updateNode, match_long_repeat) class SvBMinputNode(bpy.types.Node, SverchCustomTreeNode): ''' BMesh In ''' bl_idname = 'SvBMinputNode' - bl_label = 'BMesh List Wrap' + bl_label = 'BMesh in' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/basic_data/bmesh_out.py b/nodes/basic_data/bmesh_out.py index 549c51e4a..7b385c9df 100644 --- a/nodes/basic_data/bmesh_out.py +++ b/nodes/basic_data/bmesh_out.py @@ -26,7 +26,7 @@ from sverchok.data_structure import (updateNode) class SvBMoutputNode(bpy.types.Node, SverchCustomTreeNode): ''' BMesh Out ''' bl_idname = 'SvBMoutputNode' - bl_label = 'Bmesh Out' + bl_label = 'BMesh out' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/basic_data/dupli_instances.py b/nodes/basic_data/dupli_instances.py index 0875847dd..578924ea3 100644 --- a/nodes/basic_data/dupli_instances.py +++ b/nodes/basic_data/dupli_instances.py @@ -38,7 +38,7 @@ def wipe_object(ob): class SvDupliInstancesMK3(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvDupliInstancesMK3' - bl_label = 'Dupli Instances MK3' + bl_label = 'Dupli instancer' bl_icon = 'OUTLINER_OB_EMPTY' def set_child_quota(self, context): diff --git a/nodes/basic_data/getsetprop.py b/nodes/basic_data/getsetprop.py index 6ef8928b2..8d36ebbf3 100644 --- a/nodes/basic_data/getsetprop.py +++ b/nodes/basic_data/getsetprop.py @@ -146,7 +146,7 @@ types = { class SvGetPropNode(bpy.types.Node, SverchCustomTreeNode): ''' Get property ''' bl_idname = 'SvGetPropNode' - bl_label = 'Get' + bl_label = 'Get property' bl_icon = 'FORCE_VORTEX' bad_prop = BoolProperty(default=False) @@ -187,7 +187,7 @@ class SvGetPropNode(bpy.types.Node, SverchCustomTreeNode): class SvSetPropNode(bpy.types.Node, SverchCustomTreeNode): ''' Set property ''' bl_idname = 'SvSetPropNode' - bl_label = 'Set' + bl_label = 'Set property' bl_icon = 'FORCE_VORTEX' diff --git a/nodes/basic_data/instancer.py b/nodes/basic_data/instancer.py index 805637bf3..3577dc31b 100644 --- a/nodes/basic_data/instancer.py +++ b/nodes/basic_data/instancer.py @@ -87,7 +87,7 @@ class SvInstancerOp(bpy.types.Operator): class SvInstancerNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvInstancerNode' - bl_label = 'Sv Instancer Node' + bl_label = 'Mesh instancer' bl_icon = 'OUTLINER_OB_EMPTY' def obj_available(self, context): diff --git a/nodes/basic_data/node_remote.py b/nodes/basic_data/node_remote.py index 5c89aeb7a..8ae172def 100644 --- a/nodes/basic_data/node_remote.py +++ b/nodes/basic_data/node_remote.py @@ -53,7 +53,7 @@ class SvNodePickup(bpy.types.Operator): class SvNodeRemoteNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvNodeRemoteNode' - bl_label = 'Sv Node Remote' + bl_label = 'Node Remote (Control)' bl_icon = 'OUTLINER_OB_EMPTY' activate = BoolProperty( diff --git a/nodes/basic_data/obj_remote.py b/nodes/basic_data/obj_remote.py index 2df65f1ed..d2867ddee 100644 --- a/nodes/basic_data/obj_remote.py +++ b/nodes/basic_data/obj_remote.py @@ -31,7 +31,7 @@ from sverchok.data_structure import dataCorrect, updateNode, SvGetSocketAnyType class SvObjRemoteNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvObjRemoteNode' - bl_label = 'Sv Obj Remote' + bl_label = 'Object Remote (Control)' bl_icon = 'OUTLINER_OB_EMPTY' activate = BoolProperty( diff --git a/nodes/basic_data/objects.py b/nodes/basic_data/objects.py index 776551099..0aaaf2b97 100644 --- a/nodes/basic_data/objects.py +++ b/nodes/basic_data/objects.py @@ -112,7 +112,7 @@ class SvObjSelected(bpy.types.Operator): class ObjectsNode(bpy.types.Node, SverchCustomTreeNode): ''' Objects Input slot ''' bl_idname = 'ObjectsNode' - bl_label = 'Objects_in' + bl_label = 'Objects in' bl_icon = 'OUTLINER_OB_EMPTY' def hide_show_versgroups(self, context): diff --git a/nodes/basic_data/text.py b/nodes/basic_data/text.py index 1a84275df..88b2b6498 100644 --- a/nodes/basic_data/text.py +++ b/nodes/basic_data/text.py @@ -103,7 +103,7 @@ class SvTextInOp(bpy.types.Operator): class SvTextInNode(bpy.types.Node, SverchCustomTreeNode): ''' Text Input ''' bl_idname = 'SvTextInNode' - bl_label = 'Text Input' + bl_label = 'Text in' bl_icon = 'OUTLINER_OB_EMPTY' csv_data = {} @@ -539,7 +539,7 @@ class SvTextInNode(bpy.types.Node, SverchCustomTreeNode): class SvTextOutNode(bpy.types.Node, SverchCustomTreeNode): ''' Text Output Node ''' bl_idname = 'SvTextOutNode' - bl_label = 'Text Output' + bl_label = 'Text out' bl_icon = 'OUTLINER_OB_EMPTY' def avail_texts(self, context): diff --git a/nodes/basic_data/wifi_in.py b/nodes/basic_data/wifi_in.py index c8f0b1a45..dde397f51 100644 --- a/nodes/basic_data/wifi_in.py +++ b/nodes/basic_data/wifi_in.py @@ -35,7 +35,7 @@ def name_seq(): class WifiInNode(bpy.types.Node, SverchCustomTreeNode): ''' Wifi Input ''' bl_idname = 'WifiInNode' - bl_label = 'Wifi input' + bl_label = 'Wifi in' bl_icon = 'OUTLINER_OB_EMPTY' def change_var_name(self, context): diff --git a/nodes/basic_data/wifi_out.py b/nodes/basic_data/wifi_out.py index 42f6ef348..1ecf21fd9 100644 --- a/nodes/basic_data/wifi_out.py +++ b/nodes/basic_data/wifi_out.py @@ -29,7 +29,7 @@ from sverchok.data_structure import updateNode, SvSetSocketAnyType, SvGetSocketA class WifiOutNode(bpy.types.Node, SverchCustomTreeNode): ''' WifiOutNode ''' bl_idname = 'WifiOutNode' - bl_label = 'Wifi output' + bl_label = 'Wifi out' bl_icon = 'OUTLINER_OB_EMPTY' var_name = StringProperty(name='var_name', diff --git a/nodes/basic_debug/3dview_props.py b/nodes/basic_debug/3dview_props.py index dcd2b5b44..6b9d66b4f 100644 --- a/nodes/basic_debug/3dview_props.py +++ b/nodes/basic_debug/3dview_props.py @@ -25,7 +25,7 @@ class Sv3DviewPropsNode(bpy.types.Node, SverchCustomTreeNode): ''' Sv 3Dview Props Node ''' bl_idname = 'Sv3DviewPropsNode' - bl_label = 'Sv 3Dview Props Node' + bl_label = '3dview Props' bl_icon = 'OUTLINER_OB_EMPTY' def draw_buttons(self, context, layout): diff --git a/nodes/basic_debug/frame_info.py b/nodes/basic_debug/frame_info.py index ae3d00891..6a4d02eda 100644 --- a/nodes/basic_debug/frame_info.py +++ b/nodes/basic_debug/frame_info.py @@ -25,7 +25,7 @@ from sverchok.data_structure import SvSetSocketAnyType class SvFrameInfoNode(bpy.types.Node, SverchCustomTreeNode): ''' Frame Info ''' bl_idname = 'SvFrameInfoNode' - bl_label = 'Frame Info' + bl_label = 'Frame info' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/basic_debug/stethoscope.py b/nodes/basic_debug/stethoscope.py index 1baea8a49..2fca80394 100644 --- a/nodes/basic_debug/stethoscope.py +++ b/nodes/basic_debug/stethoscope.py @@ -38,7 +38,7 @@ def high_contrast_color(c): class SvStethoscopeNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvStethoscopeNode' - bl_label = 'Sv Stethoscope Node' + bl_label = 'Stethoscope' bl_icon = 'OUTLINER_OB_EMPTY' # node id diff --git a/nodes/basic_view/empty_out.py b/nodes/basic_view/empty_out.py index c0492fa18..9570d967c 100644 --- a/nodes/basic_view/empty_out.py +++ b/nodes/basic_view/empty_out.py @@ -27,7 +27,7 @@ from sverchok.data_structure import SvGetSocketAnyType, node_id, Matrix_generate class SvEmptyOutNode(bpy.types.Node, SverchCustomTreeNode): '''Create a blender empty object''' bl_idname = 'SvEmptyOutNode' - bl_label = 'Set Empty' + bl_label = 'Empty out' bl_icon = 'OUTLINER_DATA_EMPTY' def rename_empty(self, context): diff --git a/nodes/basic_view/viewer_bmesh_mk2.py b/nodes/basic_view/viewer_bmesh_mk2.py index 2d0db7bc7..035df8b3f 100644 --- a/nodes/basic_view/viewer_bmesh_mk2.py +++ b/nodes/basic_view/viewer_bmesh_mk2.py @@ -192,7 +192,7 @@ class SvBmeshViewOp2(bpy.types.Operator): class SvBmeshViewerNodeMK2(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvBmeshViewerNodeMK2' - bl_label = 'Bmesh Viewer Draw 2' + bl_label = 'Viewer BMeshMK2' bl_icon = 'OUTLINER_OB_EMPTY' # hints found at ba.org/forum/showthread.php?290106 diff --git a/nodes/basic_view/viewer_curves.py b/nodes/basic_view/viewer_curves.py index f3dfae0ab..b3b56370f 100644 --- a/nodes/basic_view/viewer_curves.py +++ b/nodes/basic_view/viewer_curves.py @@ -248,7 +248,7 @@ class SvCurveViewOp(bpy.types.Operator): class SvCurveViewerNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvCurveViewerNode' - bl_label = 'SvCurve Viewer Draw' + bl_label = 'Curve Viewer' bl_icon = 'MOD_CURVE' activate = BoolProperty( diff --git a/nodes/basic_view/viewer_curves_2d.py b/nodes/basic_view/viewer_curves_2d.py index 06fe5aaf8..9fcc906a1 100644 --- a/nodes/basic_view/viewer_curves_2d.py +++ b/nodes/basic_view/viewer_curves_2d.py @@ -260,7 +260,7 @@ class SvCurveViewOp2D(bpy.types.Operator): class SvCurveViewerNode2D(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvCurveViewerNodeAlt' - bl_label = 'Curve Draw 2D' + bl_label = 'Curve Viewer 2D' bl_icon = 'MOD_CURVE' activate = BoolProperty( diff --git a/nodes/basic_view/viewer_indices.py b/nodes/basic_view/viewer_indices.py index 04d9ef1de..fe02e1ff6 100644 --- a/nodes/basic_view/viewer_indices.py +++ b/nodes/basic_view/viewer_indices.py @@ -163,7 +163,7 @@ class IndexViewerNode(bpy.types.Node, SverchCustomTreeNode): ''' IDX ViewerNode ''' bl_idname = 'IndexViewerNode' - bl_label = 'Index Viewer Draw' + bl_label = 'Viewer Index' bl_icon = 'OUTLINER_OB_EMPTY' # node id diff --git a/nodes/basic_view/viewer_mk2.py b/nodes/basic_view/viewer_mk2.py index db77836bb..564d4cd4a 100644 --- a/nodes/basic_view/viewer_mk2.py +++ b/nodes/basic_view/viewer_mk2.py @@ -154,7 +154,7 @@ class SvObjBakeMK2(bpy.types.Operator): class ViewerNode2(bpy.types.Node, SverchCustomTreeNode): ''' ViewerNode2 ''' bl_idname = 'ViewerNode2' - bl_label = 'Viewer Draw2' + bl_label = 'Viewer Draw' bl_icon = 'RETOPO' n_id = StringProperty(default='') diff --git a/nodes/basic_view/viewer_polyline.py b/nodes/basic_view/viewer_polyline.py index e916cab07..c63b29636 100644 --- a/nodes/basic_view/viewer_polyline.py +++ b/nodes/basic_view/viewer_polyline.py @@ -153,7 +153,7 @@ class SvPolylineViewOp(bpy.types.Operator): class SvPolylineViewerNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvPolylineViewerNode' - bl_label = 'SvPolyline Viewer Draw' + bl_label = 'Polyline Viewer' bl_icon = 'MOD_CURVE' activate = BoolProperty( diff --git a/nodes/basic_view/viewer_skin.py b/nodes/basic_view/viewer_skin.py index ce0a77d6f..93c63a965 100644 --- a/nodes/basic_view/viewer_skin.py +++ b/nodes/basic_view/viewer_skin.py @@ -147,7 +147,7 @@ class SvSkinmodViewOp(bpy.types.Operator): class SkinViewerNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SkinViewerNode' - bl_label = 'Skin Viewer Draw' + bl_label = 'Skin Mesher' bl_icon = 'OUTLINER_OB_EMPTY' activate = BoolProperty( diff --git a/nodes/basic_view/viewer_typography.py b/nodes/basic_view/viewer_typography.py index 303575d98..6247f8361 100644 --- a/nodes/basic_view/viewer_typography.py +++ b/nodes/basic_view/viewer_typography.py @@ -162,7 +162,7 @@ class SvTypeViewOp2(bpy.types.Operator): class SvTypeViewerNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvTypeViewerNode' - bl_label = 'Type Draw' + bl_label = 'Typography Viewer' bl_icon = 'OUTLINER_OB_EMPTY' # hints found at ba.org/forum/showthread.php?290106 diff --git a/nodes/generator/bricks.py b/nodes/generator/bricks.py index fdced9bf0..850d3b242 100644 --- a/nodes/generator/bricks.py +++ b/nodes/generator/bricks.py @@ -87,7 +87,7 @@ def select_v(line, v1, v2): class SvBricksNode(bpy.types.Node, SverchCustomTreeNode): ''' Bricks ''' bl_idname = 'SvBricksNode' - bl_label = 'Bricks' + bl_label = 'Bricks grid' bl_icon = 'OUTLINER_OB_EMPTY' du_ = FloatProperty(name='Unit width', description='One brick width', diff --git a/nodes/generator/formula.py b/nodes/generator/formula.py index 7a8c563df..3d9af08dc 100644 --- a/nodes/generator/formula.py +++ b/nodes/generator/formula.py @@ -48,7 +48,7 @@ sv_no_ed = [[[12, 11], [5, 1], [11, 3], [5, 4], [6, 1], [7, 2], class SvFormulaShapeNode(bpy.types.Node, SverchCustomTreeNode): ''' Formula shape ''' bl_idname = 'SvFormulaShapeNode' - bl_label = 'Formula Shape' + bl_label = 'Formula shape' bl_icon = 'IPO' # vertex numers diff --git a/nodes/generator/script_mk2.py b/nodes/generator/script_mk2.py index 99aac7e3f..2a44f434d 100644 --- a/nodes/generator/script_mk2.py +++ b/nodes/generator/script_mk2.py @@ -111,7 +111,7 @@ defaults = [0 for i in range(32)] class SvScriptNodeMK2(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'SvScriptNodeMK2' - bl_label = 'Script Node 2' + bl_label = 'Script 2' bl_icon = 'SCRIPTPLUGINS' def avail_templates(self, context): diff --git a/nodes/list_basic/converter.py b/nodes/list_basic/converter.py index bf55ea575..9b407212c 100644 --- a/nodes/list_basic/converter.py +++ b/nodes/list_basic/converter.py @@ -25,7 +25,7 @@ from sverchok.data_structure import SvGetSocketAnyType, SvSetSocketAnyType class ConverterNode(bpy.types.Node, SverchCustomTreeNode): ''' Converter node temporery solution ''' bl_idname = 'ConverterNode' - bl_label = 'Converter' + bl_label = 'Socket Converter' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/list_interfere/numpy_array.py b/nodes/list_interfere/numpy_array.py index 0abbd8bef..5f94837bf 100644 --- a/nodes/list_interfere/numpy_array.py +++ b/nodes/list_interfere/numpy_array.py @@ -31,7 +31,7 @@ def Obm(m): class SvNumpyArrayNode(bpy.types.Node, SverchCustomTreeNode): ''' Numpy Props ''' bl_idname = 'SvNumpyArrayNode' - bl_label = 'numpy_props' + bl_label = 'Numpy Array' bl_icon = 'OUTLINER_OB_EMPTY' Modes = ['tolist','conj','flatten','reshape','repeat','resize', diff --git a/nodes/matrix/euler.py b/nodes/matrix/euler.py index be80cd87f..fc570b4c1 100644 --- a/nodes/matrix/euler.py +++ b/nodes/matrix/euler.py @@ -31,7 +31,7 @@ from sverchok.data_structure import (updateNode, Matrix_listing, match_long_repe class SvMatrixEulerNode(bpy.types.Node, SverchCustomTreeNode): ''' Construct a Matirx from Euler ''' bl_idname = 'SvMatrixEulerNode' - bl_label = 'Euler Matrix' + bl_label = 'Matrix Euler' bl_icon = 'OUTLINER_OB_EMPTY' diff --git a/nodes/matrix/input.py b/nodes/matrix/input.py index 030de9d77..34a5b2293 100644 --- a/nodes/matrix/input.py +++ b/nodes/matrix/input.py @@ -26,7 +26,7 @@ from sverchok.data_structure import updateNode, Matrix_listing, SvSetSocketAnyTy class SvMatrixValueIn(bpy.types.Node, SverchCustomTreeNode): ''' MatrixValueIn ''' bl_idname = 'SvMatrixValueIn' - bl_label = 'Matrix value input' + bl_label = 'Matrix Input' bl_icon = 'OUTLINER_OB_EMPTY' id_matrix = (1.0, 0.0, 0.0, 0.0, diff --git a/nodes/matrix/shear.py b/nodes/matrix/shear.py index 6e8cbae55..170d22d06 100644 --- a/nodes/matrix/shear.py +++ b/nodes/matrix/shear.py @@ -28,7 +28,7 @@ from sverchok.data_structure import (updateNode, fullList, Matrix_listing, class MatrixShearNode(bpy.types.Node, SverchCustomTreeNode): ''' Construct a Shear Matirx ''' bl_idname = 'MatrixShearNode' - bl_label = 'Shear Matrix' + bl_label = 'Matrix Shear' bl_icon = 'OUTLINER_OB_EMPTY' # select Shear plane diff --git a/nodes/modifier_change/offset.py b/nodes/modifier_change/offset.py index 08ebd4411..e5570434c 100644 --- a/nodes/modifier_change/offset.py +++ b/nodes/modifier_change/offset.py @@ -35,7 +35,7 @@ from math import tan, sin, cos, degrees, radians class SvOffsetNode(bpy.types.Node, SverchCustomTreeNode): ''' Doing offset of polygons ''' bl_idname = 'SvOffsetNode' - bl_label = 'Offset Node' + bl_label = 'Offset' bl_icon = 'OUTLINER_OB_EMPTY' offset = FloatProperty( diff --git a/nodes/modifier_change/recalc_normals.py b/nodes/modifier_change/recalc_normals.py index c5faddc4d..fe5c00c92 100644 --- a/nodes/modifier_change/recalc_normals.py +++ b/nodes/modifier_change/recalc_normals.py @@ -28,7 +28,7 @@ from sverchok.utils.sv_bmesh_utils import bmesh_from_pydata, pydata_from_bmesh class SvRecalcNormalsNode(bpy.types.Node, SverchCustomTreeNode): ''' Recalc face normals ''' bl_idname = 'SvRecalcNormalsNode' - bl_label = 'Recalc Normals' + bl_label = 'Recalc normals' bl_icon = 'OUTLINER_OB_EMPTY' invert = BoolProperty(name="Inside", diff --git a/nodes/modifier_change/triangulate.py b/nodes/modifier_change/triangulate.py index 5457b1095..c34b953b9 100644 --- a/nodes/modifier_change/triangulate.py +++ b/nodes/modifier_change/triangulate.py @@ -28,7 +28,7 @@ from sverchok.utils.sv_bmesh_utils import bmesh_from_pydata, pydata_from_bmesh class SvTriangulateNode(bpy.types.Node, SverchCustomTreeNode): ''' Triangulate mesh ''' bl_idname = 'SvTriangulateNode' - bl_label = 'Triangulate' + bl_label = 'Triangulate mesh' bl_icon = 'OUTLINER_OB_EMPTY' quad_modes = [ diff --git a/nodes/modifier_change/triangulate_heavy.py b/nodes/modifier_change/triangulate_heavy.py index af286833f..9a8fc9713 100644 --- a/nodes/modifier_change/triangulate_heavy.py +++ b/nodes/modifier_change/triangulate_heavy.py @@ -36,7 +36,7 @@ out the bug in the original node. class SvHeavyTriangulateNode(bpy.types.Node, SverchCustomTreeNode): ''' Triangulate mesh (Heavy)''' bl_idname = 'SvHeavyTriangulateNode' - bl_label = 'Heavy Triangulate' + bl_label = 'Triangulate mesh (heavy)' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/modifier_make/csg_boolean.py b/nodes/modifier_make/csg_boolean.py index b2854510b..551823fe6 100644 --- a/nodes/modifier_make/csg_boolean.py +++ b/nodes/modifier_make/csg_boolean.py @@ -69,7 +69,7 @@ def Boolean(VA, PA, VB, PB, operation): class SvCSGBooleanNode(bpy.types.Node, SverchCustomTreeNode): '''CSG Boolean Node''' bl_idname = 'SvCSGBooleanNode' - bl_label = 'CSG BooleanNode' + bl_label = 'CSG Boolean' bl_icon = 'OUTLINER_OB_EMPTY' mode_options = [ diff --git a/nodes/network/udp_client.py b/nodes/network/udp_client.py index feea08652..ffa409fa9 100644 --- a/nodes/network/udp_client.py +++ b/nodes/network/udp_client.py @@ -26,7 +26,7 @@ from sverchok.node_tree import SverchCustomTreeNode, StringsSocket class UdpClientNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'UdpClientNode' - bl_label = 'UdpClient' + bl_label = 'UDP Clien' def send(self, context): sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) diff --git a/nodes/number/logic.py b/nodes/number/logic.py index 3b28d0c89..75edb02e3 100644 --- a/nodes/number/logic.py +++ b/nodes/number/logic.py @@ -31,7 +31,7 @@ from sverchok.utils.sv_itertools import (recurse_fx, recurse_fxy) class SvLogicNode(bpy.types.Node, SverchCustomTreeNode): ''' LogicNode ''' bl_idname = 'SvLogicNode' - bl_label = 'function' + bl_label = 'Logic functions' bl_icon = 'OUTLINER_OB_EMPTY' diff --git a/nodes/vector/axis_input.py b/nodes/vector/axis_input.py index 271457d84..16cfa2c7c 100644 --- a/nodes/vector/axis_input.py +++ b/nodes/vector/axis_input.py @@ -36,7 +36,7 @@ class svAxisInputNode(bpy.types.Node, SverchCustomTreeNode): ''' bl_idname = 'svAxisInputNode' - bl_label = 'Z axis' + bl_label = 'Vector X | Y | Z' # shall default to Z Axis in svint. bl_icon = 'MANIPUL' def mode_change(self, context): diff --git a/nodes/vector/interpolation_mk2.py b/nodes/vector/interpolation_mk2.py index f561fe8ca..982c85d77 100644 --- a/nodes/vector/interpolation_mk2.py +++ b/nodes/vector/interpolation_mk2.py @@ -99,7 +99,7 @@ def eval_spline(splines, tknots, t_in): class SvInterpolationNodeMK2(bpy.types.Node, SverchCustomTreeNode): '''Vector Interpolate''' bl_idname = 'SvInterpolationNodeMK2' - bl_label = 'Vector Interpolation' + bl_label = 'Vector Interpolation mk2' bl_icon = 'OUTLINER_OB_EMPTY' diff --git a/nodes/vector/interpolation_mk3.py b/nodes/vector/interpolation_mk3.py index 5f255912a..44e21ab17 100644 --- a/nodes/vector/interpolation_mk3.py +++ b/nodes/vector/interpolation_mk3.py @@ -141,7 +141,7 @@ def eval_linear_spline(pts, tknots, t_in): class SvInterpolationNodeMK3(bpy.types.Node, SverchCustomTreeNode): '''Vector Interpolate''' bl_idname = 'SvInterpolationNodeMK3' - bl_label = 'Vector Interpolation 3' + bl_label = 'Vector Interpolation mk3' bl_icon = 'OUTLINER_OB_EMPTY' t_in = FloatProperty(name="t", diff --git a/nodes/vector/line_evaluate.py b/nodes/vector/line_evaluate.py index 578fa805c..baf39dd69 100644 --- a/nodes/vector/line_evaluate.py +++ b/nodes/vector/line_evaluate.py @@ -28,7 +28,7 @@ from sverchok.data_structure import (fullList, updateNode, class EvaluateLine(bpy.types.Node, SverchCustomTreeNode): ''' EvaluateLine ''' bl_idname = 'EvaluateLineNode' - bl_label = 'EvaluateLine' + bl_label = 'Vector Evaluate' bl_icon = 'OUTLINER_OB_EMPTY' factor_ = FloatProperty(name='factor', description='Step length', diff --git a/nodes/vector/vector_in.py b/nodes/vector/vector_in.py index f5d2937ea..466d107eb 100644 --- a/nodes/vector/vector_in.py +++ b/nodes/vector/vector_in.py @@ -25,7 +25,7 @@ from sverchok.utils.sv_itertools import sv_zip_longest class GenVectorsNode(bpy.types.Node, SverchCustomTreeNode): ''' Generator vectors ''' bl_idname = 'GenVectorsNode' - bl_label = 'Vectors in' + bl_label = 'Vector in' bl_icon = 'OUTLINER_OB_EMPTY' diff --git a/nodes/vector/vector_out.py b/nodes/vector/vector_out.py index b6dab9c5e..548b70635 100644 --- a/nodes/vector/vector_out.py +++ b/nodes/vector/vector_out.py @@ -25,7 +25,7 @@ from sverchok.data_structure import dataCorrect, SvSetSocketAnyType, SvGetSocket class VectorsOutNode(bpy.types.Node, SverchCustomTreeNode): ''' Vectors out ''' bl_idname = 'VectorsOutNode' - bl_label = 'Vectors out' + bl_label = 'Vector out' bl_icon = 'OUTLINER_OB_EMPTY' def sv_init(self, context): diff --git a/nodes/vector/vector_polar_in.py b/nodes/vector/vector_polar_in.py index 61dc08eb0..cc1c59c1c 100644 --- a/nodes/vector/vector_polar_in.py +++ b/nodes/vector/vector_polar_in.py @@ -41,7 +41,7 @@ def spherical(rho, phi, theta, mode): class VectorPolarInNode(bpy.types.Node, SverchCustomTreeNode): '''Generate vectors by spherical or cylindrical coordinates''' bl_idname = 'VectorPolarInNode' - bl_label = 'Vectors polar in' + bl_label = 'Vector polar input' bl_icon = 'OUTLINER_OB_EMPTY' diff --git a/nodes/vector/vector_polar_out.py b/nodes/vector/vector_polar_out.py index f21f68908..04830c3fb 100644 --- a/nodes/vector/vector_polar_out.py +++ b/nodes/vector/vector_polar_out.py @@ -45,7 +45,7 @@ def spherical(v, mode): class VectorPolarOutNode(bpy.types.Node, SverchCustomTreeNode): '''Get cylindrical or spherical coordinates from vectors''' bl_idname = 'VectorPolarOutNode' - bl_label = 'Vectors polar out' + bl_label = 'Vector polar output' bl_icon = 'OUTLINER_OB_EMPTY' coord_modes = [ diff --git a/nodes/vector/vertices_delete_doubles.py b/nodes/vector/vertices_delete_doubles.py index 731ebc9ba..05f4d6db4 100644 --- a/nodes/vector/vertices_delete_doubles.py +++ b/nodes/vector/vertices_delete_doubles.py @@ -25,7 +25,7 @@ from sverchok.data_structure import levelsOflist, SvSetSocketAnyType, SvGetSocke class VertsDelDoublesNode(bpy.types.Node, SverchCustomTreeNode): ''' Delete doubles vertices ''' bl_idname = 'VertsDelDoublesNode' - bl_label = 'Delete Double vertices' + bl_label = 'Vector X Doubles' bl_icon = 'OUTLINER_OB_EMPTY' def draw_buttons(self, context, layout): -- GitLab From e5d44f3251d7d9c6a623e47763a334721b107397 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 15:30:39 +0200 Subject: [PATCH 14/15] fix small label typo --- nodes/network/udp_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/network/udp_client.py b/nodes/network/udp_client.py index ffa409fa9..195957fe2 100644 --- a/nodes/network/udp_client.py +++ b/nodes/network/udp_client.py @@ -26,7 +26,7 @@ from sverchok.node_tree import SverchCustomTreeNode, StringsSocket class UdpClientNode(bpy.types.Node, SverchCustomTreeNode): bl_idname = 'UdpClientNode' - bl_label = 'UDP Clien' + bl_label = 'UDP Client' def send(self, context): sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) -- GitLab From 89ff7e37af2d9dcf79d83826043e4ac09759cb9a Mon Sep 17 00:00:00 2001 From: zeffii Date: Sun, 18 Sep 2016 16:14:20 +0200 Subject: [PATCH 15/15] bump version 0.5.6.4 --- __init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index e4a998d7d..a3909bebd 100755 --- a/__init__.py +++ b/__init__.py @@ -45,7 +45,7 @@ bl_info = { "AgustinJB, Zeffii, Kosvor, " "Portnov, Elfnor" ), - "version": (0, 5, 6, 3), + "version": (0, 5, 6, 4), "blender": (2, 7, 2), "location": "Nodes > CustomNodesTree > Add user nodes", "description": "Parametric node-based geometry programming", -- GitLab