openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reg...@apache.org
Subject svn commit: r1555399 - in /openoffice/trunk/main: drawinglayer/source/primitive2d/polygonprimitive2d.cxx extras/source/palettes/standard.soe
Date Sat, 04 Jan 2014 18:18:25 GMT
Author: regina
Date: Sat Jan  4 18:18:25 2014
New Revision: 1555399

URL: http://svn.apache.org/r1555399
Log:
#i123758 Arrow heads with hole
 new arrow heads and improved line end overlap

Modified:
    openoffice/trunk/main/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
    openoffice/trunk/main/extras/source/palettes/standard.soe

Modified: openoffice/trunk/main/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/drawinglayer/source/primitive2d/polygonprimitive2d.cxx?rev=1555399&r1=1555398&r2=1555399&view=diff
==============================================================================
--- openoffice/trunk/main/drawinglayer/source/primitive2d/polygonprimitive2d.cxx (original)
+++ openoffice/trunk/main/drawinglayer/source/primitive2d/polygonprimitive2d.cxx Sat Jan 
4 18:18:25 2014
@@ -536,6 +536,8 @@ namespace drawinglayer
 				const double fPolyLength(basegfx::tools::getLength(aLocalPolygon));
 				double fStart(0.0);
 				double fEnd(0.0);
+                double fStartOverlap(0.0);
+                double fEndOverlap(0.0);
 
 				if(!getStart().isDefault() && getStart().isActive())
 				{
@@ -544,8 +546,9 @@ namespace drawinglayer
 						aLocalPolygon, getStart().getB2DPolyPolygon(), true, getStart().getWidth(), 
 						fPolyLength, getStart().isCentered() ? 0.5 : 0.0, &fStart);
 
-					// create some overlapping
-					fStart *= 0.8;
+                    // create some overlapping, compromise between straight and peaked markers
+                    // best for marker width 0.3cm and marker line width 0.02cm
+                    fStartOverlap = getStart().getWidth() / 15.0;
 				}
 
 				if(!getEnd().isDefault() && getEnd().isActive())
@@ -556,13 +559,13 @@ namespace drawinglayer
 						fPolyLength, getEnd().isCentered() ? 0.5 : 0.0, &fEnd);
 
 					// create some overlapping
-					fEnd *= 0.8;
+                    fEndOverlap = getEnd().getWidth() / 15.0;
 				}
 
 				if(0.0 != fStart || 0.0 != fEnd)
 				{
 					// build new poly, consume something from old poly
-					aLocalPolygon = basegfx::tools::getSnippetAbsolute(aLocalPolygon, fStart, fPolyLength
- fEnd, fPolyLength);
+                    aLocalPolygon = basegfx::tools::getSnippetAbsolute(aLocalPolygon, fStart-fStartOverlap,
fPolyLength - fEnd + fEndOverlap, fPolyLength);
 				}
 			}
 

