diff options
author | Marko Gronroos <magi@vaadin.com> | 2016-07-21 15:31:21 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2016-08-05 10:19:44 +0300 |
commit | bc87c6c1cb0790a78dd607259a2b901f6c879254 (patch) | |
tree | dc88f3e6f9492d0bb252c4643badd4bca0d0fd07 | |
parent | 44a94bb28605bec406f415ef66fc332c265f7c9a (diff) | |
download | vaadin-framework-bc87c6c1cb0790a78dd607259a2b901f6c879254.tar.gz vaadin-framework-bc87c6c1cb0790a78dd607259a2b901f6c879254.zip |
Updated StreamResource example and screenshot, as well as various diagrams. #19897
Uses slider example png/svg from the vaadin8 branch
Change-Id: I8a52ca754262a32487d6c8330d0382635d9fedca
16 files changed, 1063 insertions, 1034 deletions
diff --git a/documentation/application/application-environment.asciidoc b/documentation/application/application-environment.asciidoc index f5933afe85..3df4bcb48e 100644 --- a/documentation/application/application-environment.asciidoc +++ b/documentation/application/application-environment.asciidoc @@ -167,7 +167,8 @@ such as Servlet 3.0, you should use: id="WebApp_ID" version="**3.0**" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="**http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd**"> + xsi:schemaLocation="**http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd**"> ---- Servlet 3.0 support is useful for at least server push. diff --git a/documentation/application/application-lifecycle.asciidoc b/documentation/application/application-lifecycle.asciidoc index 269f3d75b5..219002b414 100644 --- a/documentation/application/application-lifecycle.asciidoc +++ b/documentation/application/application-lifecycle.asciidoc @@ -427,7 +427,7 @@ public class MyUI extends UI { setContent(new Button("Logout", event -> {// Java 8 // Redirect this page immediately getPage().setLocation("/myapp/logout.html"); - + // Close the session getSession().close(); })); @@ -442,27 +442,20 @@ See the http://demo.vaadin.com/book-examples-vaadin7/book#application.lifecycle. This is not enough. When a session is closed from one UI, any other UIs attached to it are left hanging. When the client-side engine notices that a UI and the session are gone on the server-side, it displays a "Session Expired" message -and, by default, reloads the UI when the message is clicked. ((("session", -"expiration"))) +and, by default, reloads the UI when the message is clicked. +((("session", "expiration"))) ((("redirection"))) -((("system -messages"))) -You can customize the message and the redirect URL in the system messages +((("system messages"))) +You can customize the message and the redirect URL in the system messages. ifdef::web[] -, as described in -<<dummy/../../../framework/application/application-errors#application.errors.systemmessages,"Customizing -System -Messages">> +It is described in <<dummy/../../../framework/application/application-errors#application.errors.systemmessages,"Customizing System Messages">>. endif::web[] -. ((("heartbeat"))) -((("UI", -"heartbeat"))) +((("UI", "heartbeat"))) ((("push"))) -((("server -push"))) +((("server push"))) The client-side engine notices the expiration when user interaction causes a server request to be made or when the keep-alive heartbeat occurs. To make the UIs detect the situation faster, you need to make the heart beat faster, as was @@ -471,7 +464,6 @@ immediately, as is done in the following example. Access to the UIs must be synchronized as described in <<dummy/../../../framework/advanced/advanced-push#advanced.push,"Server Push">>. - [source, java] ---- @Push @@ -496,7 +488,3 @@ In the above example, we assume that all UIs in the session have push enabled and that they should be redirected; popups you might want to close instead of redirecting. It is not necessary to call [methodname]#close()# for them individually, as we close the entire session afterwards. - - - - diff --git a/documentation/application/application-resources.asciidoc b/documentation/application/application-resources.asciidoc index ee1a8a7eb9..339d3eb340 100644 --- a/documentation/application/application-resources.asciidoc +++ b/documentation/application/application-resources.asciidoc @@ -46,7 +46,7 @@ The resource classes in Vaadin are grouped under two interfaces: a generic [[figure.resource.classdiagram]] .Resource Interface and Class Diagram -image::img/resource_classdiagram-hi.png[width=70%, scaledwidth=90%] +image::img/resource_classdiagram-hi.png[width=80%, scaledwidth=100%] [[application.resources.file]] == File Resources @@ -162,41 +162,46 @@ the [classname]#StreamResource.StreamSource# interface and its The following example demonstrates the creation of a simple image in PNG image format. - [source, java] ---- import java.awt.image.*; -public class MyImageSource - implements StreamResource.StreamSource { +public class MyImageSource implements StreamSource { ByteArrayOutputStream imagebuffer = null; int reloads = 0; - /* We need to implement this method that returns - * the resource as a stream. */ + // This method generates the stream contents public InputStream getStream () { - /* Create an image and draw something on it. */ - BufferedImage image = new BufferedImage (200, 200, - BufferedImage.TYPE_INT_RGB); - Graphics drawable = image.getGraphics(); - drawable.setColor(Color.lightGray); - drawable.fillRect(0,0,200,200); - drawable.setColor(Color.yellow); - drawable.fillOval(25,25,150,150); - drawable.setColor(Color.blue); - drawable.drawRect(0,0,199,199); - drawable.setColor(Color.black); - drawable.drawString("Reloads="+reloads, 75, 100); + // Create an image + BufferedImage image = new BufferedImage (400, 400, + BufferedImage.TYPE_INT_RGB); + Graphics2D drawable = image.createGraphics(); + + // Draw something static + drawable.setStroke(new BasicStroke(5)); + drawable.setColor(Color.WHITE); + drawable.fillRect(0, 0, 400, 400); + drawable.setColor(Color.BLACK); + drawable.drawOval(50, 50, 300, 300); + + // Draw something dynamic + drawable.setFont(new Font("Montserrat", + Font.PLAIN, 48)); + drawable.drawString("Reloads=" + reloads, 75, 216); reloads++; + drawable.setColor(new Color(0, 165, 235)); + int x= (int) (200-10 + 150*Math.sin(reloads * 0.3)); + int y= (int) (200-10 + 150*Math.cos(reloads * 0.3)); + drawable.fillOval(x, y, 20, 20); try { - /* Write the image to a buffer. */ + // Write the image to a buffer imagebuffer = new ByteArrayOutputStream(); ImageIO.write(image, "png", imagebuffer); - /* Return a stream from the buffer. */ + // Return a stream from the buffer return new ByteArrayInputStream( - imagebuffer.toByteArray()); + imagebuffer.toByteArray()); } catch (IOException e) { return null; } @@ -215,11 +220,11 @@ Below we display the image with the [classname]#Image# component. [source, java] ---- // Create an instance of our stream source. -StreamResource.StreamSource imagesource = new MyImageSource (); +StreamSource imagesource = new MyImageSource(); -// Create a resource that uses the stream source and give it a name. -// The constructor will automatically register the resource in -// the application. +// Create a resource that uses the stream source and give it +// a name. The constructor will automatically register the +// resource in the application. StreamResource resource = new StreamResource(imagesource, "myimage.png"); @@ -231,8 +236,8 @@ layout.addComponent(new Image("Image title", resource)); The resulting image is shown in <<figure.application.resource.stream>>. [[figure.application.resource.stream]] -.A Stream Resource -image::img/application_streamresource.png[] +.A stream resource +image::img/application_streamresource.png[width=25%, scaledwidth=35%] Another way to create dynamic content is a request handler, described in <<dummy/../../../framework/advanced/advanced-requesthandler#advanced.requesthandler,"Request diff --git a/documentation/application/img/application_streamresource.png b/documentation/application/img/application_streamresource.png Binary files differindex e79932f667..f22968171d 100644 --- a/documentation/application/img/application_streamresource.png +++ b/documentation/application/img/application_streamresource.png diff --git a/documentation/application/img/resource_classdiagram-hi.png b/documentation/application/img/resource_classdiagram-hi.png Binary files differindex 09057e2c90..dfcc174c52 100644 --- a/documentation/application/img/resource_classdiagram-hi.png +++ b/documentation/application/img/resource_classdiagram-hi.png diff --git a/documentation/application/img/view-navigation-hi.png b/documentation/application/img/view-navigation-hi.png Binary files differindex 2b41a6be23..6eb08477d0 100644 --- a/documentation/application/img/view-navigation-hi.png +++ b/documentation/application/img/view-navigation-hi.png diff --git a/documentation/application/original-drawings/Makefile b/documentation/application/original-drawings/Makefile index 11fa5aa8fd..b19e7881fd 100644 --- a/documentation/application/original-drawings/Makefile +++ b/documentation/application/original-drawings/Makefile @@ -1,5 +1,6 @@ SVG = -RASTERIMAGES = application-architecture view-navigation ui-schematic +RASTERIMAGES = application-architecture view-navigation ui-schematic \ + resource_classdiagram RASTERSRCIMAGES := $(foreach file, $(RASTERIMAGES), $(file).svg) RASTERIMAGES_HI := $(foreach file, $(RASTERIMAGES), ../img/$(file)-hi.png) diff --git a/documentation/application/original-drawings/resource_classdiagram.svg b/documentation/application/original-drawings/resource_classdiagram.svg index c279bd6140..c255b98c99 100644 --- a/documentation/application/original-drawings/resource_classdiagram.svg +++ b/documentation/application/original-drawings/resource_classdiagram.svg @@ -1,799 +1,868 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="210mm"
- height="297mm"
- id="svg1901"
- sodipodi:version="0.32"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="resource_classdiagram.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true"
- version="1.1">
- <defs
- id="defs1903">
- <marker
- id="marker44971"
- orient="auto"
- markerHeight="5.7450781"
- markerWidth="4.6297355">
- <g
- id="g18059"
- transform="matrix(0.5,0,0,0.5,-185.64299,-257.19655)">
- <path
- sodipodi:nodetypes="csccccccsccssssssssssssssccc"
- id="path18061"
- d="M 370,508.65625 C 369.13933,508.715 368.39056,509.27755 368.09375,510.09375 C 367.82399,510.83551 368.03605,511.62868 368.53125,512.21875 L 366.78125,512.21875 C 366.73884,512.21408 366.69882,512.22093 366.65625,512.21875 L 366.65625,516.59375 L 366.78125,516.59375 L 368.53125,516.59375 C 367.85229,517.45345 367.83424,518.70924 368.625,519.5 C 369.47591,520.35091 370.89909,520.35091 371.75,519.5 L 375.09375,516.125 C 375.12672,516.09552 375.15802,516.06422 375.1875,516.03125 C 375.21972,516.01191 375.25101,515.99105 375.28125,515.96875 C 375.28162,515.96839 375.49976,515.68796 375.5,515.6875 C 375.50005,515.68741 375.49338,515.64282 375.5,515.625 C 375.5011,515.62203 375.53002,515.62832 375.53125,515.625 C 375.57039,515.57293 375.58228,515.57321 375.625,515.5 C 375.76199,515.26524 375.79184,515.12809 375.78125,515.15625 C 375.81807,515.06473 375.79977,515.04374 375.8125,515 C 375.82311,514.98978 375.83353,514.97936 375.84375,514.96875 C 375.90379,514.74477 375.93181,514.45186 375.90625,514.1875 C 375.89266,513.98387 375.84739,513.88985 375.84375,513.875 C 375.84389,513.86458 375.84389,513.85417 375.84375,513.84375 C 375.86975,513.94071 375.85901,513.85978 375.75,513.59375 C 375.69753,513.46336 375.66014,513.37439 375.625,513.3125 C 375.57262,513.22275 375.49154,513.05015 375.28125,512.84375 L 371.75,509.3125 C 371.29355,508.82579 370.66491,508.60087 370,508.65625 z"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccscccsssssssscccsccc"
- id="path18063"
- d="M 366.65625,515.40625 L 371.28125,515.40625 L 369.46875,517.21875 C 369.0718,517.6157 369.0718,518.2593 369.46875,518.65625 C 369.8657,519.0532 370.5093,519.0532 370.90625,518.65625 L 374.34375,515.1875 L 374.4375,515.125 C 374.44343,515.11918 374.43171,515.09972 374.4375,515.09375 C 374.49291,515.03659 374.5526,514.97676 374.59375,514.90625 C 374.62239,514.85717 374.63663,514.80216 374.65625,514.75 C 374.66861,514.71928 374.67831,514.68783 374.6875,514.65625 C 374.71862,514.54015 374.73024,514.43132 374.71875,514.3125 C 374.71489,514.25466 374.70138,514.21285 374.6875,514.15625 C 374.6766,514.1156 374.67237,514.07059 374.65625,514.03125 C 374.63982,513.99042 374.61578,513.94505 374.59375,513.90625 C 374.5483,513.82838 374.50015,513.74899 374.4375,513.6875 L 370.90625,510.15625 C 370.69734,509.93349 370.39809,509.8184 370.09375,509.84375 C 369.69897,509.8707 369.35398,510.12813 369.21875,510.5 C 369.08351,510.87187 369.18349,511.28826 369.46875,511.5625 L 371.34375,513.40625 L 366.65625,513.40625"
- style="fill:#d9d9cd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </marker>
- <marker
- id="marker18095"
- orient="auto"
- markerHeight="5.7450776"
- markerWidth="4.6297302">
- <g
- id="g11064"
- transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)">
- <path
- sodipodi:nodetypes="csccccccsccssssssssssssssccc"
- id="path11050"
- d="M 370,508.65625 C 369.13933,508.715 368.39056,509.27755 368.09375,510.09375 C 367.82399,510.83551 368.03605,511.62868 368.53125,512.21875 L 366.78125,512.21875 C 366.73884,512.21408 366.69882,512.22093 366.65625,512.21875 L 366.65625,516.59375 L 366.78125,516.59375 L 368.53125,516.59375 C 367.85229,517.45345 367.83424,518.70924 368.625,519.5 C 369.47591,520.35091 370.89909,520.35091 371.75,519.5 L 375.09375,516.125 C 375.12672,516.09552 375.15802,516.06422 375.1875,516.03125 C 375.21972,516.01191 375.25101,515.99105 375.28125,515.96875 C 375.28162,515.96839 375.49976,515.68796 375.5,515.6875 C 375.50005,515.68741 375.49338,515.64282 375.5,515.625 C 375.5011,515.62203 375.53002,515.62832 375.53125,515.625 C 375.57039,515.57293 375.58228,515.57321 375.625,515.5 C 375.76199,515.26524 375.79184,515.12809 375.78125,515.15625 C 375.81807,515.06473 375.79977,515.04374 375.8125,515 C 375.82311,514.98978 375.83353,514.97936 375.84375,514.96875 C 375.90379,514.74477 375.93181,514.45186 375.90625,514.1875 C 375.89266,513.98387 375.84739,513.88985 375.84375,513.875 C 375.84389,513.86458 375.84389,513.85417 375.84375,513.84375 C 375.86975,513.94071 375.85901,513.85978 375.75,513.59375 C 375.69753,513.46336 375.66014,513.37439 375.625,513.3125 C 375.57262,513.22275 375.49154,513.05015 375.28125,512.84375 L 371.75,509.3125 C 371.29355,508.82579 370.66491,508.60087 370,508.65625 z"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccscccsssssssscccsccc"
- id="path11035"
- d="M 366.65625,515.40625 L 371.28125,515.40625 L 369.46875,517.21875 C 369.0718,517.6157 369.0718,518.2593 369.46875,518.65625 C 369.8657,519.0532 370.5093,519.0532 370.90625,518.65625 L 374.34375,515.1875 L 374.4375,515.125 C 374.44343,515.11918 374.43171,515.09972 374.4375,515.09375 C 374.49291,515.03659 374.5526,514.97676 374.59375,514.90625 C 374.62239,514.85717 374.63663,514.80216 374.65625,514.75 C 374.66861,514.71928 374.67831,514.68783 374.6875,514.65625 C 374.71862,514.54015 374.73024,514.43132 374.71875,514.3125 C 374.71489,514.25466 374.70138,514.21285 374.6875,514.15625 C 374.6766,514.1156 374.67237,514.07059 374.65625,514.03125 C 374.63982,513.99042 374.61578,513.94505 374.59375,513.90625 C 374.5483,513.82838 374.50015,513.74899 374.4375,513.6875 L 370.90625,510.15625 C 370.69734,509.93349 370.39809,509.8184 370.09375,509.84375 C 369.69897,509.8707 369.35398,510.12813 369.21875,510.5 C 369.08351,510.87187 369.18349,511.28826 369.46875,511.5625 L 371.34375,513.40625 L 366.65625,513.40625"
- style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
- </marker>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective7604" />
- <linearGradient
- id="linearGradient11516">
- <stop
- id="stop11518"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:1" />
- <stop
- id="stop11520"
- offset="1"
- style="stop-color:#a090e7;stop-opacity:1" />
- </linearGradient>
- <linearGradient
- id="linearGradient11508">
- <stop
- id="stop11510"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:1;" />
- <stop
- id="stop11512"
- offset="1"
- style="stop-color:#e27979;stop-opacity:1" />
- </linearGradient>
- <marker
- inkscape:stockid="DiamondL"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="DiamondL"
- style="overflow:visible">
- <path
- id="path4404"
- d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
- transform="scale(0.8)" />
- </marker>
- <marker
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="DiamondEmpty"
- style="overflow:visible">
- <path
- id="path7"
- d="M 0,-5 L -5,0 L 0,5 L 5,0 L 0,-5 z "
- style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1.0pt;marker-start:none"
- transform="scale(1.0) translate(-5,0)" />
- </marker>
- <linearGradient
- id="linearGradient3286">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3288" />
- <stop
- style="stop-color:#79e291;stop-opacity:1;"
- offset="1"
- id="stop3290" />
- </linearGradient>
- <marker
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="EmptyArrow"
- style="overflow:visible;">
- <path
- id="path9"
- d="M 0.0,0.0 L 0.0,-5.0 L -12.5,0.0 L 0.0,5.0 L 0.0,0.0 z M -0.5,0.0 L -0.5,-4.5 L -12.0,0.0 L -0.5,4.5 L -0.5,0.0 z"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
- transform="scale(1.0) rotate(180) translate(10,0)" />
- </marker>
- <marker
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="EmptyArrow2"
- style="overflow:visible;">
- <path
- id="path13"
- d="M 0.0,0.0 L 0.0,-5.0 L -10.0,0.0 L 0.0,5.0 L 0.0,0.0 z"
- style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
- transform="scale(1.0) rotate(180) translate(10,0)" />
- </marker>
- <linearGradient
- id="linearGradient19816">
- <stop
- id="stop19818"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:1;" />
- <stop
- id="stop19820"
- offset="1"
- style="stop-color:#e7e790;stop-opacity:1;" />
- </linearGradient>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow2Lend"
- style="overflow:visible;">
- <path
- id="path16811"
- style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
- d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
- transform="scale(1.1) rotate(180) translate(1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow1Lend"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow1Lend"
- style="overflow:visible;">
- <path
- id="path16829"
- d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
- transform="scale(0.8) rotate(180) translate(12.5,0)" />
- </marker>
- <marker
- inkscape:stockid="TriangleOutM"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="TriangleOutM"
- style="overflow:visible">
- <path
- id="path16731"
- d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
- transform="scale(0.4)" />
- </marker>
- <marker
- inkscape:stockid="TriangleInL"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="TriangleInL"
- style="overflow:visible">
- <path
- id="path16743"
- d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
- transform="scale(-0.8)" />
- </marker>
- <marker
- inkscape:stockid="TriangleOutL"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="TriangleOutL"
- style="overflow:visible">
- <path
- id="path16734"
- d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
- transform="scale(0.8)" />
- </marker>
- <linearGradient
- id="linearGradient9263">
- <stop
- style="stop-color:#000000;stop-opacity:0"
- offset="0"
- id="stop9265" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop9267" />
- </linearGradient>
- <linearGradient
- id="linearGradient7299">
- <stop
- style="stop-color:#ffffff;stop-opacity:1"
- offset="0"
- id="stop7301" />
- <stop
- style="stop-color:#a090e7;stop-opacity:1"
- offset="1"
- id="stop7303" />
- </linearGradient>
- <linearGradient
- id="linearGradient5349">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop5351" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop5353" />
- </linearGradient>
- <linearGradient
- id="linearGradient4152">
- <stop
- style="stop-color:#6b6bff;stop-opacity:1;"
- offset="0"
- id="stop4154" />
- <stop
- style="stop-color:#6b6bff;stop-opacity:0;"
- offset="1"
- id="stop4156" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5349"
- id="linearGradient5355"
- x1="96.085953"
- y1="148.38934"
- x2="389.01985"
- y2="148.38934"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient19816"
- id="radialGradient11602"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.3208501,2.3843471e-3,-3.1056446e-3,0.596383,334.93437,78.721097)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient19816"
- id="radialGradient3268"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9214039,2.3896193e-3,-2.166448e-3,0.5977017,541.12253,30.198804)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7299"
- id="radialGradient3270"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.3208501,2.3843471e-3,-3.1056446e-3,0.596383,334.93437,78.721097)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient19816"
- id="radialGradient3272"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.6000725,2.3808346e-3,-3.7621654e-3,0.5955044,664.61868,-4.8275956)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7299"
- id="radialGradient3274"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.3208501,2.3843471e-3,-3.1056446e-3,0.596383,334.93437,78.721097)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7299"
- id="radialGradient3276"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.3208501,2.3843471e-3,-3.1056446e-3,0.596383,334.93437,78.721097)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7299"
- id="radialGradient3278"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.3208501,2.3843471e-3,-3.1056446e-3,0.596383,334.93437,78.721097)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7299"
- id="radialGradient3280"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.3208501,2.3843471e-3,-3.1056446e-3,0.596383,334.93437,78.721097)"
- cx="-147.5"
- cy="97.300964"
- fx="-147.5"
- fy="97.300964"
- r="109.42857" />
- <marker
- id="marker18095-4"
- orient="auto"
- markerHeight="5.7450776"
- markerWidth="4.6297302">
- <g
- id="g11064-6"
- transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)">
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csccccccsccssssssssssssssccc"
- id="path11050-2"
- d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccscccsssssssscccsccc"
- id="path11035-1"
- d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0"
- style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- </g>
- </marker>
- <marker
- id="marker44971-5"
- orient="auto"
- markerHeight="5.7450781"
- markerWidth="4.6297355">
- <g
- id="g18059-0"
- transform="matrix(0.5,0,0,0.5,-185.64299,-257.19655)">
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csccccccsccssssssssssssssccc"
- id="path18061-4"
- d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccscccsssssssscccsccc"
- id="path18063-9"
- d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0"
- style="fill:#d9d9cd;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- </g>
- </marker>
- <marker
- id="marker18095-0"
- orient="auto"
- markerHeight="5.7450776"
- markerWidth="4.6297302">
- <g
- id="g11064-0"
- transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)">
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csccccccsccssssssssssssssccc"
- id="path11050-0"
- d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccscccsssssssscccsccc"
- id="path11035-16"
- d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0"
- style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- </g>
- </marker>
- <marker
- id="marker18095-6"
- orient="auto"
- markerHeight="5.7450776"
- markerWidth="4.6297302">
- <g
- id="g11064-7"
- transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)">
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csccccccsccssssssssssssssccc"
- id="path11050-20"
- d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccscccsssssssscccsccc"
- id="path11035-4"
- d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0"
- style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- </g>
- </marker>
- <marker
- id="marker18095-2"
- orient="auto"
- markerHeight="5.7450776"
- markerWidth="4.6297302">
- <g
- id="g11064-2"
- transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)">
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csccccccsccssssssssssssssccc"
- id="path11050-23"
- d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <path
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccscccsssssssscccsccc"
- id="path11035-9"
- d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0"
- style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- </g>
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.8159691"
- inkscape:cx="336.32892"
- inkscape:cy="885.30635"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- gridtolerance="10000"
- inkscape:window-width="1458"
- inkscape:window-height="1019"
- inkscape:window-x="194"
- inkscape:window-y="0"
- showgrid="true"
- showguides="true"
- inkscape:connector-spacing="10"
- inkscape:guide-bbox="true"
- inkscape:window-maximized="0">
- <sodipodi:guide
- orientation="horizontal"
- position="940.71429"
- id="guide22848" />
- <inkscape:grid
- type="xygrid"
- id="grid6196"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true"
- spacingx="5px"
- spacingy="5px" />
- </sodipodi:namedview>
- <metadata
- id="metadata1906">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Taso 1"
- inkscape:groupmode="layer"
- id="layer1"
- style="opacity:1">
- <g
- style="display:inline"
- id="g2547"
- transform="matrix(1.4062095,0,0,1.4062095,-221.12715,-215.60428)">
- <flowRoot
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- id="flowRoot2551"
- transform="translate(-5.2378947,106.19782)"><flowRegion
- id="flowRegion2553"><use
- transform="translate(1.467046,-91.03536)"
- x="0"
- y="0"
- xlink:href="#rect4654"
- id="use2555"
- width="744.09448"
- height="1052.3622" /></flowRegion><flowPara
- id="flowPara2557">Sizeable</flowPara></flowRoot> <g
- id="g6863"
- transform="translate(-46.062995,-30.433073)">
- <flowRoot
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- id="flowRoot6866"
- transform="translate(-5.2378947,106.19782)"><flowRegion
- id="flowRegion6868"><use
- transform="translate(1.467046,-91.03536)"
- x="0"
- y="0"
- xlink:href="#rect4654"
- id="use6870"
- width="744.09448"
- height="1052.3622" /></flowRegion><flowPara
- id="flowPara6872">Sizeable</flowPara></flowRoot> </g>
- <flowRoot
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- id="flowRoot2539"
- transform="translate(75.734798,-715.9695)"><flowRegion
- id="flowRegion2541"><use
- transform="translate(1.467046,-91.03536)"
- x="0"
- y="0"
- xlink:href="#rect4654"
- id="use2543"
- width="744.09448"
- height="1052.3622" /></flowRegion><flowPara
- id="flowPara2545">VariableOwner</flowPara></flowRoot> <g
- style="display:inline"
- id="g6931"
- transform="translate(132.33963,-23.86934)">
- <rect
- style="fill:#d9d9cd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect6933"
- width="138.189"
- height="35.43309"
- x="167.13719"
- y="232.20705"
- ry="3.7880721" />
- <text
- id="text6935"
- y="253.39159"
- x="175.51506"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- xml:space="preserve"><tspan
- y="253.39159"
- x="175.51506"
- id="tspan6937"
- sodipodi:role="line">ConnectorResource</tspan></text>
- </g>
- </g>
- <g
- style="display:inline"
- id="g6925"
- transform="matrix(1.4062095,0,0,1.4062095,-185.02991,-249.16957)">
- <rect
- style="fill:#d9d9cd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect2549"
- width="85.039375"
- height="35.433075"
- x="167.13719"
- y="232.20705"
- ry="3.7880721" />
- <text
- id="text6921"
- y="253.39159"
- x="180.51506"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- xml:space="preserve"><tspan
- y="253.39159"
- x="180.51506"
- id="tspan6923"
- sodipodi:role="line">Resource</tspan></text>
- </g>
- <g
- style="display:inline"
- id="g6951"
- transform="matrix(1.4062095,0,0,1.4062095,-35.029907,-184.16957)">
- <rect
- style="fill:#49c2f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect6953"
- width="124.01576"
- height="35.43309"
- x="167.13719"
- y="232.20705"
- ry="3.7880721" />
- <text
- id="text6955"
- y="253.39159"
- x="227.90504"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- xml:space="preserve"><tspan
- y="253.39159"
- x="227.90504"
- id="tspan6957"
- sodipodi:role="line">ExternalResource</tspan></text>
- </g>
- <g
- style="display:inline"
- id="g6960"
- transform="matrix(1.4062095,0,0,1.4062095,-35.029907,-119.16957)">
- <rect
- style="fill:#49c2f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect6962"
- width="124.01576"
- height="35.43309"
- x="167.13719"
- y="232.20705"
- ry="3.7880721" />
- <text
- id="text6964"
- y="253.39159"
- x="228.18105"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- xml:space="preserve"><tspan
- y="253.39159"
- x="228.18105"
- id="tspan6966"
- sodipodi:role="line">ThemeResource</tspan></text>
- </g>
- <path
- sodipodi:nodetypes="cc"
- style="fill:none;stroke:#49c2f1;stroke-width:5.48089504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
- d="m 199.47896,231.82376 -89.68737,0"
- id="path6976"
- inkscape:connector-type="polyline"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- style="fill:none;stroke:#49c2f1;stroke-width:5.48089504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
- d="m 199.47896,167.04954 -89.68737,0"
- id="path8919"
- inkscape:connector-type="polyline"
- inkscape:connector-curvature="0" />
- <g
- style="display:inline"
- id="g8921"
- transform="matrix(1.4062095,0,0,1.4062095,199.97009,-249.16957)">
- <rect
- style="fill:#49c2f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect8923"
- width="124.01576"
- height="35.43309"
- x="167.13719"
- y="232.20705"
- ry="3.7880721" />
- <text
- id="text8925"
- y="253.39159"
- x="227.90504"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- xml:space="preserve"><tspan
- y="253.39159"
- x="227.90504"
- id="tspan8927"
- sodipodi:role="line">FileResource</tspan></text>
- </g>
- <g
- style="display:inline"
- id="g8929"
- transform="matrix(1.4062095,0,0,1.4062095,199.97009,-184.16957)">
- <rect
- style="fill:#49c2f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect8931"
- width="124.01576"
- height="35.43309"
- x="167.13719"
- y="232.20705"
- ry="3.7880721" />
- <text
- id="text8933"
- y="253.39159"
- x="228.18105"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- xml:space="preserve"><tspan
- y="253.39159"
- x="228.18105"
- id="tspan8935"
- sodipodi:role="line">ClassResource</tspan></text>
- </g>
- <g
- style="display:inline"
- id="g8939"
- transform="matrix(1.4062095,0,0,1.4062095,199.97009,-119.16957)">
- <rect
- style="fill:#49c2f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="rect8941"
- width="124.01576"
- height="35.43309"
- x="167.13719"
- y="232.20705"
- ry="3.7880721" />
- <text
- id="text8943"
- y="253.39159"
- x="228.18105"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
- xml:space="preserve"><tspan
- y="253.39159"
- x="228.18105"
- id="tspan8945"
- sodipodi:role="line">StreamResource</tspan></text>
- </g>
- <path
- sodipodi:nodetypes="cc"
- style="fill:none;stroke:#49c2f1;stroke-width:5.48089504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
- d="m 438.64529,231.82376 -24.91315,0"
- id="path8947"
- inkscape:connector-type="polyline"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- style="fill:none;stroke:#49c2f1;stroke-width:5.48089504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
- d="m 413.73214,102.27533 0,129.54843"
- id="path8949"
- inkscape:connector-type="polyline"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- style="fill:none;stroke:#49c2f1;stroke-width:5.48089504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
- d="m 438.64529,167.04954 -24.91315,0"
- id="path8951"
- inkscape:connector-type="polyline"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#49c2f1;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker18095)"
- d="m 110,232.36218 c 0,-110 0,-110 0,-110"
- id="path6258"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#49c2f1;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker18095)"
- d="m 440,102.36218 -50,0"
- id="path6258-6"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:none;stroke:#d9d9cd;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker44971)"
- d="m 205,102.36218 -40,0"
- id="path6258-6-3"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="Varjot" />
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="82mm" + height="24mm" + id="svg1901" + sodipodi:version="0.32" + inkscape:version="0.91 r" + sodipodi:docname="resource_classdiagram.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true" + version="1.1"> + <defs + id="defs1903"> + <marker + id="marker44971" + orient="auto" + markerHeight="5.7450781" + markerWidth="4.6297355"> + <g + id="g18059" + transform="matrix(0.5,0,0,0.5,-185.64299,-257.19655)"> + <path + sodipodi:nodetypes="csccccccsccssssssssssssssccc" + id="path18061" + d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="cccscccsssssssscccsccc" + id="path18063" + d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0" + style="fill:#d9d9cd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + </g> + </marker> + <marker + id="marker18095" + orient="auto" + markerHeight="5.7450776" + markerWidth="4.6297302"> + <g + id="g11064" + transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)"> + <path + sodipodi:nodetypes="csccccccsccssssssssssssssccc" + id="path11050" + d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="cccscccsssssssscccsccc" + id="path11035" + d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0" + style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + </g> + </marker> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective7604" /> + <linearGradient + id="linearGradient11516"> + <stop + id="stop11518" + offset="0" + style="stop-color:#ffffff;stop-opacity:1" /> + <stop + id="stop11520" + offset="1" + style="stop-color:#a090e7;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient11508"> + <stop + id="stop11510" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop11512" + offset="1" + style="stop-color:#e27979;stop-opacity:1" /> + </linearGradient> + <marker + inkscape:stockid="DiamondL" + orient="auto" + refY="0" + refX="0" + id="DiamondL" + style="overflow:visible"> + <path + id="path4404" + d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + orient="auto" + refY="0" + refX="0" + id="DiamondEmpty" + style="overflow:visible"> + <path + id="path7" + d="M 0,-5 -5,0 0,5 5,0 0,-5 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="translate(-5,0)" + inkscape:connector-curvature="0" /> + </marker> + <linearGradient + id="linearGradient3286"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3288" /> + <stop + style="stop-color:#79e291;stop-opacity:1;" + offset="1" + id="stop3290" /> + </linearGradient> + <marker + orient="auto" + refY="0" + refX="0" + id="EmptyArrow" + style="overflow:visible"> + <path + id="path9" + d="M 0,0 0,-5 -12.5,0 0,5 0,0 Z m -0.5,0 0,-4.5 L -12,0 -0.5,4.5 -0.5,0 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(-1,0,0,-1,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + orient="auto" + refY="0" + refX="0" + id="EmptyArrow2" + style="overflow:visible"> + <path + id="path13" + d="M 0,0 0,-5 -10,0 0,5 0,0 Z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(-1,0,0,-1,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + <linearGradient + id="linearGradient19816"> + <stop + id="stop19818" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop19820" + offset="1" + style="stop-color:#e7e790;stop-opacity:1;" /> + </linearGradient> + <marker + inkscape:stockid="Arrow2Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow2Lend" + style="overflow:visible"> + <path + id="path16811" + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend" + style="overflow:visible"> + <path + id="path16829" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutM" + orient="auto" + refY="0" + refX="0" + id="TriangleOutM" + style="overflow:visible"> + <path + id="path16731" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(0.4,0.4)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleInL" + orient="auto" + refY="0" + refX="0" + id="TriangleInL" + style="overflow:visible"> + <path + id="path16743" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="TriangleOutL" + style="overflow:visible"> + <path + id="path16734" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <linearGradient + id="linearGradient9263"> + <stop + style="stop-color:#000000;stop-opacity:0" + offset="0" + id="stop9265" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop9267" /> + </linearGradient> + <linearGradient + id="linearGradient7299"> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop7301" /> + <stop + style="stop-color:#a090e7;stop-opacity:1" + offset="1" + id="stop7303" /> + </linearGradient> + <linearGradient + id="linearGradient5349"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop5351" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop5353" /> + </linearGradient> + <linearGradient + id="linearGradient4152"> + <stop + style="stop-color:#6b6bff;stop-opacity:1;" + offset="0" + id="stop4154" /> + <stop + style="stop-color:#6b6bff;stop-opacity:0;" + offset="1" + id="stop4156" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5349" + id="linearGradient5355" + x1="96.085953" + y1="148.38934" + x2="389.01984" + y2="148.38934" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient19816" + id="radialGradient11602" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3208501,0.00238435,-0.00310564,0.596383,334.93437,78.721097)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient19816" + id="radialGradient3268" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9214039,0.00238962,-0.00216645,0.5977017,541.12253,30.198804)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient7299" + id="radialGradient3270" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3208501,0.00238435,-0.00310564,0.596383,334.93437,78.721097)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient19816" + id="radialGradient3272" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.6000725,0.00238083,-0.00376217,0.5955044,664.61868,-4.8275956)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient7299" + id="radialGradient3274" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3208501,0.00238435,-0.00310564,0.596383,334.93437,78.721097)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient7299" + id="radialGradient3276" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3208501,0.00238435,-0.00310564,0.596383,334.93437,78.721097)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient7299" + id="radialGradient3278" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3208501,0.00238435,-0.00310564,0.596383,334.93437,78.721097)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient7299" + id="radialGradient3280" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3208501,0.00238435,-0.00310564,0.596383,334.93437,78.721097)" + cx="-147.5" + cy="97.300964" + fx="-147.5" + fy="97.300964" + r="109.42857" /> + <marker + id="marker18095-4" + orient="auto" + markerHeight="5.7450776" + markerWidth="4.6297302"> + <g + id="g11064-6" + transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)"> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccccccsccssssssssssssssccc" + id="path11050-2" + d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccscccsssssssscccsccc" + id="path11035-1" + d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0" + style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + </g> + </marker> + <marker + id="marker44971-5" + orient="auto" + markerHeight="5.7450781" + markerWidth="4.6297355"> + <g + id="g18059-0" + transform="matrix(0.5,0,0,0.5,-185.64299,-257.19655)"> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccccccsccssssssssssssssccc" + id="path18061-4" + d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccscccsssssssscccsccc" + id="path18063-9" + d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0" + style="fill:#d9d9cd;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + </g> + </marker> + <marker + id="marker18095-0" + orient="auto" + markerHeight="5.7450776" + markerWidth="4.6297302"> + <g + id="g11064-0" + transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)"> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccccccsccssssssssssssssccc" + id="path11050-0" + d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccscccsssssssscccsccc" + id="path11035-16" + d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0" + style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + </g> + </marker> + <marker + id="marker18095-6" + orient="auto" + markerHeight="5.7450776" + markerWidth="4.6297302"> + <g + id="g11064-7" + transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)"> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccccccsccssssssssssssssccc" + id="path11050-20" + d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccscccsssssssscccsccc" + id="path11035-4" + d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0" + style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + </g> + </marker> + <marker + id="marker18095-2" + orient="auto" + markerHeight="5.7450776" + markerWidth="4.6297302"> + <g + id="g11064-2" + transform="matrix(0.5,0,0,0.5,-185.64298,-257.19655)"> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccccccsccssssssssssssssccc" + id="path11050-23" + d="m 370,508.65625 c -0.86067,0.0587 -1.60944,0.6213 -1.90625,1.4375 -0.26976,0.74176 -0.0577,1.53493 0.4375,2.125 l -1.75,0 c -0.0424,-0.005 -0.0824,0.002 -0.125,0 l 0,4.375 0.125,0 1.75,0 c -0.67896,0.8597 -0.69701,2.11549 0.0937,2.90625 0.85091,0.85091 2.27409,0.85091 3.125,0 l 3.34375,-3.375 c 0.033,-0.0295 0.0643,-0.0608 0.0937,-0.0937 0.0322,-0.0193 0.0635,-0.0402 0.0937,-0.0625 3.7e-4,-3.6e-4 0.21851,-0.28079 0.21875,-0.28125 5e-5,-9e-5 -0.007,-0.0447 0,-0.0625 0.001,-0.003 0.03,0.003 0.0312,0 0.0391,-0.0521 0.051,-0.0518 0.0937,-0.125 0.13699,-0.23476 0.16684,-0.37191 0.15625,-0.34375 0.0368,-0.0915 0.0185,-0.11251 0.0312,-0.15625 0.0106,-0.0102 0.021,-0.0206 0.0312,-0.0312 0.06,-0.22398 0.0881,-0.51689 0.0625,-0.78125 -0.0136,-0.20363 -0.0589,-0.29765 -0.0625,-0.3125 1.4e-4,-0.0104 1.4e-4,-0.0208 0,-0.0312 0.026,0.097 0.0153,0.016 -0.0937,-0.25 -0.0525,-0.13039 -0.0899,-0.21936 -0.125,-0.28125 -0.0524,-0.0897 -0.13346,-0.26235 -0.34375,-0.46875 L 371.75,509.3125 c -0.45645,-0.48671 -1.08509,-0.71163 -1.75,-0.65625 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccscccsssssssscccsccc" + id="path11035-9" + d="m 366.65625,515.40625 4.625,0 -1.8125,1.8125 c -0.39695,0.39695 -0.39695,1.04055 0,1.4375 0.39695,0.39695 1.04055,0.39695 1.4375,0 l 3.4375,-3.46875 0.0937,-0.0625 c 0.006,-0.006 -0.006,-0.0253 0,-0.0312 0.0554,-0.0572 0.1151,-0.11699 0.15625,-0.1875 0.0286,-0.0491 0.0429,-0.10409 0.0625,-0.15625 0.0124,-0.0307 0.0221,-0.0622 0.0312,-0.0937 0.0311,-0.1161 0.0427,-0.22493 0.0312,-0.34375 -0.004,-0.0578 -0.0174,-0.0996 -0.0312,-0.15625 -0.0109,-0.0407 -0.0151,-0.0857 -0.0312,-0.125 -0.0164,-0.0408 -0.0405,-0.0862 -0.0625,-0.125 -0.0455,-0.0779 -0.0936,-0.15726 -0.15625,-0.21875 l -3.53125,-3.53125 c -0.20891,-0.22276 -0.50816,-0.33785 -0.8125,-0.3125 -0.39478,0.0269 -0.73977,0.28438 -0.875,0.65625 -0.13524,0.37187 -0.0353,0.78826 0.25,1.0625 l 1.875,1.84375 -4.6875,0" + style="fill:#49c2f1;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + </g> + </marker> + <marker + inkscape:stockid="EmptyTriangleOutM" + orient="auto" + refY="0" + refX="0" + id="marker24201-3-7" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24203-8-0" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,-1.8,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="EmptyTriangleOutM" + orient="auto" + refY="0" + refX="0" + id="marker24201-3-7-5" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24203-8-0-7" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,-1.8,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="EmptyTriangleOutM" + orient="auto" + refY="0" + refX="0" + id="marker24201-3-7-1" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24203-8-0-6" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,-1.8,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="EmptyTriangleOutM" + orient="auto" + refY="0" + refX="0" + id="marker24201-3-7-6" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24203-8-0-0" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,-1.8,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="EmptyTriangleOutM" + orient="auto" + refY="0" + refX="0" + id="marker24201-3-7-3" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24203-8-0-3" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,-1.8,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + markerWidth="4.6707735" + markerHeight="7.8382583" + refX="4.3000002" + refY="3.9191291" + orient="auto" + id="marker5127-4-4-4-0-3"> + <path + sodipodi:nodetypes="ccc" + inkscape:connector-curvature="0" + id="path4591-1-5-0-8-0-6-8-7-6-1" + d="M 0.37582499,0.37582446 3.919125,3.9191245 0.37582499,7.4624345" + style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </marker> + <marker + markerWidth="4.6707735" + markerHeight="7.8382583" + refX="4.3000002" + refY="3.9191291" + orient="auto" + id="marker5127-4-4-4-0-3-9"> + <path + sodipodi:nodetypes="ccc" + inkscape:connector-curvature="0" + id="path4591-1-5-0-8-0-6-8-7-6-1-0" + d="M 0.37582499,0.37582446 3.919125,3.9191245 0.37582499,7.4624345" + style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </marker> + <marker + markerWidth="4.6707735" + markerHeight="7.8382583" + refX="4.3000002" + refY="3.9191291" + orient="auto" + id="marker5127-4-4-4-0-3-9-0"> + <path + sodipodi:nodetypes="ccc" + inkscape:connector-curvature="0" + id="path4591-1-5-0-8-0-6-8-7-6-1-0-6" + d="M 0.37582499,0.37582446 3.919125,3.9191245 0.37582499,7.4624345" + style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </marker> + <marker + markerWidth="4.6707735" + markerHeight="7.8382583" + refX="4.3000002" + refY="3.9191291" + orient="auto" + id="marker5127-4-4-4-0"> + <path + sodipodi:nodetypes="ccc" + inkscape:connector-curvature="0" + id="path4591-1-5-0-8-0-6-8-7-6" + d="M 0.37582499,0.37582446 3.919125,3.9191245 0.37582499,7.4624345" + style="fill:none;fill-rule:evenodd;stroke:#33383a;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="1" + inkscape:pageshadow="2" + inkscape:zoom="2.5681681" + inkscape:cx="136.98884" + inkscape:cy="83.424464" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + gridtolerance="10000" + inkscape:window-width="1920" + inkscape:window-height="1060" + inkscape:window-x="-2" + inkscape:window-y="-3" + showgrid="true" + showguides="true" + inkscape:connector-spacing="10" + inkscape:guide-bbox="true" + inkscape:window-maximized="1" + inkscape:object-paths="true" + inkscape:object-nodes="true"> + <sodipodi:guide + orientation="horizontal" + position="940.71429" + id="guide22848" /> + <inkscape:grid + type="xygrid" + id="grid6196" + empspacing="10" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + spacingx="3.5433071" + spacingy="3.5433071" + units="mm" /> + </sodipodi:namedview> + <metadata + id="metadata1906"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Taso 1" + inkscape:groupmode="layer" + id="layer1" + style="opacity:1" + transform="translate(0,-967.32283)"> + <g + id="g2492" + transform="matrix(0.56140018,0,0,0.56140018,-73.888533,841.56729)"> + <rect + ry="0" + y="230.31496" + x="163.1725" + height="37.869312" + width="100.98486" + id="rect4654" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#33383a;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <flowRoot + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="flowRoot4664" + transform="translate(-2.7125132,100.13686)"><flowRegion + id="flowRegion4666"><use + transform="translate(1.467046,-91.03536)" + x="0" + y="0" + xlink:href="#rect4654" + id="use4668" + width="744.09448" + height="1052.3622" /></flowRegion><flowPara + id="flowPara4670">Resource</flowPara></flowRoot> </g> + <g + id="g2492-7" + transform="matrix(0.56140018,0,0,0.56140018,8.4335335,842.94398)"> + <rect + ry="0" + y="227.86272" + x="142.76651" + height="37.869316" + width="145.16573" + id="rect4654-6" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#33383a;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <flowRoot + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="flowRoot4664-7" + transform="translate(-2.7125132,100.13686)"><flowRegion + id="flowRegion4666-3"><use + transform="translate(1.467046,-91.03536)" + x="0" + y="0" + xlink:href="#rect4654-6" + id="use4668-6" + width="744.09448" + height="1052.3622" /></flowRegion><flowPara + id="flowPara4670-2">ConnectorResource</flowPara></flowRoot> </g> + <g + transform="matrix(0.56140018,0,0,0.56140018,197.55496,837.58886)" + id="g3808"> + <rect + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3810" + width="132.54262" + height="37.869316" + x="-11.072981" + y="237.40157" + ry="0" /> + <flowRoot + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="flowRoot3812" + transform="translate(55.03875,260.97862)"><flowRegion + id="flowRegion3814" /><flowPara + id="flowPara3818">FileResource</flowPara></flowRoot> </g> + <path + style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5127-4-4-4-0-3)" + d="m 88.582678,1038.189 -42.519685,0 0,-45.237" + id="path4591-5-1-8" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> + <g + style="opacity:1" + transform="matrix(0.56140018,0,0,0.56140018,197.55496,865.93532)" + id="g3808-6"> + <rect + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3810-5" + width="132.54262" + height="37.869316" + x="-11.072981" + y="237.40157" + ry="0" /> + <flowRoot + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="flowRoot3812-0" + transform="translate(55.03875,260.97862)"><flowRegion + id="flowRegion3814-8" /><flowPara + id="flowPara3818-1">ClassResource</flowPara></flowRoot> </g> + <g + style="opacity:1" + transform="matrix(0.56140018,0,0,0.56140018,197.55496,894.28178)" + id="g3808-1"> + <rect + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3810-3" + width="132.54262" + height="37.869316" + x="-11.072981" + y="237.40157" + ry="0" /> + <flowRoot + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="flowRoot3812-4" + transform="translate(55.03875,260.97862)"><flowRegion + id="flowRegion3814-3" /><flowPara + id="flowPara3818-5">StreamResource</flowPara></flowRoot> </g> + <g + style="opacity:1" + transform="matrix(0.56140018,0,0,0.56140018,94.799052,865.93532)" + id="g3808-6-0"> + <rect + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3810-5-7" + width="132.54262" + height="37.869316" + x="-11.072981" + y="237.40157" + ry="0" /> + <flowRoot + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="flowRoot3812-0-5" + transform="translate(55.03875,260.97862)"><flowRegion + id="flowRegion3814-8-6" /><flowPara + id="flowPara3818-1-9">ExternalResource</flowPara></flowRoot> </g> + <g + style="opacity:1" + transform="matrix(0.56140018,0,0,0.56140018,94.799052,894.28178)" + id="g3808-6-9"> + <rect + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3810-5-8" + width="132.54262" + height="37.869316" + x="-11.072981" + y="237.40157" + ry="0" /> + <flowRoot + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="flowRoot3812-0-8" + transform="translate(55.03875,260.97862)"><flowRegion + id="flowRegion3814-8-64" /><flowPara + id="flowPara3818-1-5">ThemeResource</flowPara></flowRoot> </g> + <path + style="opacity:1;fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5127-4-4-4-0-3-9)" + d="m 191.33859,981.49607 -20.43384,0" + id="path4591-5-1-8-8" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="opacity:1;fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 191.33859,1009.8425 -10.62993,0" + id="path4591-5-1-8-8-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="opacity:1;fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 191.33859,1038.189 -10.62993,0 0,-56.69293" + id="path4591-5-1-8-8-7-4" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#33383a;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5127-4-4-4-0)" + d="m 88.582678,981.49607 -13.637827,0" + id="path4591-1-5-0-7-1-3-6" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="opacity:1;fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 88.582677,1009.8425 -42.519685,0" + id="path4591-5-1-8-8-7-43" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Varjot" + transform="translate(0,-967.32283)" /> +</svg> diff --git a/documentation/application/original-drawings/view-navigation.svg b/documentation/application/original-drawings/view-navigation.svg index e4acdf1e69..702c11450a 100644 --- a/documentation/application/original-drawings/view-navigation.svg +++ b/documentation/application/original-drawings/view-navigation.svg @@ -1081,10 +1081,10 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1.8159691" - inkscape:cx="89.180593" - inkscape:cy="156.67691" + inkscape:cx="136.79995" + inkscape:cy="147.93516" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="g5458" gridtolerance="10000" inkscape:window-width="1920" inkscape:window-height="1060" @@ -1144,7 +1144,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -1242,7 +1242,7 @@ id="tspan7066-3-4-3-7" y="1016.0297" x="20.546753" - sodipodi:role="line">Email</tspan></text> + sodipodi:role="line">Password</tspan></text> <rect y="1020.4725" x="60.236221" @@ -1260,7 +1260,7 @@ id="tspan7066-3-4-3-5" y="1026.6595" x="20.546753" - sodipodi:role="line">Planet</tspan></text> + sodipodi:role="line">Email</tspan></text> <g id="g8337" transform="translate(17.716535,-1.4546875e-5)"> @@ -1320,7 +1320,7 @@ height="53.149601" width="99.212601" id="rect4408-7-5-2-9-3" - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffc13f;fill-opacity:1;fill-rule:nonzero;stroke:#33383a;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#33383a;stroke-width:1.0629921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> <text sodipodi:linespacing="100%" id="text4227-9-0-0-4-2-9-90-9" diff --git a/documentation/components/img/field-diagram-hi.png b/documentation/components/img/field-diagram-hi.png Binary files differindex a438436c61..627e0d784d 100644 --- a/documentation/components/img/field-diagram-hi.png +++ b/documentation/components/img/field-diagram-hi.png diff --git a/documentation/components/img/slider-example1-hi.png b/documentation/components/img/slider-example1-hi.png Binary files differindex 70ca635e60..7f38639dde 100644 --- a/documentation/components/img/slider-example1-hi.png +++ b/documentation/components/img/slider-example1-hi.png diff --git a/documentation/components/original-drawings/field-diagram.svg b/documentation/components/original-drawings/field-diagram.svg index 8c1ce159ce..4b713c30ab 100644 --- a/documentation/components/original-drawings/field-diagram.svg +++ b/documentation/components/original-drawings/field-diagram.svg @@ -11,7 +11,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="82mm" - height="82mm" + height="73mm" id="svg2475" sodipodi:version="0.32" inkscape:version="0.91 r" @@ -31,9 +31,9 @@ objecttolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="3.3941125" - inkscape:cx="158.52687" - inkscape:cy="140.02242" + inkscape:zoom="2.4" + inkscape:cx="225.58075" + inkscape:cy="130.81707" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="true" @@ -61,7 +61,7 @@ type="xygrid" dotted="false" /> <sodipodi:guide - position="166.53543,134.64567" + position="166.53543,230.31496" orientation="1,0" id="guide25051" /> </sodipodi:namedview> @@ -1495,6 +1495,21 @@ transform="matrix(0.4,0,0,0.4,-1.8,0)" inkscape:connector-curvature="0" /> </marker> + <marker + inkscape:stockid="EmptyTriangleOutM" + orient="auto" + refY="0" + refX="0" + id="marker24201-3-2-4" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24203-8-6-8" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#ffffff;fill-rule:evenodd;stroke:#00b4f0;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.4,0,0,0.4,-1.8,0)" + inkscape:connector-curvature="0" /> + </marker> </defs> <metadata id="metadata2480"> @@ -1512,38 +1527,32 @@ id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1" - transform="translate(0,-761.81105)"> + transform="translate(0,-793.70084)"> <path sodipodi:nodetypes="cc" style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none" - d="m 165.60285,889.3701 -23.87057,0" + d="m 165.60285,896.45672 -23.87057,0" id="path49764" inkscape:connector-type="polyline" inkscape:connector-curvature="0" /> <flowRoot - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3594541px;line-height:122%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="flowRoot2485" xml:space="preserve" - transform="matrix(0.56140019,0,0,0.56140019,-101.54462,557.11682)"><flowRegion + transform="matrix(0.56140019,0,0,0.56140019,-101.54462,564.20344)"><flowRegion id="flowRegion2487"><rect - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3594541px;line-height:122%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr;text-anchor:middle;fill:#000000;fill-opacity:1;" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1" y="238.07646" x="262.85715" height="120" width="184.28572" id="rect2489" /></flowRegion><flowPara id="flowPara2491" /></flowRoot> <g - transform="matrix(0.56140019,0,0,0.56140019,-103.54962,570.14931)" + transform="matrix(0.56140019,0,0,0.56140019,-103.54962,577.23593)" id="g3178" /> - <path - inkscape:connector-type="polyline" - id="path28387" - d="m -8.189821,873.56631 -0.7765624,0.0744" - style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:connector-curvature="0" /> <g id="g2492" - transform="matrix(0.56140018,0,0,0.56140018,-77.431844,660.85865)"> + transform="matrix(0.56140018,0,0,0.56140018,-77.431844,667.94527)"> <rect ry="0" y="230.31496" @@ -1568,7 +1577,7 @@ id="flowPara4670">Component</flowPara></flowRoot> </g> <g id="g2475" - transform="matrix(0.56140018,0,0,0.56140018,-76.025223,704.6837)"> + transform="matrix(0.56140018,0,0,0.56140018,-76.025223,711.77032)"> <rect style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff3a49;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect4622" @@ -1592,7 +1601,7 @@ id="flowPara4642">AbstractComponent</flowPara></flowRoot> </g> <g id="g2854" - transform="matrix(0.56140018,0,0,0.56140018,10.924822,660.68217)"> + transform="matrix(0.56140018,0,0,0.56140018,10.924822,667.76879)"> <rect ry="0" y="230.6293" @@ -1616,7 +1625,7 @@ height="1052.3622" /></flowRegion><flowPara id="flowPara2864">HasValue<T></flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,-2.8872178,704.96725)" + transform="matrix(0.56140018,0,0,0.56140018,-2.8872179,712.05387)" id="g2802"> <rect ry="0" @@ -1625,7 +1634,7 @@ height="37.86932" width="113.60796" id="rect2804" - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff3a49;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff3a49;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> <flowRoot transform="translate(18.635472,9.7695016)" id="flowRoot2806" @@ -1640,28 +1649,10 @@ x="0" /></flowRegion><flowPara id="flowPara2812">AbstractField</flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,158.57858,688.76999)" - id="g3808"> - <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" - id="rect3810" - width="82.050171" - height="37.869328" - x="14.173247" - y="237.40155" - ry="0" /> - <flowRoot - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - id="flowRoot3812" - transform="translate(55.03875,260.97862)"><flowRegion - id="flowRegion3814" /><flowPara - id="flowPara3818">Button</flowPara></flowRoot> </g> - <g - transform="matrix(0.56140018,0,0,0.56140018,211.72818,688.76999)" + transform="matrix(0.56140018,0,0,0.56140018,158.57857,695.85662)" id="g3820"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect3822" width="82.050186" height="37.869328" @@ -1676,10 +1667,10 @@ id="flowRegion3826" /><flowPara id="flowPara3830">CheckBox</flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,158.79359,716.25388)" + transform="matrix(0.56140018,0,0,0.56140018,158.79359,723.3405)" id="g3836"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect3838" width="82.050194" height="37.869312" @@ -1694,11 +1685,11 @@ id="flowRegion3842" /><flowPara id="flowPara3846">TextField</flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,211.76685,723.59701)" + transform="matrix(0.56140018,0,0,0.56140018,211.76685,730.68363)" id="g3848" style="stroke-width:1.77165353;stroke-miterlimit:4;stroke-dasharray:none"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect3850" width="100.98485" height="37.86932" @@ -1718,10 +1709,10 @@ y="249.79576">RichTextArea</tspan></text> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,158.79359,744.10287)" + transform="matrix(0.56140018,0,0,0.56140018,158.79359,751.18949)" id="g3870"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect3872" width="82.050194" height="37.869324" @@ -1736,10 +1727,10 @@ id="flowRegion3876" /><flowPara id="flowPara3880">DateField</flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,211.68145,751.39928)" + transform="matrix(0.56140018,0,0,0.56140018,211.68145,758.4859)" id="g3894"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect3896" width="119.91951" height="37.869312" @@ -1759,10 +1750,10 @@ y="250.76511">InlineDateField</tspan></text> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,160.66912,778.9299)" + transform="matrix(0.56140018,0,0,0.56140018,213.81873,786.01652)" id="g3902"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect3904" width="119.91951" height="37.869312" @@ -1782,16 +1773,16 @@ y="250.95586">PopupDateField</tspan></text> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,-1.4148363,818.31352)" + transform="matrix(0.56140018,0,0,0.56140018,-1.4148364,825.40014)" id="g3796"> <rect ry="0" y="208.62048" x="172.93213" - height="35.867687" - width="109.9191" + height="37.86932" + width="113.60796" id="rect3798" - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff3a49;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff3a49;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> <flowRoot transform="translate(15.719998,9.3213059)" id="flowRoot3800" @@ -1806,14 +1797,14 @@ x="0" /></flowRegion><flowPara id="flowPara3806">AbstractSelect</flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,1.6457416,696.36175)" + transform="matrix(0.56140018,0,0,0.56140018,1.6457354,731.79482)" id="g2643"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect2645" - width="126.23106" - height="37.869305" - x="41.249378" + width="100.98486" + height="37.869293" + x="53.872482" y="274.37109" ry="0" /> <text @@ -1826,10 +1817,10 @@ sodipodi:role="line" id="tspan2687" x="103.82072" - y="297.02637">ProgressIndicator</tspan></text> + y="297.02637">ProgressBar</tspan></text> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,158.57857,830.50228)" + transform="matrix(0.56140018,0,0,0.56140018,158.57857,837.5889)" id="g6708"> <rect style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" @@ -1847,7 +1838,7 @@ id="flowRegion6714" /><flowPara id="flowPara6718">ListSelect</flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,158.57857,858.84873)" + transform="matrix(0.56140018,0,0,0.56140018,158.57857,865.93535)" id="g6732"> <rect style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" @@ -1865,7 +1856,7 @@ id="flowRegion6738" /><flowPara id="flowPara6742">NativeSelect</flowPara></flowRoot> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,158.57857,887.19519)" + transform="matrix(0.56140018,0,0,0.56140018,158.57857,894.28181)" id="g6744"> <rect style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" @@ -1888,10 +1879,10 @@ y="261.33932">TwinColSelect</tspan></text> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,30.895481,830.50228)" + transform="matrix(0.56140018,0,0,0.56140018,30.895481,837.5889)" id="g6760"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect6762" width="100.98486" height="37.869328" @@ -1911,10 +1902,10 @@ y="260.07687">OptionGroup</tspan></text> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,30.895481,858.84873)" + transform="matrix(0.56140018,0,0,0.56140018,30.895481,865.93535)" id="g6768"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect6770" width="88.58268" height="37.869328" @@ -1934,10 +1925,10 @@ y="261.25919">Table</tspan></text> </g> <g - transform="matrix(0.56140018,0,0,0.56140018,30.895481,887.19519)" + transform="matrix(0.56140018,0,0,0.56140018,30.895481,894.28181)" id="g6776"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect6778" width="88.361748" height="37.86932" @@ -1958,32 +1949,13 @@ </g> <path style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:url(#marker20517)" - d="m 127.25558,1023.9176 0.30348,-67.22466" + d="m 127.25558,1031.0042 0.30348,-67.22464" id="path6792" inkscape:connector-type="polyline" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" /> <g - transform="matrix(0.56140018,0,0,0.56140018,158.57857,802.15582)" - id="g6696" - style="stroke-width:1.77165353;stroke-miterlimit:4;stroke-dasharray:none"> - <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" - id="rect6698" - width="88.36174" - height="37.86932" - x="14.173247" - y="237.40155" - ry="0" /> - <flowRoot - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.77165353;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="flowRoot6700" - transform="translate(58.315709,261.25917)"><flowRegion - id="flowRegion6702" /><flowPara - id="flowPara6706">Select</flowPara></flowRoot> </g> - <g - transform="matrix(0.56140018,0,0,0.56140018,215.27148,802.15582)" + transform="matrix(0.56140018,0,0,0.56140018,158.57857,809.24244)" id="g6720"> <rect style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" @@ -2003,18 +1975,18 @@ <path sodipodi:nodetypes="cc" style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none" - d="m 88.582677,998.79959 0.588446,-0.0774" + d="m 88.582677,1005.9023 0.588446,-0.093" id="path7429" inkscape:connector-type="polyline" inkscape:connection-start="#g6768" inkscape:connector-curvature="0" /> <flowRoot - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3594541px;line-height:122%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="flowRoot8724" xml:space="preserve" - transform="matrix(0.56140019,0,0,0.56140019,-101.54462,557.11682)"><flowRegion + transform="matrix(0.56140019,0,0,0.56140019,-101.54462,564.20344)"><flowRegion id="flowRegion8726"><rect - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3594541px;line-height:122%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr;text-anchor:middle;fill:#000000;fill-opacity:1;" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1" y="752.14441" x="39.286312" height="22.868153" @@ -2023,131 +1995,124 @@ id="flowPara8730" /></flowRoot> <path sodipodi:nodetypes="cc" style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none" - d="m 165.60285,861.02365 -23.87057,0" + d="m 165.60285,868.11027 -23.87057,0" id="path49768" inkscape:connector-type="polyline" inkscape:connector-curvature="0" /> <g - transform="matrix(0.28070009,0,0,0.28070009,-43.527845,557.56261)" + transform="matrix(0.28070009,0,0,0.28070009,-43.527845,564.64923)" id="g18053" /> <g - transform="matrix(0.56140018,0,0,0.56140018,69.995892,749.00621)" + transform="matrix(0.56140018,0,0,0.56140018,36.863129,725.57078)" id="g2655"> <rect - style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.89346596;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#00b4f0;stroke-width:1.893466;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect2657" - width="77.952736" - height="35.433075" - x="14.173247" - y="237.40155" + width="75.738647" + height="37.869316" + x="16.387346" + y="234.96532" ry="0" /> <flowRoot xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.35945415px;line-height:122.00000286%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="flowRoot2659" - transform="translate(53.052936,259.79934)"><flowRegion + transform="translate(54.153341,258.90309)"><flowRegion id="flowRegion2661" /><flowPara id="flowPara2665">Slider</flowPara></flowRoot> </g> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 88.582677,970.86616 77.579323,0" + d="m 88.582677,977.95278 77.579323,0" id="path22338" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 88.815642,998.60611 77.934798,0.11604" + d="m 88.815642,1005.6927 77.934798,0.1161" id="path22338-5" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 89.171122,1024.582 77.579318,0" + d="m 89.171122,1031.6686 77.579318,0" id="path22338-1" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 95.669291,861.02365 17.716539,0" + d="m 88.582677,868.11027 24.803153,0" id="path22338-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff3a49;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:url(#marker20517-3)" - d="m 127.55906,935.43309 0,-92.12598" + d="m 127.55906,942.51971 0,-92.12598" id="path6792-3" inkscape:connector-type="polyline" sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - transform="translate(-4.8818897e-6,-1.3172053e-7)" /> + inkscape:connector-curvature="0" /> <path style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff3a49;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:url(#marker20517-3-0-9)" - d="m 42.519685,822.04727 0,-10.62992" + d="m 42.519685,829.13389 0,-10.62992" id="path6792-3-8-0" inkscape:connector-type="polyline" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" /> <path style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff3a49;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:url(#marker20517-3-0-9-0)" - d="m 127.55906,822.04727 0,-10.62992" + d="m 127.55906,829.13389 0,-10.62992" id="path6792-3-8-0-3" inkscape:connector-type="polyline" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201)" - d="m 113.38583,882.28349 0,-38.97638" + d="m 88.582677,896.45673 24.803153,0 0,-46.063" id="path22338-0" inkscape:connector-curvature="0" - sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="ccc" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201-0)" - d="m 141.73228,917.71656 0,-74.40945" + d="m 141.73228,896.45673 0,-46.063" id="path22338-0-6" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff3a49;stroke-width:0.99460661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:url(#marker20517-3-0-9-0-5)" - d="m 95.669291,832.67719 -10.629921,0" + d="m 95.669291,839.76381 -10.629921,0" id="path6792-3-8-0-3-3" inkscape:connector-type="polyline" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" /> <path - style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99460661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 141.73228,917.71656 24.80315,0" - id="path22338-37" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cc" /> - <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201-3)" - d="m 219.68504,832.67719 -7.08661,0" + d="m 166.53543,839.76382 -7.08661,0" id="path22338-0-8" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201-3-5)" - d="m 219.68504,861.02365 -7.08661,0" + d="m 219.68504,868.11027 -7.08661,0" id="path22338-0-8-4" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201-3-2)" - d="m 219.68504,889.37011 -7.08661,0" + d="m 219.68504,896.45673 -7.08661,0" id="path22338-0-8-46" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201-3-56)" - d="m 223.22835,946.06302 -7.08661,0" + d="m 166.53544,953.14964 -7.08661,0" id="path22338-0-8-6" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path - style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201-3-7)" - d="m 166.53543,832.67719 -7.08661,0" - id="path22338-0-8-62" + style="fill:none;fill-rule:evenodd;stroke:#00b4f0;stroke-width:0.99566931;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker24201-3-2-4)" + d="m 219.68504,924.80318 -28.34646,0 0,-17.71653" + id="path22338-0-8-46-8" inkscape:connector-curvature="0" - sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="ccc" /> </g> </svg> diff --git a/documentation/components/original-drawings/slider-example1.svg b/documentation/components/original-drawings/slider-example1.svg index 2548aa360b..17bdf0b574 100644 --- a/documentation/components/original-drawings/slider-example1.svg +++ b/documentation/components/original-drawings/slider-example1.svg @@ -68,9 +68,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="1.4" - inkscape:cx="140.18358" - inkscape:cy="87.607372" + inkscape:zoom="0.98994949" + inkscape:cx="184.27652" + inkscape:cy="277.48621" inkscape:document-units="px" inkscape:current-layer="layer1" gridtolerance="10000" @@ -101,24 +101,24 @@ inkscape:groupmode="layer" id="layer1" style="opacity:1" - transform="translate(-67.505424,-64.081154)"> + transform="translate(-4.8759656,-811.59399)"> <rect style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="rect3344" width="249" height="236" - x="67.505424" - y="64.081154" /> + x="4.8759656" + y="811.59399" /> <image sodipodi:absref="/home/magi/itmill/vaadin/documentation/components/original-drawings/../img/slider-orig.png" xlink:href="../img/slider-orig.png" width="249" height="236" id="image2463" - x="67.505424" - y="64.081154" /> + x="4.8759656" + y="811.59399" /> <g - transform="matrix(0.04895833,0,0,0.04895833,85.307423,133.89853)" + transform="matrix(0.04895833,0,0,0.04895833,22.677965,881.41142)" id="g1317"> <path id="path6080" diff --git a/documentation/layout/img/layout-schematic-hi.png b/documentation/layout/img/layout-schematic-hi.png Binary files differindex f64e5bb482..8932fffc52 100644 --- a/documentation/layout/img/layout-schematic-hi.png +++ b/documentation/layout/img/layout-schematic-hi.png diff --git a/documentation/layout/layout-orderedlayout.asciidoc b/documentation/layout/layout-orderedlayout.asciidoc index c1bfd030b7..533d0d5404 100644 --- a/documentation/layout/layout-orderedlayout.asciidoc +++ b/documentation/layout/layout-orderedlayout.asciidoc @@ -226,6 +226,7 @@ image::img/orderedlayout-sizing-undefined.png[width=50%, scaledwidth=75%] endif::web[] +[[layout.orderedlayout.defined-size]] === Layout with Defined Size If you set a [classname]#HorizontalLayout# to a defined size horizontally or a @@ -245,7 +246,7 @@ the question, "Percentage of what?" There is no sensible default answer for this question in the current implementation of the layouts, so in practice, you may not define "100%" size alone. - +[[layout.orderedlayout.expanding]] === Expanding Components Often, you want to have one component that takes all the available space left @@ -287,7 +288,7 @@ Notice that you can not call [methodname]#setExpandRatio()# before you have added the component to the layout, because it can not operate on an component that it doesn't yet have. - +[[layout.orderedlayout.expandratio]] === Expand Ratios If you specify an expand ratio for multiple components, they will all try to use @@ -352,16 +353,15 @@ It is not meaningful to combine expanding components with percentually defined size and components with fixed or undefined size. Such combination can lead to a very unexpected size for the percentually sized components. +[[layout.orderedlayout.percentual]] +=== Percentual Sizing -=== Percentage of Cells - -A percentual size of a component defines the size of the component __within its -cell__. Usually, you use "100%", but a smaller percentage or a fixed size +A percentual size of a component defines the size of the component _within its cell_. +Usually, you use "100%", but a smaller percentage or a fixed size (smaller than the cell size) will leave an empty space in the cell and align the component within the cell according to its alignment setting, top left by default. - [source, java] ---- HorizontalLayout layout50 = new HorizontalLayout(); diff --git a/documentation/layout/original-drawings/layout-schematic.svg b/documentation/layout/original-drawings/layout-schematic.svg index ec1b9240a5..6859312a7c 100644 --- a/documentation/layout/original-drawings/layout-schematic.svg +++ b/documentation/layout/original-drawings/layout-schematic.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="3.959798" - inkscape:cx="148.02363" - inkscape:cy="70.790343" + inkscape:zoom="1.979899" + inkscape:cx="196.99038" + inkscape:cy="5.0040539" inkscape:document-units="mm" inkscape:current-layer="layer1" inkscape:window-width="1920" @@ -180,13 +180,13 @@ <circle cy="921.25989" cx="49.606293" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6" r="2.1259842" /> <circle cy="921.25989" cx="38.976379" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1" r="2.1259842" /> <path @@ -198,13 +198,13 @@ <circle cy="1038.1891" cx="53.149601" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-7" r="2.1259842" /> <circle cy="1038.189" cx="38.976379" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-4" r="2.1259842" /> <path @@ -216,13 +216,13 @@ <circle cy="953.14966" cx="56.692902" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13" r="2.1259842" /> <circle cy="953.14966" cx="38.976376" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7" r="2.1259842" /> <path @@ -234,13 +234,13 @@ <circle cy="946.06299" cx="53.149601" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-9" r="2.1259842" /> <circle cy="946.06305" cx="38.976379" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-8" r="2.1259842" /> <path @@ -252,13 +252,13 @@ <circle cy="931.88983" cx="198.42522" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-3" r="2.1259842" /> <circle cy="931.88983" cx="216.14174" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-7" r="2.1259842" /> <path @@ -270,13 +270,13 @@ <circle cy="928.3465" cx="56.692902" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-7" r="2.1259842" /> <circle cy="928.3465" cx="38.976379" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-0" r="2.1259842" /> <path @@ -288,13 +288,13 @@ <circle cy="960.23627" cx="60.236206" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-39" r="2.1259842" /> <circle cy="960.23627" cx="38.976376" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-9" r="2.1259842" /> <path @@ -306,13 +306,13 @@ <circle cy="949.60632" cx="198.42522" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-3-2" r="2.1259842" /> <circle cy="949.60638" cx="216.14175" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-7-4" r="2.1259842" /> <path @@ -324,13 +324,13 @@ <circle cy="921.25989" cx="201.96854" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-3-2-6" r="2.1259842" /> <circle cy="921.26001" cx="216.14175" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-7-4-2" r="2.1259842" /> <rect @@ -363,13 +363,13 @@ <circle cy="985.03943" cx="180.70866" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-3-5" r="2.1259842" /> <circle cy="985.03943" cx="216.14174" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-7-0" r="2.1259842" /> <path @@ -381,13 +381,13 @@ <circle cy="1002.7559" cx="180.70866" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-3-5-3" r="2.1259842" /> <circle cy="1002.7559" cx="216.14174" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-7-0-3" r="2.1259842" /> <path @@ -399,13 +399,13 @@ <circle cy="974.40948" cx="184.25197" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-3-2-6-9" r="2.1259842" /> <circle cy="974.40955" cx="216.14177" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-7-4-2-4" r="2.1259842" /> <flowRoot @@ -501,13 +501,13 @@ <circle cy="914.17328" cx="46.062992" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-8" r="2.1259842" /> <circle cy="914.17328" cx="38.976379" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path2997-7-6-1-6" r="2.1259842" /> <flowRoot @@ -526,13 +526,13 @@ <circle cy="960.23627" cx="194.8819" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff3a49;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-13-3-2-6-9-1" r="2.1259842" /> <circle cy="960.23627" cx="216.14174" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00b4f0;fill-opacity:1;stroke:none;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" id="path2997-7-6-1-7-7-4-2-4-9" r="2.1259842" /> <flowRoot |