Completed move to drawio implementation.

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 
-Notable changes to this project:
+Notable changes:
+
+## 2.0.0
+
+### Features
+
+- Completed move to drawio implementation.
 
 ## 1.0.30
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ibmdiagrams"
-version = "1.0.30"
+version = "2.0.0"
 description = "Generate architecture diagrams following IBM Diagram Standard"
 readme = "README.md"
 requires-python = ">=3.11.0"

src/epnode.py

@@ -0,0 +1,12 @@
+from ibmdiagrams.ibmcloud.diagram import Diagram
+from ibmdiagrams.ibmcloud.groups import IBMCloud, Region, VPC, Zone, Subnet, CloudServices, ResourceGroup, SecurityGroup, ExpandedVirtualServer
+from ibmdiagrams.ibmcloud.compute import VirtualServer
+from ibmdiagrams.ibmcloud.actors import User
+from ibmdiagrams.ibmcloud.network import EndpointGateway, TransitGateway
+from ibmdiagrams.ibmcloud.security import KeyProtect, VPNGateway
+from ibmdiagrams.ibmcloud.storage import ObjectStorage
+
+with Diagram("zone"):
+  with Zone("Zone 1", "10.243.0.0/24", direction="TB"):
+    vsi1 = ExpandedVirtualServer("VSI - Server", "10.243.0.5") 
+    #user = User("Jay", "10.243.0.5")

src/ibmdiagrams.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ibmdiagrams
-Version: 1.0.30
+Version: 2.0.0
 Summary: Generate architecture diagrams following IBM Diagram Standard
 Author-email: Jay Warfield <[email protected]>
 Maintainer-email: Jay Warfield <[email protected]>

src/ibmdiagrams.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 pyproject.toml
+src/epnode.py
 src/ibmdiagrams/__init__.py
 src/ibmdiagrams.egg-info/PKG-INFO
 src/ibmdiagrams.egg-info/SOURCES.txt

src/ibmdiagrams.egg-info/top_level.txt

@@ -1 +1,2 @@
+epnode
 ibmdiagrams

src/ibmdiagrams/__init__.py

@@ -114,21 +114,21 @@ def __init__(self,
                 filename = "",
                 output = "",
                 #input = "",
-                direction = "LR",
-                icontype = "STATIC"):
+                #icontype = "STATIC",
+                direction = "LR"):
       self.common = Common()
       self.common.setInputPython()
       self.diagramid = randomid()
       self.name = name
 
-      if icontype.upper()  == "BUILTIN":
-         self.common.setBuiltinIcons()
-      elif icontype.upper() == "CATALOG":
-         self.common.setCatalogIcons()
-      elif icontype.upper() == "STATIC":
-         self.common.setStaticIcons()
-      else:
-         self.common.setStaticIcons()
+      #if icontype.upper()  == "BUILTIN":
+      #   self.common.setBuiltinIcons()
+      #elif icontype.upper() == "CATALOG":
+      #   self.common.setCatalogIcons()
+      #elif icontype.upper() == "STATIC":
+      #   self.common.setStaticIcons()
+      #else:
+      #   self.common.setStaticIcons()
 
       if direction.upper() == "LR":
          self.common.setDirectionLR()
@@ -140,7 +140,8 @@ def __init__(self,
       if getDiagrams() != None:
          filename = "*"
 
-      self.properties = _data.getDiagramProperties(name=name, filename=filename, output=output, direction=direction, icontype=icontype)
+      #self.properties = _data.getDiagramProperties(name=name, filename=filename, output=output, direction=direction, icontype=icontype)
+      self.properties = _data.getDiagramProperties(name=name, filename=filename, output=output, direction=direction)
       #_diagrams[self.diagramid] = self.properties
       _data.addDiagram(self.diagramid, self.properties)
       _data.updateSequence(self.diagramid)

src/ibmdiagrams/ibmbase/elements.py

@@ -29,13 +29,19 @@ def addDiagram(self, data):
       ET.SubElement(self.root, "mxCell", data['cell1'])
 
    def addNode(self, data):
-      userObject = ET.SubElement(self.root, "UserObject", data['header'] | data['props'])
-      mxCell = ET.SubElement(userObject, "mxCell", data['cell'])
+      mxCell = ET.SubElement(self.root, "mxCell", data['cell'])
       mxGeometry = ET.SubElement(mxCell, "mxGeometry", data['geo'])
+      if data['point'] != {}:
+         mxPoint = ET.SubElement(mxGeometry, "mxPoint", data['point'])
+      #userObject = ET.SubElement(self.root, "UserObject", data['header'] | data['props'])
+      #mxCell = ET.SubElement(userObject, "mxCell", data['cell'])
+      #mxGeometry = ET.SubElement(mxCell, "mxGeometry", data['geo'])
 
    def addValue(self, data):
       mxCell = ET.SubElement(self.root, "mxCell", data['cell'])
       mxGeometry = ET.SubElement(mxCell, "mxGeometry", data['geo'])
+      if data['point'] != {}:
+         mxPoint = ET.SubElement(mxGeometry, "mxPoint", data['point'])
 
    def addLink(self, data):
       userObject = ET.SubElement(self.root, "UserObject", data['header'])

src/ibmdiagrams/ibmbase/options.py

@@ -89,8 +89,9 @@ def __init__(self):
       self.region = Regions.ALL
       self.alternate = Alternates.WHITE
       self.provider = Providers.IBM
+      self.iconType = IconTypes.DRAWIO
       #self.iconType = IconTypes.BUILTIN
-      self.iconType = IconTypes.STATIC
+      #self.iconType = IconTypes.STATIC
       #self.iconType = IconTypes.CATALOG
       self.labelType = LabelTypes.CUSTOM
       self.direction = Directions.LR

src/ibmdiagrams/ibmbase/shapes.py

@@ -32,7 +32,7 @@ def buildShape(self, id, properties, x, y, width, height, meta, general):
       return node
 
    def buildDrawioShape(self, id, properties, x, y, width, height, meta, general):
-      node = self.types.buildDrawioShape(id, properties, x, y, width, height, meta,general)
+      node = self.types.buildDrawioShape(id, properties, x, y, width, height, meta, general)
       return node
 
    def buildLink(self, id, label, source, target, startarrow, endarrow, startfill, endfill, linetype, linewidth, linecolor, fontname, fontsize, meta):