[fusion-commits] r2779 - in sandbox/redline_advanced_stylization/widgets/Redline: classes templates
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Wed Sep 11 23:26:31 PDT 2013
Author: jng
Date: 2013-09-11 23:26:30 -0700 (Wed, 11 Sep 2013)
New Revision: 2779
Modified:
sandbox/redline_advanced_stylization/widgets/Redline/classes/markupmanager.php
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_box.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_cross.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dash.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dolmit.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_hex.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_135.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_45.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_90.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_net.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_sacncr.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_solid.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_square.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/area_steel.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_border.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dash.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdot.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdotdot.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_divide.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_fenceline1.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_rail.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/line_solid.templ
sandbox/redline_advanced_stylization/widgets/Redline/templates/markuplayerdefinition_advanced.xml
Log:
#595: More redline changes for Advanced Stylization.
- Re-route GetLinePatternGeometry() to GetBorderPatternGeometry() in MarkupManager
- Add template name to the description of each pattern template to easily identify it for debugging purposes
Modified: sandbox/redline_advanced_stylization/widgets/Redline/classes/markupmanager.php
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/classes/markupmanager.php 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/classes/markupmanager.php 2013-09-12 06:26:30 UTC (rev 2779)
@@ -374,25 +374,7 @@
static function GetLinePatternGeometry($pattern)
{
- if (strcmp($pattern, "Solid") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_solid.templ");
- } else if (strcmp($pattern, "Border") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_border.templ");
- } else if (strcmp($pattern, "Dash") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_dash.templ");
- } else if (strcmp($pattern, "DashDot") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_dashdot.templ");
- } else if (strcmp($pattern, "DashDotDot") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_dashdotdot.templ");
- } else if (strcmp($pattern, "Divide") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_divide.templ");
- } else if (strcmp($pattern, "Fenceline1") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_fenceline1.templ");
- } else if (strcmp($pattern, "Rail") == 0) {
- return file_get_contents(dirname(__FILE__)."/../templates/line_rail.templ");
- } else {
- throw new Exception("Unsupported or unrecognized line pattern: $pattern");
- }
+ return MarkupManager::GetBorderPatternGeometry($pattern);
}
static function GetLineThickness($thickness, $units)
@@ -467,6 +449,8 @@
return file_get_contents(dirname(__FILE__)."/../templates/line_divide.templ");
} else if (strcmp($pattern, "FENCELINE1") == 0) {
return file_get_contents(dirname(__FILE__)."/../templates/line_fenceline1.templ");
+ } else {
+ throw new Exception("Unsupported or unrecognized border pattern: $pattern");
}
}
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_box.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_box.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_box.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<CompoundSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_box.templ</Description>
<SimpleSymbol>
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_cross.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_cross.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_cross.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<CompoundSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_cross.templ</Description>
<SimpleSymbol>
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dash.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dash.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dash.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_dash.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 0.125 M 0.125,0.125 h 0.125</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dolmit.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dolmit.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_dolmit.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<CompoundSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_dolmit.templ</Description>
<SimpleSymbol>
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_hex.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_hex.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_hex.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<CompoundSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_hex.templ</Description>
<SimpleSymbol>
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_line.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 10.0</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_135.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_135.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_135.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_line_135.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 10.0</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_45.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_45.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_45.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_line_45.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 10.0</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_90.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_90.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_line_90.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_line_90.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 10.0</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_net.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_net.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_net.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -2,6 +2,7 @@
<SymbolInstance>
<CompoundSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_net.templ</Description>
<SimpleSymbol>
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_sacncr.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_sacncr.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_sacncr.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<CompoundSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_sacncr.templ</Description>
<SimpleSymbol>
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_solid.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_solid.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_solid.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_solid.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 100.0 v 100.0 h -100.0 z</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_square.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_square.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_square.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<CompoundSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_square.templ</Description>
<SimpleSymbol>
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/area_steel.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/area_steel.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/area_steel.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>AREA_SYMBOL</Name>
+ <Description>area_steel.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 10.0 M 0.04419,0.04419 h 10.0</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_border.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_border.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_border.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,6 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
- <Description>Border __ __ . __ __ . __ __ . __ __ . __ __ .</Description>
+ <Description>line_border.templ</Description>
<Graphics>
<Path>
<Geometry>M 0,0 L 5,0 M 7.5,0 L 12.5,0 M 15,0 L 15,0 </Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dash.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dash.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dash.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,6 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
- <Description>Dash __ __ __ __ __ __ __ __</Description>
+ <Description>line_dash.templ</Description>
<Graphics>
<Path>
<Geometry>M 0,0 L 6,0</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdot.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdot.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdot.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,6 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
- <Description>Dash dot __ . __ . __ . __ . __ . __ . __ . __</Description>
+ <Description>line_dashdot.templ</Description>
<Graphics>
<Path>
<Geometry>M 0,0 L 5,0 M 7.5,0 L 7.5,0 </Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdotdot.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdotdot.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_dashdotdot.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
+ <Description>line_dashdotdot.templ</Description>
<Graphics>
<Path>
<Geometry>M 0,0 L 40,0 M 80,0 L 120,0 M 160,0 L 200,0 M 240,0 L 320,0 </Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_divide.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_divide.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_divide.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,6 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
- <Description>Divide ____ . . ____ . . ____ . . ____ . . ____</Description>
+ <Description>line_divide.templ</Description>
<Graphics>
<Path>
<Geometry>M 0,0 L 5,0 M 7.5,0 L 7.5,0 M 10,0 L 10,0 </Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_fenceline1.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_fenceline1.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_fenceline1.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
+ <Description>line_fenceline1.templ</Description>
<Graphics>
<Path>
<Geometry>M 2.5,0 A 1,1 0 0 0 4.5,-3.67394039744206e-016 M 4.5,-3.67394039744206e-016 A 1,1 0 0 0 2.5,2.44929359829471e-016 </Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_rail.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_rail.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_rail.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,5 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
+ <Description>line_rail.templ</Description>
<Graphics>
<Path>
<Geometry>M 2.0,0 l 0,2.5 M 2.0,0 l 0,-2.5 </Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/line_solid.templ
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/line_solid.templ 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/line_solid.templ 2013-09-12 06:26:30 UTC (rev 2779)
@@ -1,6 +1,6 @@
<SimpleSymbolDefinition>
<Name>LINE_SYMBOL</Name>
- <Description>SOLID</Description>
+ <Description>line_solid.templ</Description>
<Graphics>
<Path>
<Geometry>M 0.0,0.0 h 4.0</Geometry>
Modified: sandbox/redline_advanced_stylization/widgets/Redline/templates/markuplayerdefinition_advanced.xml
===================================================================
--- sandbox/redline_advanced_stylization/widgets/Redline/templates/markuplayerdefinition_advanced.xml 2013-09-12 06:07:50 UTC (rev 2778)
+++ sandbox/redline_advanced_stylization/widgets/Redline/templates/markuplayerdefinition_advanced.xml 2013-09-12 06:26:30 UTC (rev 2779)
@@ -147,7 +147,6 @@
<ParameterValue>'Round'</ParameterValue>
</Override>
</ParameterOverrides>
- <AddToExclusionRegion>true</AddToExclusionRegion>
<UsageContext>Point</UsageContext>
<GeometryContext>Point</GeometryContext>
</SymbolInstance>
@@ -407,8 +406,8 @@
</Override>
</ParameterOverrides>
<DrawLast>true</DrawLast>
- <CheckExclusionRegion>true</CheckExclusionRegion>
- <AddToExclusionRegion>true</AddToExclusionRegion>
+ <CheckExclusionRegion>false</CheckExclusionRegion>
+ <AddToExclusionRegion>false</AddToExclusionRegion>
<PositioningAlgorithm>'EightSurrounding'</PositioningAlgorithm>
<UsageContext>Point</UsageContext>
<GeometryContext>Point</GeometryContext>
@@ -686,6 +685,8 @@
</Override>
</ParameterOverrides>
<DrawLast>true</DrawLast>
+ <CheckExclusionRegion>false</CheckExclusionRegion>
+ <AddToExclusionRegion>false</AddToExclusionRegion>
<PositioningAlgorithm>'PathLabels'</PositioningAlgorithm>
<UsageContext>Line</UsageContext>
<GeometryContext>LineString</GeometryContext>
@@ -1095,8 +1096,8 @@
</Override>
</ParameterOverrides>
<DrawLast>true</DrawLast>
- <CheckExclusionRegion>true</CheckExclusionRegion>
- <AddToExclusionRegion>true</AddToExclusionRegion>
+ <CheckExclusionRegion>false</CheckExclusionRegion>
+ <AddToExclusionRegion>false</AddToExclusionRegion>
<PositioningAlgorithm>'Default'</PositioningAlgorithm>
<GeometryContext>Polygon</GeometryContext>
</SymbolInstance>
More information about the fusion-commits
mailing list