Index: TECH/Svg/Services/CoordinatesService.cls.xml
===================================================================
diff -u -r3702 -r3728
--- TECH/Svg/Services/CoordinatesService.cls.xml (.../CoordinatesService.cls.xml) (revision 3702)
+++ TECH/Svg/Services/CoordinatesService.cls.xml (.../CoordinatesService.cls.xml) (revision 3728)
@@ -10,15 +10,19 @@
Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
Set CoordinatesList = ##class(%ListOfObjects).%New()
Set PuntenIterator = ##class(TECH.ArrayOneDimIterator).%New(.Punten)
+
If (..IsLijstEvenEnIngevuld(PuntenIterator))
{
While (PuntenIterator.HasNext()) {
#dim EerstePuntVanCoordinaat As %Integer = PuntenIterator.Next()
#dim TweedePuntVanCoordinaat As %Integer = PuntenIterator.Next()
#dim CoordinaatVanTweePunten As TECH.Svg.Basis.Path.Coordinates = BasisElementFactory.MaakCoordinaat(EerstePuntVanCoordinaat,TweedePuntVanCoordinaat)
+
Do CoordinatesList.Insert(CoordinaatVanTweePunten)
}
+
Quit CoordinatesList
+
} Else {
Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("het aantal punten is niet even of niet ingevuld"))
}
@@ -32,9 +36,11 @@
Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
Set CoordinatesList = ##class(%ListOfObjects).%New()
Set CoordinatesIterator = ##class(TECH.ArrayOneDimIterator).%New(.Coordinates)
+
While (CoordinatesIterator.HasNext()) {
Do CoordinatesList.Insert(CoordinatesIterator.Next())
}
+
Quit CoordinatesList
]]>
@@ -45,13 +51,15 @@
%Boolean
@@ -24,6 +25,7 @@
Set Circle.MiddelpuntX = MiddelpuntX
Set Circle.MiddelpuntY = MiddelpuntY
Set Circle.Straal = Straal
+
Quit Circle
]]>
@@ -37,6 +39,7 @@
Set Line.Y1 = Y1
Set Line.X2 = X2
Set Line.Y2 = Y2
+
Quit Line
]]>
@@ -52,6 +55,7 @@
Else {
Do Path.VoegToeInhoudAfgeslotenD(CoordinatesList)
}
+
Quit Path
]]>
@@ -64,6 +68,7 @@
Set Text.X = X
Set Text.Y = Y
Set Text.Content = Content
+
Quit Text
]]>
@@ -77,6 +82,7 @@
Set SvgBox.Y = Y
Set SvgBox.Height = Height
Set SvgBox.Width = Width
+
Quit SvgBox
]]>
@@ -85,6 +91,7 @@
TECH.Svg.Basis.Group
@@ -96,6 +103,7 @@
Set Coordinaat = ##class(TECH.Svg.Basis.Path.Coordinates).%New()
Set Coordinaat.X = X
Set Coordinaat.Y = Y
+
Quit Coordinaat
]]>
Index: TECH/Svg/Basis/Path.cls.xml
===================================================================
diff -u -r3668 -r3728
--- TECH/Svg/Basis/Path.cls.xml (.../Path.cls.xml) (revision 3668)
+++ TECH/Svg/Basis/Path.cls.xml (.../Path.cls.xml) (revision 3728)
@@ -33,11 +33,13 @@
CoordinatesList:%ListOfObjects(ELEMENT="TECH.Svg.Basis.Path.Coordinates")