<Bug>[Use Cases]: <Fix X,Y positions>

[OglActor and OglUseCase, require base class because I am vehemently DRY]

[#21]

Author: Humberto Sanchez II

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="untanglepyut",
-    version="0.3.5",
+    version="0.3.6",
     author_email='[email protected]',
     description='XML to Ogl Object Model',
     long_description=README,

untanglepyut/BaseUnTangle.py

@@ -0,0 +1,30 @@
+
+from logging import Logger
+from logging import getLogger
+
+from miniogl.ShapeModel import ShapeModel
+from ogl.OglObject import OglObject
+
+from untanglepyut.Common import GraphicInformation
+
+
+class BaseUnTangle:
+
+    def __init__(self):
+        self.baseLogger: Logger = getLogger(__name__)
+
+    def _updateModel(self, oglObject: OglObject, graphicInformation: GraphicInformation) -> ShapeModel:
+        """
+        This is necessary if it is never added to a diagram
+        and immediately serialized
+
+        Args:
+            oglObject:      OglObject with a model
+            graphicInformation:   The graphic class graphic information
+
+        Returns:  The updated shape model as a way of documenting that we updated it
+        """
+        model: ShapeModel = oglObject.GetModel()
+        model.SetPosition(x=graphicInformation.x, y=graphicInformation.y)
+
+        return model

untanglepyut/UnTangleUseCaseDiagram.py

@@ -2,13 +2,13 @@
 from logging import Logger
 from logging import getLogger
 
-from ogl.OglUseCase import OglUseCase
-from pyutmodel.PyutUseCase import PyutUseCase
 from untangle import Element
 
 from pyutmodel.PyutActor import PyutActor
+from pyutmodel.PyutUseCase import PyutUseCase
 
 from ogl.OglActor import OglActor
+from ogl.OglUseCase import OglUseCase
 
 from untanglepyut.Common import GraphicInformation
 from untanglepyut.Common import toGraphicInfo
@@ -17,10 +17,12 @@
 
 from untanglepyut.Types import UntangledOglActors
 from untanglepyut.Types import UntangledOglUseCases
+
+from untanglepyut.BaseUnTangle import BaseUnTangle
 from untanglepyut.UnTanglePyut import UnTanglePyut
 
 
-class UnTangleUseCaseDiagram:
+class UnTangleUseCaseDiagram(BaseUnTangle):
     """
         <PyutDocument type="USECASE_DIAGRAM" title="Use-Cases" scrollPositionX="0" scrollPositionY="0" pixelsPerUnitX="20" pixelsPerUnitY="20">
             <GraphicActor width="87" height="114" x="293" y="236">
@@ -39,6 +41,8 @@ class UnTangleUseCaseDiagram:
     """
 
     def __init__(self):
+
+        super().__init__()
         self.logger: Logger = getLogger(__name__)
 
         self._untangledOglActors:   UntangledOglActors   = createUntangledOglActors()
@@ -72,6 +76,8 @@ def _unTangleOglActors(self, pyutDocument: Element) -> UntangledOglActors:
             oglActor:    OglActor           = OglActor(w=graphicInfo.width, h=graphicInfo.height)
             oglActor.SetPosition(x=graphicInfo.x, y=graphicInfo.y)
 
+            self._updateModel(oglObject=oglActor, graphicInformation=graphicInfo)
+
             pyutActor: PyutActor = self._untanglePyut.actorToPyutActor(graphicActor=graphicActor)
 
             oglActor.pyutObject = pyutActor
@@ -90,6 +96,9 @@ def _unTangleOglUseCases(self, pyutDocument: Element) -> UntangledOglUseCases:
             oglUseCase:  OglUseCase         = OglUseCase(w=graphicInfo.width, h=graphicInfo.height)
 
             oglUseCase.SetPosition(x=graphicInfo.x, y=graphicInfo.y)
+
+            self._updateModel(oglObject=oglUseCase, graphicInformation=graphicInfo)
+
             pyutUseCase: PyutUseCase = self._untanglePyut.useCaseToPyutUseCase(graphicUseCase=graphicUseCase)
 
             oglUseCase.pyutObject = pyutUseCase

untanglepyut/UnTangler.py

@@ -11,9 +11,7 @@
 from untangle import parse
 from untangle import Element
 
-from miniogl.ShapeModel import ShapeModel
 
-from ogl.OglObject import OglObject
 from ogl.OglClass import OglClass
 from ogl.OglNote import OglNote
 from ogl.OglText import OglText
@@ -22,6 +20,8 @@
 from pyutmodel.PyutNote import PyutNote
 from pyutmodel.PyutText import PyutText
 
+from untanglepyut.BaseUnTangle import BaseUnTangle
+
 from untanglepyut.Common import toGraphicInfo
 from untanglepyut.Common import GraphicInformation
 from untanglepyut.Common import UntangledOglLinks
@@ -106,15 +106,15 @@ class Document:
 Documents     = NewType('Documents', dict[DocumentTitle, Document])
 
 
-class UnTangler:
+class UnTangler(BaseUnTangle):
 
     def __init__(self, fqFileName: str):
         """
 
         Args:
             fqFileName:  Fully qualified file name
         """
-
+        super().__init__()
         self.logger: Logger = getLogger(__name__)
 
         self._fqFileName:  str = fqFileName
@@ -309,19 +309,3 @@ def _buildDictionary(self, document: Document) -> LinkableOglObjects:
             linkableOglObjects[oglActor.pyutObject.id] = oglActor
 
         return linkableOglObjects
-
-    def _updateModel(self, oglObject: OglObject, graphicInformation: GraphicInformation) -> ShapeModel:
-        """
-        This is necessary if it is never added to a diagram
-        and immediately serialized
-
-        Args:
-            oglObject:      OglObject with a model
-            graphicInformation:   The graphic class graphic information
-
-        Returns:  The updated shape model as a way of documenting that we updated it
-        """
-        model: ShapeModel = oglObject.GetModel()
-        model.SetPosition(x=graphicInformation.x, y=graphicInformation.y)
-
-        return model