<Bug>[OglSDInstance]: <Incorrect height set>

[
* Also fix update deprecated calls
* Update version for release
]

[#29]

Author: Humberto Sanchez II

setup.py

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

tests/untanglepyut/TestUnTangleSequenceDiagram.py

@@ -1,4 +1,5 @@
 from typing import List
+from typing import Tuple
 from typing import cast
 
 from logging import Logger
@@ -13,6 +14,8 @@
 from pyutmodel.PyutSDInstance import PyutSDInstance
 from pyutmodel.PyutSDMessage import PyutSDMessage
 
+from ogl.sd.OglSDInstance import OglSDInstance
+
 from untanglepyut.Types import OglSDInstances
 from untanglepyut.Types import OglSDMessages
 
@@ -80,6 +83,18 @@ def testSequenceMessagePyutSDMessageIsCorrect(self):
             self.assertIsNotNone(pyutSrcInstance, 'Missing source sd instance')
             self.assertIsNotNone(pyutDstInstance, 'Missing source sd instance')
 
+    def testSDInstanceLifeLineIsCorrect(self):
+        """
+        Verifies https://github.com/hasii2011/untanglepyut/issues/29
+        """
+        document: Document = self._retrieveSequenceDiagramDocument()
+
+        sdInstances: OglSDInstances = document.oglSDInstances
+        for sdInstance in sdInstances.values():
+            oglSDInstance: OglSDInstance = cast(OglSDInstance, sdInstance)
+            size: Tuple[int, int] = oglSDInstance.GetSize()
+            self.assertEqual(OglSDInstance.DEFAULT_HEIGHT, size[1], 'Lifeline height is incorrect')
+
     def _retrieveSequenceDiagramDocument(self) -> Document:
 
         fqFileName: str       = resource_filename(TestBase.RESOURCES_PACKAGE_NAME, 'SequenceDiagram.xml')

untanglepyut/UntangleSequenceDiagram.py

@@ -75,7 +75,7 @@ def _untangleSDInstances(self, pyutDocument: Element) -> OglSDInstances:
             oglSDInstance:  OglSDInstance      = OglSDInstance(pyutSDInstance)
             graphicInfo:    GraphicInformation = toGraphicInfo(graphicElement=graphicSDInstance)
 
-            oglSDInstance.SetSize(width=graphicInfo.width, height=graphicInfo.width)
+            oglSDInstance.SetSize(width=graphicInfo.width, height=graphicInfo.height)
             oglSDInstance.SetPosition(x=graphicInfo.x, y=graphicInfo.y)
 
             self._updateModel(oglObject=oglSDInstance, graphicInformation=graphicInfo)
@@ -96,8 +96,8 @@ def _untangleSDMessages(self, pyutDocument: Element) -> OglSDMessages:
             srcInstance: OglSDInstance = self._oglSDInstances[bogus.sourceId]
             dstInstance: OglSDInstance = self._oglSDInstances[bogus.destinationId]
 
-            pyutSDMessage.setSource(srcInstance.getPyutObject())          # Ugh, time was set by sdMessageToPyutSDMessage
-            pyutSDMessage.setDestination(dstInstance.getPyutObject())     # This "split" functionality must be fixed
+            pyutSDMessage.setSource(srcInstance.pyutObject)          # Ugh, time was set by sdMessageToPyutSDMessage
+            pyutSDMessage.setDestination(dstInstance.pyutObject)     # This "split" functionality must be fixed
             oglSDMessage: OglSDMessage = OglSDMessage(srcShape=srcInstance, pyutSDMessage=pyutSDMessage, dstShape=dstInstance)
 
             srcInstance.addLink(link=oglSDMessage)