[longomatch] Use smaller images for the position tagging backgrounds
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Use smaller images for the position tagging backgrounds
- Date: Fri, 17 Jan 2014 00:27:14 +0000 (UTC)
commit 8678763694f5c124c853280b306860dbf05c4312
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Fri Jan 17 01:25:48 2014 +0100
Use smaller images for the position tagging backgrounds
LongoMatch.Core/Config.cs | 18 ++++
LongoMatch.Core/LongoMatch.Core.mdp | 3 +
LongoMatch.Core/Makefile.am | 5 +-
.../Store/Templates/CategoriesTemplate.cs | 21 ++++-
.../Gui/Component/CategoriesTemplateEditor.cs | 9 +--
LongoMatch.GUI/Gui/Component/CategoryProperties.cs | 6 +-
.../Gui/Component/PlaysCoordinatesTagger.cs | 6 +-
LongoMatch.GUI/LongoMatch.GUI.mdp | 3 -
LongoMatch.GUI/Makefile.am | 3 -
LongoMatch.Services/Services/DataBase.cs | 52 ++++++++++++
images/field_background.svg | 88 ++++++++++----------
images/half_field_background.svg | 78 +++++++++---------
12 files changed, 187 insertions(+), 105 deletions(-)
---
diff --git a/LongoMatch.Core/Config.cs b/LongoMatch.Core/Config.cs
index 7ddce17..80eb501 100644
--- a/LongoMatch.Core/Config.cs
+++ b/LongoMatch.Core/Config.cs
@@ -145,6 +145,24 @@ namespace LongoMatch
}
#region Properties
+ static public Image FieldBackground {
+ get {
+ return new Image (Gdk.Pixbuf.LoadFromResource (Constants.FIELD_BACKGROUND));
+ }
+ }
+
+ static public Image HalfFieldBackground {
+ get {
+ return new Image (Gdk.Pixbuf.LoadFromResource
(Constants.HALF_FIELD_BACKGROUND));
+ }
+ }
+
+ static public Image GoalBackground {
+ get {
+ return new Image (Gdk.Pixbuf.LoadFromResource (Constants.GOAL_BACKGROUND));
+ }
+ }
+
public static bool FastTagging {
get {
return state.fastTagging;
diff --git a/LongoMatch.Core/LongoMatch.Core.mdp b/LongoMatch.Core/LongoMatch.Core.mdp
index e2d0055..d229c42 100644
--- a/LongoMatch.Core/LongoMatch.Core.mdp
+++ b/LongoMatch.Core/LongoMatch.Core.mdp
@@ -107,6 +107,9 @@
<File subtype="Code" buildaction="Compile" name="Common/EncodingQuality.cs" />
<File subtype="Code" buildaction="Compile" name="Common/Gettext.cs" />
<File subtype="Code" buildaction="Compile" name="Common/Exceptions.cs" />
+ <File subtype="Code" buildaction="EmbedAsResource" name="../images/field_background.svg" />
+ <File subtype="Code" buildaction="EmbedAsResource" name="../images/goal_background.svg" />
+ <File subtype="Code" buildaction="EmbedAsResource" name="../images/half_field_background.svg" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
diff --git a/LongoMatch.Core/Makefile.am b/LongoMatch.Core/Makefile.am
index 33c6d7c..c12c04c 100644
--- a/LongoMatch.Core/Makefile.am
+++ b/LongoMatch.Core/Makefile.am
@@ -79,6 +79,9 @@ SOURCES = \
Store/Time.cs \
Store/TimeNode.cs
-RESOURCES =
+RESOURCES = \
+ $(top_srcdir)/images/field_background.svg \
+ $(top_srcdir)/images/half_field_background.svg \
+ $(top_srcdir)/images/goal_background.svg
include $(top_srcdir)/build/build.mk
diff --git a/LongoMatch.Core/Store/Templates/CategoriesTemplate.cs
b/LongoMatch.Core/Store/Templates/CategoriesTemplate.cs
index f4c057e..16f7fb4 100644
--- a/LongoMatch.Core/Store/Templates/CategoriesTemplate.cs
+++ b/LongoMatch.Core/Store/Templates/CategoriesTemplate.cs
@@ -51,6 +51,9 @@ namespace LongoMatch.Store.Templates
/// Creates a new template
/// </summary>
public Categories() {
+ FieldBackground = Config.FieldBackground;
+ HalfFieldBackground = Config.HalfFieldBackground;
+ GoalBackground = Config.GoalBackground;
}
public string Name {
@@ -92,8 +95,12 @@ namespace LongoMatch.Store.Templates
else return null;
}
set {
- if (value != null)
+ if (value != null) {
+ if (value.Width > 500) {
+ value.Scale (500, 500);
+ }
fieldImage = value.Serialize();
+ }
else
fieldImage = null;
}
@@ -106,8 +113,12 @@ namespace LongoMatch.Store.Templates
else return null;
}
set {
- if (value != null)
+ if (value != null) {
+ if (value.Width > 500) {
+ value.Scale (500, 500);
+ }
halfFieldImage = value.Serialize();
+ }
else
halfFieldImage = null;
}
@@ -120,8 +131,12 @@ namespace LongoMatch.Store.Templates
else return null;
}
set {
- if (value != null)
+ if (value != null) {
+ if (value.Width > 500) {
+ value.Scale (500, 500);
+ }
goalImage = value.Serialize();
+ }
else
goalImage = null;
}
diff --git a/LongoMatch.GUI/Gui/Component/CategoriesTemplateEditor.cs
b/LongoMatch.GUI/Gui/Component/CategoriesTemplateEditor.cs
index 8beab52..39ca345 100644
--- a/LongoMatch.GUI/Gui/Component/CategoriesTemplateEditor.cs
+++ b/LongoMatch.GUI/Gui/Component/CategoriesTemplateEditor.cs
@@ -253,8 +253,7 @@ namespace LongoMatch.Gui.Component
Image img;
if (pix == null) {
- img = new Image (
- Gdk.Pixbuf.LoadFromResource (Constants.FIELD_BACKGROUND));
+ img = Config.FieldBackground;
fReset.Visible = false;
} else {
img = new Image(pix);
@@ -268,8 +267,7 @@ namespace LongoMatch.Gui.Component
Image img;
if (pix == null) {
- img = new Image (
- Gdk.Pixbuf.LoadFromResource (Constants.HALF_FIELD_BACKGROUND));
+ img = Config.HalfFieldBackground;
hfReset.Visible = false;
} else {
img = new Image(pix);
@@ -283,8 +281,7 @@ namespace LongoMatch.Gui.Component
Image img;
if (pix == null) {
- img = new Image (
- Gdk.Pixbuf.LoadFromResource (Constants.GOAL_BACKGROUND));
+ img = Config.GoalBackground;
gReset.Visible = false;
} else {
img = new Image(pix);
diff --git a/LongoMatch.GUI/Gui/Component/CategoryProperties.cs
b/LongoMatch.GUI/Gui/Component/CategoryProperties.cs
index a4b7c3c..62c6fd1 100644
--- a/LongoMatch.GUI/Gui/Component/CategoryProperties.cs
+++ b/LongoMatch.GUI/Gui/Component/CategoryProperties.cs
@@ -56,9 +56,9 @@ namespace LongoMatch.Gui.Component
subcategoriestreeview1.SubCategorySelected += OnSubcategorySelected;
leadtimebutton.ValueChanged += OnLeadTimeChanged;;
lagtimebutton.ValueChanged += OnLagTimeChanged;
- fieldcoordinatestagger.Background = Gdk.Pixbuf.LoadFromResource
(Constants.FIELD_BACKGROUND);
- goalcoordinatestagger.Background = Gdk.Pixbuf.LoadFromResource
(Constants.GOAL_BACKGROUND);
- halffieldcoordinatestagger.Background = Gdk.Pixbuf.LoadFromResource
(Constants.HALF_FIELD_BACKGROUND);
+ fieldcoordinatestagger.Background = Config.FieldBackground.Value;
+ goalcoordinatestagger.Background = Config.HalfFieldBackground.Value;
+ halffieldcoordinatestagger.Background = Config.GoalBackground.Value;
}
public bool CanChangeHotkey {
diff --git a/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
b/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
index 722ad8a..2effe62 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
@@ -96,19 +96,19 @@ namespace LongoMatch.Gui.Component
if (fieldImage != null) {
fieldPixbuf = fieldImage.Value;
} else {
- fieldPixbuf = Gdk.Pixbuf.LoadFromResource (Constants.FIELD_BACKGROUND);
+ fieldPixbuf = Config.FieldBackground.Value;
}
field.Background = fieldPixbuf;
if (halfFieldImage != null) {
hFieldPixbuf = halfFieldImage.Value;
} else {
- hFieldPixbuf = Gdk.Pixbuf.LoadFromResource (Constants.HALF_FIELD_BACKGROUND);
+ hFieldPixbuf = Config.HalfFieldBackground.Value;
}
hfield.Background = hFieldPixbuf;
if (goalImage != null) {
goalPixbuf = goalImage.Value;
} else {
- goalPixbuf = Gdk.Pixbuf.LoadFromResource (Constants.GOAL_BACKGROUND);
+ goalPixbuf = Config.GoalBackground.Value;
}
goal.Background = goalPixbuf;
}
diff --git a/LongoMatch.GUI/LongoMatch.GUI.mdp b/LongoMatch.GUI/LongoMatch.GUI.mdp
index 8bd5390..a5a8124 100644
--- a/LongoMatch.GUI/LongoMatch.GUI.mdp
+++ b/LongoMatch.GUI/LongoMatch.GUI.mdp
@@ -165,15 +165,12 @@
<File subtype="Code" buildaction="Compile" name="Gui/Helpers/MessagesHelpers.cs" />
<File subtype="Code" buildaction="Compile" name="Gui/Component/CoordinatesTagger.cs" />
<File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.CoordinatesTagger.cs"
/>
- <File subtype="Code" buildaction="EmbedAsResource" name="../images/field_background.svg" />
- <File subtype="Code" buildaction="EmbedAsResource" name="../images/goal_background.svg" />
<File subtype="Code" buildaction="Compile" name="Gui/Component/GeneralPreferencesPanel.cs" />
<File subtype="Code" buildaction="Compile"
name="gtk-gui/LongoMatch.Gui.Component.GeneralPreferencesPanel.cs" />
<File subtype="Code" buildaction="Compile" name="Gui/Dialog/PropertiesEditor.cs" />
<File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Dialog.PropertiesEditor.cs" />
<File subtype="Code" buildaction="Compile" name="Gui/Component/VideoPreferencesPanel.cs" />
<File subtype="Code" buildaction="Compile"
name="gtk-gui/LongoMatch.Gui.Component.VideoPreferencesPanel.cs" />
- <File subtype="Code" buildaction="EmbedAsResource" name="../images/half_field_background.svg" />
<File subtype="Code" buildaction="Compile" name="Gui/Component/LiveAnalysisPreferences.cs" />
<File subtype="Code" buildaction="Compile"
name="gtk-gui/LongoMatch.Gui.Component.LiveAnalysisPreferences.cs" />
<File subtype="Code" buildaction="Compile" name="Gui/Component/PlaysCoordinatesTagger.cs" />
diff --git a/LongoMatch.GUI/Makefile.am b/LongoMatch.GUI/Makefile.am
index 2325e69..380bddb 100644
--- a/LongoMatch.GUI/Makefile.am
+++ b/LongoMatch.GUI/Makefile.am
@@ -176,9 +176,6 @@ RESOURCES = \
$(top_srcdir)/images/stock_draw-freeform-line.png\
$(top_srcdir)/images/camera-video.png\
$(top_srcdir)/images/video.png \
- $(top_srcdir)/images/field_background.svg \
- $(top_srcdir)/images/half_field_background.svg \
- $(top_srcdir)/images/goal_background.svg \
gtk-gui/objects.xml \
gtk-gui/gui.stetic
diff --git a/LongoMatch.Services/Services/DataBase.cs b/LongoMatch.Services/Services/DataBase.cs
index 409882a..0f9ab93 100644
--- a/LongoMatch.Services/Services/DataBase.cs
+++ b/LongoMatch.Services/Services/DataBase.cs
@@ -226,6 +226,9 @@ namespace LongoMatch.DB
} finally {
CloseDB(db);
}
+ if (ret != null && FixProjectCoordinates (ret)) {
+ UpdateProject (ret);
+ }
return ret;
}
@@ -486,6 +489,55 @@ namespace LongoMatch.DB
}
}
+ void FixCoordinates (Project project, int old_width, string backgroundName)
+ {
+ List<Coordinates> coords = null;
+ Image image = null;
+
+ if (backgroundName == Constants.FIELD_BACKGROUND) {
+ image = Config.FieldBackground;
+ project.Categories.FieldBackground = image;
+ coords = project.AllPlays().Select(p => p.FieldPosition).ToList();
+ } else if (backgroundName == Constants.HALF_FIELD_BACKGROUND) {
+ image = Config.HalfFieldBackground;
+ project.Categories.HalfFieldBackground = image;
+ coords = project.AllPlays().Select(p => p.HalfFieldPosition).ToList();
+ } else if (backgroundName == Constants.GOAL_BACKGROUND) {
+ image = Config.GoalBackground;
+ project.Categories.GoalBackground = image;
+ }
+
+ if (coords != null) {
+ int new_width;
+
+ new_width = image.Width;
+ foreach (Coordinates c in coords) {
+ float scale = (float) new_width / old_width;
+ foreach (Point p in c) {
+ p.X = (int) (p.X * scale);
+ p.Y = (int) (p.Y * scale);
+ }
+ }
+ }
+ }
+
+ bool FixProjectCoordinates (Project project) {
+ bool save = false;
+
+ if (project.Categories.FieldBackground == null) {
+ FixCoordinates (project, 2078, Constants.FIELD_BACKGROUND);
+ save = true;
+ }
+ if (project.Categories.HalfFieldBackground == null) {
+ FixCoordinates (project, 2078, Constants.HALF_FIELD_BACKGROUND);
+ save = true;
+ }
+ if (project.Categories.GoalBackground == null) {
+ FixCoordinates (project, 400, Constants.GOAL_BACKGROUND);
+ save = true;
+ }
+ return save;
+ }
/* Dummy class to allow having a single instance of BackupDateTime in the DB and make it
* easIer to query */
diff --git a/images/field_background.svg b/images/field_background.svg
index 5986b49..2ad4659 100644
--- a/images/field_background.svg
+++ b/images/field_background.svg
@@ -9,12 +9,12 @@
xmlns="http://www.w3.org/2000/svg";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="2078.2544"
- height="1084.7449"
+ width="514.71875"
+ height="266.53125"
id="svg2"
version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="filed_background.svg"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="field_background.svg"
inkscape:export-filename="/home/andoni/git/longomatch/images/filed_background.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -28,13 +28,13 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
- inkscape:cx="1182.1114"
- inkscape:cy="526.05761"
+ inkscape:cx="-73.938564"
+ inkscape:cy="116.91262"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1600"
- inkscape:window-height="844"
+ inkscape:window-height="845"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -51,8 +51,8 @@
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
- originx="1108.358px"
- originy="-70.435926px" />
+ originx="326.59375px"
+ originy="-479.58092px" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -69,56 +69,56 @@
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1108.358,102.81863)">
+ transform="translate(326.59375,-306.25)">
<rect
-
style="fill:#71ff6a;fill-opacity:1;stroke:#71ff6a;stroke-width:0;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:bevel;stroke-linecap:square"
+
style="fill:#71ff6a;fill-opacity:1;stroke:#71ff6a;stroke-width:0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none"
id="rect3825"
- width="2058.4614"
- height="1065.7142"
- x="-1098.4615"
- y="-93.352104"
- rx="19.23628"
- ry="13.629444" />
+ width="514.61536"
+ height="266.42856"
+ x="-326.53851"
+ y="306.29074"
+ rx="4.8090701"
+ ry="3.407361" />
<rect
-
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:19.40801238999999967;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:miter;stroke-linecap:butt"
+
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:4.8520031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect3805-7"
- width="158.34319"
- height="304.48981"
- x="-1019.2899"
- y="287.26013"
- rx="19.23628"
- ry="13.629444" />
+ width="39.585796"
+ height="76.122452"
+ x="-306.74561"
+ y="401.44379"
+ rx="4.8090701"
+ ry="3.407361" />
<rect
-
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:19.40801238999999967;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:miter;stroke-linecap:butt"
+
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:4.8520031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect3805"
- width="158.34319"
- height="304.48981"
- x="722.48523"
- y="287.26013"
- rx="19.23628"
- ry="13.629444" />
+ width="39.585796"
+ height="76.122452"
+ x="128.69818"
+ y="401.44379"
+ rx="4.8090701"
+ ry="3.407361" />
<rect
-
style="fill:#0cb600;fill-opacity:1;stroke:#ffffff;stroke-width:16.70375823999999909;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:miter;stroke-linecap:butt"
+
style="fill:#0cb600;fill-opacity:1;stroke:#ffffff;stroke-width:4.17593956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect2987"
- width="1583.4319"
- height="913.46936"
- x="-860.94672"
- y="-17.229658"
- rx="19.23628"
- ry="13.629444" />
+ width="395.85797"
+ height="228.36734"
+ x="-267.15979"
+ y="325.32135"
+ rx="4.8090701"
+ ry="3.407361" />
<path
-
style="fill:none;stroke:#ffffff;stroke-width:19.40801238999999967;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
- d="m -465.08874,-17.229656 0,913.469366 0,0 0,0"
+
style="fill:none;stroke:#ffffff;stroke-width:4.8520031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
+ d="m -168.19531,325.32135 0,228.36734 0,0 0,0"
id="path3764"
inkscape:connector-curvature="0" />
<path
-
style="fill:none;stroke:#ffffff;stroke-width:19.40801238999999967;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
- d="m -69.230756,-17.229656 0,913.469366 0,0 0,0"
+
style="fill:none;stroke:#ffffff;stroke-width:4.8520031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
+ d="m -69.230815,325.32135 0,228.36734 0,0 0,0"
id="path3764-3"
inkscape:connector-curvature="0" />
<path
-
style="fill:none;stroke:#ffffff;stroke-width:19.40801238999999967;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
- d="m 326.62722,-17.229656 0,913.469366 0,0 0,0"
+
style="fill:none;stroke:#ffffff;stroke-width:4.8520031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
+ d="m 29.733679,325.32135 0,228.36734 0,0 0,0"
id="path3764-2"
inkscape:connector-curvature="0" />
</g>
diff --git a/images/half_field_background.svg b/images/half_field_background.svg
index b49bf9c..e17668d 100644
--- a/images/half_field_background.svg
+++ b/images/half_field_background.svg
@@ -9,12 +9,12 @@
xmlns="http://www.w3.org/2000/svg";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="2078.2544"
- height="1084.7449"
+ width="514.71875"
+ height="268.6875"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="field_background.svg"
+ sodipodi:docname="half_field_background.svg"
inkscape:export-filename="/home/andoni/git/longomatch/images/filed_background.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -28,8 +28,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
- inkscape:cx="663.53997"
- inkscape:cy="494.66961"
+ inkscape:cx="410.37126"
+ inkscape:cy="82.837117"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -53,8 +53,8 @@
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
- originx="1108.358px"
- originy="-70.435926px" />
+ originx="326.59375px"
+ originy="-482.26842px" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -64,7 +64,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>
@@ -72,44 +72,44 @@
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1108.358,102.81863)">
+ transform="translate(326.59375,-301.40625)">
<rect
-
style="fill:#71ff6a;fill-opacity:1;stroke:#71ff6a;stroke-width:0;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:bevel;stroke-linecap:square"
+
style="fill:#71ff6a;fill-opacity:1;stroke:#71ff6a;stroke-width:0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none"
id="rect3825"
- width="2058.4614"
- height="1065.7142"
- x="-1098.4615"
- y="-93.352104"
- rx="19.23628"
- ry="13.629444" />
+ width="514.61536"
+ height="266.42856"
+ x="-326.53851"
+ y="303.47852"
+ rx="4.8090701"
+ ry="3.407361" />
<rect
-
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:10.49808407;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:2.62452102;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect3805-7"
- width="208.9593"
- height="655.10583"
- x="-96.403206"
- y="-266.00604"
- rx="25.385361"
- ry="29.323574"
+ width="52.239826"
+ height="163.77646"
+ x="302.71573"
+ y="-14.578384"
+ rx="6.3463402"
+ ry="7.3308935"
transform="matrix(0,1,-1,0,0,0)" />
<rect
-
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:19.40801238999999967;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:miter;stroke-linecap:butt"
+
style="fill:#45b9be;fill-opacity:1;stroke:#1651f9;stroke-width:4.8520031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect3805"
- width="158.34319"
- height="304.48981"
- x="722.48523"
- y="287.26013"
- rx="19.23628"
- ry="13.629444" />
+ width="39.585796"
+ height="76.122452"
+ x="128.69818"
+ y="398.63156"
+ rx="4.8090701"
+ ry="3.407361" />
<rect
-
style="fill:#0cb600;fill-opacity:1;stroke:#ffffff;stroke-width:18.16505623;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+
style="fill:#0cb600;fill-opacity:1;stroke:#ffffff;stroke-width:4.54126406;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect2987"
- width="1987.6848"
- height="860.57947"
- x="-1051.6447"
- y="103.50099"
- rx="24.147337"
- ry="12.840299" />
+ width="496.9212"
+ height="215.14487"
+ x="-314.83429"
+ y="352.69177"
+ rx="6.0368342"
+ ry="3.2100747" />
<path
sodipodi:type="arc"
style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.99900001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -118,8 +118,8 @@
sodipodi:cy="909.96283"
sodipodi:rx="765.82098"
sodipodi:ry="714.78204"
- d="m 1839.9999,909.96283 a 765.82098,714.78204 0 1 1 -1531.64193,-3e-5"
- transform="matrix(0.96831395,0,0,0.95208901,-1095.75,-764.95559)"
+ d="m 1839.9999,909.96283 c 0,394.76327 -342.8697,714.78207 -765.8209,714.78207 -422.9513,0
-765.82103,-320.0188 -765.82103,-714.78207 0,-1e-5 0,-2e-5 0,-3e-5"
+ transform="matrix(0.24207849,0,0,0.23802225,-325.86063,135.57763)"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