Modified: openoffice/trunk/main/extras/source/palettes/standard.soe
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/palettes/standard.soe?rev=1555399&r1=1555398&r2=1555399&view=diff
==============================================================================
--- openoffice/trunk/main/extras/source/palettes/standard.soe (original)
+++ openoffice/trunk/main/extras/source/palettes/standard.soe Sat Jan  4 18:18:25 2014
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:marker-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style"
xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table"
xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta"
xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg"
xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d"
xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form"
xmlns:script="http://openoffice.org/2000/script">
- <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20"/>
- <draw:marker draw:name="Square" svg:viewBox="0 0 10 10" svg:d="m0 0h10v10h-10"/>
- <draw:marker draw:name="Small Arrow" svg:viewBox="0 0 1321 3493" svg:d="m1321 3493h-1321l702-3493z"/>
- <draw:marker draw:name="Dimension Lines" svg:viewBox="0 0 836 110" svg:d="m0 0h278 278
280v36 36 38h-278-278-280v-36-36z"/>
- <draw:marker draw:name="Double Arrow" svg:viewBox="0 0 1131 1918" svg:d="m737 1131h394l-564-1131-567
1131h398l-398 787h1131z"/>
- <draw:marker draw:name="Rounded short Arrow" svg:viewBox="0 0 1013 1130" svg:d="m1009
1050-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 17 13 21 4h903l21-4 21-13
9-21 4-21v-8z"/>
- <draw:marker draw:name="Symmetric Arrow" svg:viewBox="0 0 1131 902" svg:d="m564 0-564
902h1131z"/>
- <draw:marker draw:name="Line Arrow" svg:viewBox="0 0 1122 2243" svg:d="m0 2108v17 17l12
42 30 34 38 21 43 4 29-8 30-21 25-26 13-34 343-1532 339 1520 13 42 29 34 39 21 42 4 42-12
34-30 21-42v-39-12l-4 4-440-1998-9-42-25-39-38-25-43-8-42 8-38 25-26 39-8 42z"/>
- <draw:marker draw:name="Rounded large Arrow" svg:viewBox="0 0 1131 2256" svg:d="m1127
2120-449-2006-9-42-25-39-38-25-38-8-43 8-38 25-25 39-9 42-449 2006v13l-4 9 9 42 25 38 38 25
42 9h903l42-9 38-25 26-38 8-42v-9z"/>
- <draw:marker draw:name="Circle" svg:viewBox="0 0 1131 1131" svg:d="m462 1118-102-29-102-51-93-72-72-93-51-102-29-102-13-105
13-102 29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 102
29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z"/>
- <draw:marker draw:name="Square 45" svg:viewBox="0 0 1131 1131" svg:d="m0 564 564 567
567-567-567-564z"/>
- <draw:marker draw:name="Arrow concave" svg:viewBox="0 0 1131 1580" svg:d="m1013 1491
118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z"/>
+ <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z" />
+ <draw:marker draw:name="Square" svg:viewBox="0 0 10 10" svg:d="M0 0h10v10h-10z" />
+ <draw:marker draw:name="Small Arrow" svg:viewBox="0 0 1321 3493" svg:d="M1321 3493h-1321l661-3493z"/>
+ <draw:marker draw:name="Dimension Lines" svg:viewBox="0 0 836 110" svg:d="M0 0h278 278
280v36 36 38h-278-278-280v-36-36z" />
+ <draw:marker draw:name="Double Arrow" svg:viewBox="0 0 1131 1918" svg:d="M737 1131h394l-564-1131-567
1131h398l-398 787h1131z" />
+ <draw:marker draw:name="Rounded short Arrow" svg:viewBox="0 0 1013 1130" svg:d="M1009
1050l-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 17 13 21 4h903l21-4 21-13
9-21 4-21v-8z" />
+ <draw:marker draw:name="Symmetric Arrow" svg:viewBox="0 0 1131 902" svg:d="M564 0l-564
902h1131z" />
+ <draw:marker draw:name="Line Arrow" svg:viewBox="0 0 1122 2243" svg:d="M0 2108v17 17l12
42 30 34 38 21 43 4 29-8 30-21 25-26 13-34 343-1532 339 1520 13 42 29 34 39 21 42 4 42-12
34-30 21-42v-39-12l-4 4-440-1998-9-42-25-39-38-25-43-8-42 8-38 25-26 39-8 42z" />
+ <draw:marker draw:name="Rounded large Arrow" svg:viewBox="0 0 1131 2256" svg:d="M1127
2120l-449-2006-9-42-25-39-38-25-38-8-43 8-38 25-25 39-9 42-449 2006v13l-4 9 9 42 25 38 38
25 42 9h903l42-9 38-25 26-38 8-42v-9z" />
+ <draw:marker draw:name="Circle" svg:viewBox="0 0 1131 1131" svg:d="M462 1118l-102-29-102-51-93-72-72-93-51-102-29-102-13-105
13-102 29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 102
29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z" />
+ <draw:marker draw:name="Square 45" svg:viewBox="0 0 1131 1131" svg:d="M0 564l564 567
567-567-567-564z" />
+ <draw:marker draw:name="Arrow concave" svg:viewBox="0 0 1131 1580" svg:d="M1013 1491l118
89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z"></draw:marker>
+ <draw:marker draw:name="Short line Arrow" svg:viewBox="0 0 3000 3000" svg:d="M1500 0l1500
2789v211h-114l-1286-2392v2392h-200v-2392l-1286 2392h-114v-211z"></draw:marker>
+ <draw:marker draw:name="Triangle unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 0l1500
3000h-3000zM1500 447l-1176 2353h2353z"></draw:marker>
+ <draw:marker draw:name="Diamond unfilled" svg:viewBox="0 0 3000 6000" svg:d="M1500 0l1500
3000-1500 3000-1500-3000zM1500 447l-1276 2553 1276 2553 1276-2553z"></draw:marker>
+ <draw:marker draw:name="Diamond" svg:viewBox="0 0 3000 6000" svg:d="M1500 0l1500 3000-1500
3000-1500-3000z"></draw:marker>
+ <draw:marker draw:name="Circle unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500 3000c-276
0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 201-750 310-411 549-549 474-201 750-201
511 63 750 201 411 310 549 549 201 474 201 750-63 511-201 750-310 411-549 549-474 201-750
201zM1500 2800c-239 0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356
476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 174 650-55
443-174 650-269 356-476 476c-207 119-411 174-650 174z"></draw:marker>
+ <draw:marker draw:name="Square 45 unfilled" svg:viewBox="0 0 3000 3000" svg:d="M1500
3000l-1500-1500 1500-1500 1500 1500zM1500 2715l-1215-1215 1215-1215 1215 1215z"></draw:marker>
+ <draw:marker draw:name="Square unfilled" svg:viewBox="0 0 300 300" svg:d="M0 0h300v300h-300zM20
20h260v260h-260z"></draw:marker>
+ <draw:marker draw:name="Half Circle unfilled" svg:viewBox="0 0 15000 8746" svg:d="M14971
0c21 229 29 423 29 653 0 690-79 1328-244 1943-165 614-416 1206-761 1804-345 597-733 1110-1183
1560-451 450-964 837-1562 1182s-1190 596-1806 760c-600 161-1223 240-1894 244v600h-100v-600c-671-4-1294-83-1894-244-616-164-1208-415-1806-760s-1111-732-1562-1182c-450-450-838-963-1183-1560-345-598-596-1190-761-1804-165-615-244-1253-244-1943
0-230 8-424 29-653l298 26 299 26c-18 211-26 390-26 601 0 635 72 1222 224 1787 151 566 383
1110 700 1659 318 550 674 1022 1088 1437 415 414 888 769 1438 1087 550 317 1095 548 1661 700
566 151 1154 223 1789 223s1223-72 1789-223c566-152 1111-383 1661-700 550-318 1023-673 1438-1087
414-415 770-887 1088-1437 317-549 549-1093 700-1659 152-565 224-1152 224-1787 0-211-8-390-26-601l299-26z"
/>
 </office:marker-table>



Mime
View raw message