From c72792595d7ec5097938f778d42f9c579e7874fe Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 24 Mar 2015 23:10:41 +0100 Subject: [PATCH 1/2] clean up dist/ in release builds before build starts; avoid disk space leak --- configuration/buildAndUpdateProduct.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh index 74de0db3fc7..eb9c5e3fe87 100755 --- a/configuration/buildAndUpdateProduct.sh +++ b/configuration/buildAndUpdateProduct.sh @@ -232,6 +232,7 @@ if [[ "$@" == "release" ]]; then fi mkdir -p $PROJECT_HOME/dist + rm -rf $PROJECT_HOME/dist/* mkdir -p $PROJECT_HOME/build RELEASE_NOTES="Release $VERSION_INFO\n$RELEASE_NOTES" From 3e002516e1be6c900fe3ed117da3d1035374db2a Mon Sep 17 00:00:00 2001 From: Alexander Ries Date: Wed, 25 Mar 2015 00:27:11 +0100 Subject: [PATCH 2/2] sails of dinghy with spinnaker boat are now fuller and bigger to be more visible in racemap --- .../DinghyWithSpinnakerVectorGraphics.java | 39 +++++++++---------- .../client/svg/boats/DinghyWithSpinnaker.svg | 36 ++++++++--------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/DinghyWithSpinnakerVectorGraphics.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/DinghyWithSpinnakerVectorGraphics.java index 6bb1ab398b9..7ab44a9a82f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/DinghyWithSpinnakerVectorGraphics.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/DinghyWithSpinnakerVectorGraphics.java @@ -71,7 +71,7 @@ public class DinghyWithSpinnakerVectorGraphics extends BoatClassVectorGraphics { @Override protected void drawDownwindPortTackSails(Context2d ctx) { - + ctx.setFillStyle(SAIL_FILLCOLOR); ctx.setStrokeStyle(SAIL_FILLCOLOR); ctx.setLineWidth(1.0); @@ -95,9 +95,9 @@ public class DinghyWithSpinnakerVectorGraphics extends BoatClassVectorGraphics { ctx.stroke(); ctx.beginPath(); - ctx.moveTo(307.81752, 937.22012); - ctx.bezierCurveTo(314.345, 964.9351099999999, 316.56174, 997.0000399999999, 283.42062, 1048.3229); - ctx.bezierCurveTo(283.42062, 1048.3229, 259.83009, 1093.7070999999999, 180.78139, 1133.9968); + ctx.moveTo(307.81752,937.22012); + ctx.bezierCurveTo(327.345,973.93511,320.56174,1038,293.42062,1072.3229); + ctx.bezierCurveTo(295.15614999999997,1075.7939999999999,224.69723999999997,1140.4414,180.78139,1133.9968); ctx.closePath(); ctx.fill(); ctx.stroke(); @@ -132,8 +132,8 @@ public class DinghyWithSpinnakerVectorGraphics extends BoatClassVectorGraphics { ctx.setLineWidth(1.0); ctx.beginPath(); ctx.moveTo(308.21838,933.17535); - ctx.bezierCurveTo(316.60510000000005,897.97361,304.70538000000005,871.99857,281.72357,823.37622); - ctx.bezierCurveTo(268.51855,799.4476,218.11345,743.28885,174.32941,729.90564); + ctx.bezierCurveTo(316.60510000000005,897.97361,329.70538000000005,858.99857,296.72357000000005,799.37622); + ctx.bezierCurveTo(259.51855000000006,749.4476,211.11345000000006,737.28885,174.32941000000005,729.90564); ctx.closePath(); ctx.fill(); ctx.stroke(); @@ -184,18 +184,17 @@ public class DinghyWithSpinnakerVectorGraphics extends BoatClassVectorGraphics { ctx.setLineWidth(1.0); ctx.beginPath(); ctx.moveTo(309.42857,939.99996); - ctx.bezierCurveTo(272.42857,954.99996,235.42856999999998,970.99996,187.42856999999998,969.99996); - ctx.bezierCurveTo(151.42856999999998,973.99996,98.42856999999998,965.99996,44.42856999999998,953.99996); + ctx.bezierCurveTo(284.42857,965.99996,272.42857,991.99996,224.42856999999998,990.99996); + ctx.bezierCurveTo(188.42856999999998,994.99996,98.42856999999998,965.99996,44.42856999999998,953.99996); ctx.closePath(); ctx.fill(); ctx.stroke(); //Draw head sail - ctx.beginPath(); - ctx.moveTo(485.38382,936.09069); - ctx.bezierCurveTo(439.4015,987.37151,411.41227000000003,1006.2644,371.42765,1017.0605); - ctx.bezierCurveTo(315.44918,1026.5069,296.45649000000003,1026.5069,252.47341000000003,1017.0605); - ctx.bezierCurveTo(328.44418,1006.2644,404.41496000000006,987.3715100000001,485.38382,936.09069); + ctx.moveTo(329,939); + ctx.lineTo(482,939); + ctx.bezierCurveTo(431.2033,992.12409,365.02878,1010.6481,293,1016); + ctx.bezierCurveTo(308.37324,991.77921,330.90565,970.62611,329,939); ctx.closePath(); ctx.fill(); ctx.stroke(); @@ -219,19 +218,19 @@ public class DinghyWithSpinnakerVectorGraphics extends BoatClassVectorGraphics { ctx.setStrokeStyle(SAIL_FILLCOLOR); ctx.setLineWidth(1.0); ctx.beginPath(); - ctx.moveTo(485.38386,937.92122); - ctx.bezierCurveTo(439.40153000000004,884.50601,411.41228,870.1750999999999,371.42765,859.75262); - ctx.bezierCurveTo(315.44916,849.33014,296.45645,841.51328,252.47335000000004,857.1469999999999); - ctx.bezierCurveTo(328.44416,868.8722899999999,404.41497000000004,885.80882,485.38386,937.92122); + ctx.moveTo(308,933); + ctx.bezierCurveTo(276,900,260,882,219,882); + ctx.bezierCurveTo(172,881,90.4,906,43.4,918); ctx.closePath(); ctx.fill(); ctx.stroke(); //Draw head sail ctx.beginPath(); - ctx.moveTo(308.42857,932.99996); - ctx.bezierCurveTo(267.42857,911.99996,225.42856999999998,899.99996,184.42856999999998,899.99996); - ctx.bezierCurveTo(137.42856999999998,898.99996,90.42856999999998,905.99996,43.42856999999998,917.99996); + ctx.moveTo(331,936); + ctx.lineTo(482,940); + ctx.bezierCurveTo(428.25579,880.50234,358.31076,864.65787,292,860); + ctx.bezierCurveTo(309.42057,879.09774,329.05764,903.69536,331,936); ctx.closePath(); ctx.fill(); ctx.stroke(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/svg/boats/DinghyWithSpinnaker.svg b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/svg/boats/DinghyWithSpinnaker.svg index c3d0939b660..704b9608ebc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/svg/boats/DinghyWithSpinnaker.svg +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/svg/boats/DinghyWithSpinnaker.svg @@ -26,7 +26,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="254" + inkscape:cx="82" inkscape:cy="126" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -45,7 +45,7 @@ image/svg+xml - + @@ -74,22 +74,10 @@ style="fill:none;fill-rule:evenodd;stroke:#020202;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - - @@ -121,7 +109,7 @@ sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path4216" - d="m 307.81752,937.22012 c 6.52748,27.71499 8.74422,59.77992 -24.3969,111.10278 0,0 -23.59053,45.3842 -102.63923,85.6739 z" + d="M 307.81752,937.22012 C 327.345,973.93511 320.56174,1038 293.42062,1072.3229 c 1.73553,3.4711 -68.72338,68.1185 -112.63923,61.6739 z" style="fill:#b3b3b3;fill-rule:evenodd;stroke:#000000;stroke-width:0.94374472px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + +