[mapguide-commits] r1363 - in trunk/MgDev: Common/MdfModel
Common/MdfParser Common/Schema Common/Stylization
UnitTest/TestData/Symbology
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Mar 23 19:47:20 EDT 2007
Author: waltweltonlair
Date: 2007-03-23 19:47:20 -0400 (Fri, 23 Mar 2007)
New Revision: 1363
Modified:
trunk/MgDev/Common/MdfModel/Image.cpp
trunk/MgDev/Common/MdfModel/Image.h
trunk/MgDev/Common/MdfModel/Text.cpp
trunk/MgDev/Common/MdfModel/Text.h
trunk/MgDev/Common/MdfParser/IOImage.cpp
trunk/MgDev/Common/MdfParser/IOText.cpp
trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd
trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp
trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
trunk/MgDev/UnitTest/TestData/Symbology/MTYP1500a.sd
trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf
trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompoundSymbol.sd
trunk/MgDev/UnitTest/TestData/Symbology/MdfTestSimpleSymbol.sd
trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.ldf
trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLinesCrossTick.ldf
trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.ldf
trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPointsParam.ldf
trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.ldf
trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd
Log:
Update the symbolization schema with two new properties:
Text.HeightScalable
Image.SizeScalable
These are similar to Path.LineWeightScalable. By default these are true,
which means the text height / image size will scale if the symbol instance
specifies a scale. If set to false then the symbol instance scale is not
ignored for these properties.
Modified: trunk/MgDev/Common/MdfModel/Image.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/Image.cpp 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/MdfModel/Image.cpp 2007-03-23 23:47:20 UTC (rev 1363)
@@ -123,6 +123,24 @@
// PURPOSE:
// PARAMETERS:
//-------------------------------------------------------------------------
+const MdfString& Image::GetSizeScalable() const
+{
+ return this->m_sSizeScalable;
+}
+
+//-------------------------------------------------------------------------
+// PURPOSE:
+// PARAMETERS:
+//-------------------------------------------------------------------------
+void Image::SetSizeScalable(const MdfString& sizeScalable)
+{
+ this->m_sSizeScalable = sizeScalable;
+}
+
+//-------------------------------------------------------------------------
+// PURPOSE:
+// PARAMETERS:
+//-------------------------------------------------------------------------
const MdfString& Image::GetPositionX() const
{
return this->m_sPositionX;
Modified: trunk/MgDev/Common/MdfModel/Image.h
===================================================================
--- trunk/MgDev/Common/MdfModel/Image.h 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/MdfModel/Image.h 2007-03-23 23:47:20 UTC (rev 1363)
@@ -46,6 +46,9 @@
const MdfString& GetSizeY() const;
void SetSizeY(const MdfString& sizeY);
+ const MdfString& GetSizeScalable() const;
+ void SetSizeScalable(const MdfString& sizeScalable);
+
const MdfString& GetPositionX() const;
void SetPositionX(const MdfString& positionX);
@@ -68,6 +71,7 @@
MdfString m_sSizeX;
MdfString m_sSizeY;
+ MdfString m_sSizeScalable;
MdfString m_sPositionX;
MdfString m_sPositionY;
Modified: trunk/MgDev/Common/MdfModel/Text.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/Text.cpp 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/MdfModel/Text.cpp 2007-03-23 23:47:20 UTC (rev 1363)
@@ -154,6 +154,24 @@
// PURPOSE:
// PARAMETERS:
//-------------------------------------------------------------------------
+const MdfString& Text::GetHeightScalable() const
+{
+ return this->m_sHeightScalable;
+}
+
+//-------------------------------------------------------------------------
+// PURPOSE:
+// PARAMETERS:
+//-------------------------------------------------------------------------
+void Text::SetHeightScalable(const MdfString& heightScalable)
+{
+ this->m_sHeightScalable = heightScalable;
+}
+
+//-------------------------------------------------------------------------
+// PURPOSE:
+// PARAMETERS:
+//-------------------------------------------------------------------------
const MdfString& Text::GetPositionX() const
{
return this->m_sPositionX;
Modified: trunk/MgDev/Common/MdfModel/Text.h
===================================================================
--- trunk/MgDev/Common/MdfModel/Text.h 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/MdfModel/Text.h 2007-03-23 23:47:20 UTC (rev 1363)
@@ -52,6 +52,9 @@
const MdfString& GetHeight() const;
void SetHeight(const MdfString& height);
+ const MdfString& GetHeightScalable() const;
+ void SetHeightScalable(const MdfString& heightScalable);
+
const MdfString& GetPositionX() const;
void SetPositionX(const MdfString& positionX);
@@ -99,6 +102,7 @@
MdfString m_sUnderlined;
MdfString m_sHeight;
+ MdfString m_sHeightScalable;
MdfString m_sPositionX;
MdfString m_sPositionY;
MdfString m_sAngle;
Modified: trunk/MgDev/Common/MdfParser/IOImage.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOImage.cpp 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/MdfParser/IOImage.cpp 2007-03-23 23:47:20 UTC (rev 1363)
@@ -46,6 +46,7 @@
else IF_STRING_PROPERTY(m_currElemName, image, Reference, ch)
else IF_STRING_PROPERTY(m_currElemName, image, SizeX, ch)
else IF_STRING_PROPERTY(m_currElemName, image, SizeY, ch)
+ else IF_STRING_PROPERTY(m_currElemName, image, SizeScalable, ch)
else IF_STRING_PROPERTY(m_currElemName, image, PositionX, ch)
else IF_STRING_PROPERTY(m_currElemName, image, PositionY, ch)
else IF_STRING_PROPERTY(m_currElemName, image, Angle, ch)
@@ -70,6 +71,7 @@
EMIT_STRING_PROPERTY(fd, image, Reference, !contentOptional)
EMIT_STRING_PROPERTY(fd, image, SizeX, false)
EMIT_STRING_PROPERTY(fd, image, SizeY, false)
+ EMIT_STRING_PROPERTY(fd, image, SizeScalable, true)
EMIT_STRING_PROPERTY(fd, image, PositionX, true)
EMIT_STRING_PROPERTY(fd, image, PositionY, true)
EMIT_STRING_PROPERTY(fd, image, Angle, true)
Modified: trunk/MgDev/Common/MdfParser/IOText.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOText.cpp 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/MdfParser/IOText.cpp 2007-03-23 23:47:20 UTC (rev 1363)
@@ -56,6 +56,7 @@
else IF_STRING_PROPERTY(m_currElemName, text, Italic, ch)
else IF_STRING_PROPERTY(m_currElemName, text, Underlined, ch)
else IF_STRING_PROPERTY(m_currElemName, text, Height, ch)
+ else IF_STRING_PROPERTY(m_currElemName, text, HeightScalable, ch)
else IF_STRING_PROPERTY(m_currElemName, text, PositionX, ch)
else IF_STRING_PROPERTY(m_currElemName, text, PositionY, ch)
else IF_STRING_PROPERTY(m_currElemName, text, Angle, ch)
@@ -81,6 +82,7 @@
EMIT_STRING_PROPERTY(fd, text, Italic, true)
EMIT_STRING_PROPERTY(fd, text, Underlined, true)
EMIT_STRING_PROPERTY(fd, text, Height, true)
+ EMIT_STRING_PROPERTY(fd, text, HeightScalable, true)
EMIT_STRING_PROPERTY(fd, text, PositionX, true)
EMIT_STRING_PROPERTY(fd, text, PositionY, true)
EMIT_STRING_PROPERTY(fd, text, Angle, true)
Modified: trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd 2007-03-23 23:47:20 UTC (rev 1363)
@@ -404,6 +404,11 @@
<xs:documentation>The height of the image, in mm.</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="SizeScalable" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Boolean value which specifies whether the image sizes scale with the symbol. This behavior is independent of the symbol's size context. This must evaluate to True (default) or False.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="PositionX" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>The x-coordinate of the image center in symbol space, in mm.</xs:documentation>
@@ -460,6 +465,11 @@
<xs:documentation>The height of the text, in mm.</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="HeightScalable" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Boolean value which specifies whether the font height scales with the symbol. This behavior is independent of the symbol's size context. This must evaluate to True (default) or False.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="PositionX" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>The x-coordinate of the text in symbol space, in mm. Horizontal alignment of the text box is relative to this coordinate.</xs:documentation>
Modified: trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp 2007-03-23 23:47:20 UTC (rev 1363)
@@ -461,20 +461,20 @@
if (image.GetContent().size())
{
const MdfModel::MdfString& src_u = image.GetContent();
-
+
size_t srclen = src_u.size();
char* src_ascii = new char[srclen];
char* ptr = src_ascii;
for (size_t i=0; i<srclen; i++)
*ptr++ = (char)src_u[i];
-
+
size_t dstlen = Base64::GetDecodedLength(image.GetContent().size());
primitive->pngPtr = new unsigned char[dstlen];
primitive->ownPtr = true;
Base64::Decode((unsigned char*)primitive->pngPtr, src_ascii, srclen);
-
+
delete [] src_ascii;
}
else
@@ -492,10 +492,8 @@
ParseDoubleExpression(image.GetSizeX(), primitive->extent[0]);
ParseDoubleExpression(image.GetSizeY(), primitive->extent[1]);
ParseDoubleExpression(image.GetAngle(), primitive->angle);
+ ParseBooleanExpression(image.GetSizeScalable(), primitive->extentScaleable);
- //TODO: SizeScaleable
- //ParseBooleanExpression(image.GetExtentScaleable(), primitive->extentScaleable);
-
primitive->cacheable = !(primitive->position[0].expression ||
primitive->position[1].expression ||
primitive->extent[0].expression ||
@@ -517,6 +515,7 @@
ParseDoubleExpression(text.GetPositionX(), primitive->position[0]);
ParseDoubleExpression(text.GetPositionY(), primitive->position[1]);
ParseDoubleExpression(text.GetLineSpacing(), primitive->lineSpacing);
+ ParseBooleanExpression(text.GetHeightScalable(), primitive->sizeScaleable);
ParseBooleanExpression(text.GetUnderlined(), primitive->underlined);
ParseBooleanExpression(text.GetBold(), primitive->bold);
ParseBooleanExpression(text.GetItalic(), primitive->italic);
@@ -525,9 +524,6 @@
ParseStringExpression(text.GetHorizontalAlignment(), primitive->hAlignment);
ParseStringExpression(text.GetVerticalAlignment(), primitive->vAlignment);
ParseStringExpression(text.GetJustification(), primitive->justification);
-
- //TODO: SizeScaleable
- //ParseBooleanExpression(text.GetSizeScaleable(), primitive->sizeScaleable);
primitive->cacheable = !(primitive->textExpr.expression ||
primitive->fontExpr.expression ||
@@ -633,7 +629,7 @@
if (def == NULL)
return;
- //remember the current symbol resource id, in case it references an
+ //remember the current symbol resource id, in case it references an
//attached png image resource
isRef = true;
m_resIdStack.push_back(ref.c_str());
@@ -679,7 +675,7 @@
if (def == NULL)
continue;
- //remember the current symbol resource id, in case it references an
+ //remember the current symbol resource id, in case it references an
//attached png image resource
isRef = true;
m_resIdStack.push_back(ref.c_str());
@@ -701,7 +697,7 @@
ParseDoubleExpression(instance->GetInsertionOffsetY(), m_symbolization->absOffset[1]);
def->AcceptVisitor(*this);
-
+
result.push_back(m_symbolization);
if (isRef)
Modified: trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp 2007-03-23 23:47:20 UTC (rev 1363)
@@ -106,7 +106,7 @@
if (!cxt->useBox)
{
ret->geometry->Transform(*cxt->xform, ret->weight);
-
+
SE_Bounds* seb = ret->geometry->xf_bounds();
//TODO: here we would implement rotating calipers algorithm to get
@@ -186,12 +186,11 @@
ret->tdef.font().style() = (RS_FontStyle_Mask)style;
ret->tdef.font().name() = fontExpr.evaluate(cxt->exec);
-
- //TODO: SizeScaleable -- remove the true
- if (true || sizeScaleable.evaluate(cxt->exec))
+
+ if (sizeScaleable.evaluate(cxt->exec))
ret->tdef.font().height() = size.evaluate(cxt->exec)*0.001*fabs(cxt->xform->y1)/cxt->mm2px; //convert mm to meters which is what RS_TextDef expects
else
- ret->tdef.font().height() = size.evaluate(cxt->exec) * 0.001; //size is not scaleable -- only convert from mm to meters.
+ ret->tdef.font().height() = size.evaluate(cxt->exec)*0.001; //size is not scaleable -- only convert from mm to meters.
ret->tdef.linespace() = lineSpacing.evaluate(cxt->exec);
@@ -275,8 +274,7 @@
ret->position[1] = position[1].evaluate(cxt->exec);
cxt->xform->transform(ret->position[0], ret->position[1]);
- //TODO: SizeScaleable -- remove the true
- if (true || extentScaleable.evaluate(cxt->exec))
+ if (extentScaleable.evaluate(cxt->exec))
{
ret->extent[0] = extent[0].evaluate(cxt->exec)*cxt->xform->x0;
ret->extent[1] = extent[1].evaluate(cxt->exec)*cxt->xform->y1;
@@ -430,7 +428,7 @@
SE_RenderText* rt = (SE_RenderText*)rsym;
growxf.transform(rt->position[0], rt->position[1]);
rt->tdef.font().height() *= growxf.y1;
- for (int j=0; j<4; j++)
+ for (int j=0; j<4; j++)
growxf.transform(rt->bounds[j].x, rt->bounds[j].y);
break;
}
@@ -440,7 +438,7 @@
growxf.transform(rr->position[0], rr->position[1]);
rr->extent[0] *= growxf.x0;
rr->extent[1] *= growxf.y1;
- for (int j=0; j<4; j++)
+ for (int j=0; j<4; j++)
growxf.transform(rr->bounds[j].x, rr->bounds[j].y);
break;
}
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MTYP1500a.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MTYP1500a.sd 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MTYP1500a.sd 2007-03-23 23:47:20 UTC (rev 1363)
@@ -13,7 +13,7 @@
</Path>
</Graphics>
<LineUsage>
- <VertexControl>OverlapWrap</VertexControl>
+ <VertexControl>'OverlapWrap'</VertexControl>
<Repeat>24</Repeat>
</LineUsage>
<ParameterDefinition/>
@@ -28,7 +28,7 @@
</Path>
</Graphics>
<LineUsage>
- <VertexControl>OverlapWrap</VertexControl>
+ <VertexControl>'OverlapWrap'</VertexControl>
<StartOffset>28</StartOffset>
<Repeat>24</Repeat>
</LineUsage>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf 2007-03-23 23:47:20 UTC (rev 1363)
@@ -39,6 +39,7 @@
<DrawLast>False</DrawLast>
<CheckExclusionRegion>False</CheckExclusionRegion>
<AddToExclusionRegion>False</AddToExclusionRegion>
+ <PositioningAlgorithm>'Default'</PositioningAlgorithm>
</SymbolInstance>
<SymbolInstance>
<CompoundSymbolDefinition>
@@ -55,7 +56,7 @@
<FillColor>ffff0000</FillColor>
<LineColor>%OUTLINE%</LineColor>
<LineWeight>2*(%THICKNESS% + 1)</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
+ <LineWeightScalable>True</LineWeightScalable>
<LineCap>'None'</LineCap>
<LineJoin>'None'</LineJoin>
<LineMiterLimit>5.0</LineMiterLimit>
@@ -65,6 +66,7 @@
<Content>R0lGODlhcgGSALMAAAQCAEMmCZtuMFQxDS8b</Content>
<SizeX>100.0</SizeX>
<SizeY>100.0</SizeY>
+ <SizeScalable>True</SizeScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
@@ -74,24 +76,26 @@
<Reference>Library://Image.jpg</Reference>
<SizeX>100.0</SizeX>
<SizeY>100.0</SizeY>
+ <SizeScalable>True</SizeScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
</Image>
<Text>
<ResizeControl>'AddToResizeBox'</ResizeControl>
- <String>Some text</String>
- <FontName>Arial</FontName>
- <Bold>false</Bold>
- <Italic>false</Italic>
- <Underlined>false</Underlined>
+ <String>'Some text'</String>
+ <FontName>'Arial'</FontName>
+ <Bold>False</Bold>
+ <Italic>False</Italic>
+ <Underlined>False</Underlined>
<Height>10.0</Height>
+ <HeightScalable>True</HeightScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
- <HorizontalAlignment>Center</HorizontalAlignment>
- <VerticalAlignment>Baseline</VerticalAlignment>
- <Justification>Center</Justification>
+ <HorizontalAlignment>'Center'</HorizontalAlignment>
+ <VerticalAlignment>'Baseline'</VerticalAlignment>
+ <Justification>'Center'</Justification>
<LineSpacing>15.0</LineSpacing>
<TextColor>%TEXTCOLOR%</TextColor>
<GhostColor>ffffffff</GhostColor>
@@ -132,7 +136,7 @@
<FillColor>ffff0000</FillColor>
<LineColor>ff00ff00</LineColor>
<LineWeight>1.0</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
+ <LineWeightScalable>True</LineWeightScalable>
<LineCap>'None'</LineCap>
<LineJoin>'None'</LineJoin>
<LineMiterLimit>5.0</LineMiterLimit>
@@ -200,6 +204,7 @@
<DrawLast>False</DrawLast>
<CheckExclusionRegion>False</CheckExclusionRegion>
<AddToExclusionRegion>False</AddToExclusionRegion>
+ <PositioningAlgorithm>'Default'</PositioningAlgorithm>
</SymbolInstance>
</CompositeSymbolization>
</CompositeRule>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompoundSymbol.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompoundSymbol.sd 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompoundSymbol.sd 2007-03-23 23:47:20 UTC (rev 1363)
@@ -13,7 +13,7 @@
<FillColor>ffff0000</FillColor>
<LineColor>%OUTLINE%</LineColor>
<LineWeight>2*(%THICKNESS% + 1)</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
+ <LineWeightScalable>True</LineWeightScalable>
<LineCap>'None'</LineCap>
<LineJoin>'None'</LineJoin>
<LineMiterLimit>5.0</LineMiterLimit>
@@ -23,6 +23,7 @@
<Content>R0lGODlhcgGSALMAAAQCAEMmCZtuMFQxDS8b</Content>
<SizeX>100.0</SizeX>
<SizeY>100.0</SizeY>
+ <SizeScalable>True</SizeScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
@@ -32,24 +33,26 @@
<Reference>Library://Image.jpg</Reference>
<SizeX>100.0</SizeX>
<SizeY>100.0</SizeY>
+ <SizeScalable>True</SizeScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
</Image>
<Text>
<ResizeControl>'AddToResizeBox'</ResizeControl>
- <String>Some text</String>
- <FontName>Arial</FontName>
- <Bold>false</Bold>
- <Italic>false</Italic>
- <Underlined>false</Underlined>
+ <String>'Some text'</String>
+ <FontName>'Arial'</FontName>
+ <Bold>False</Bold>
+ <Italic>False</Italic>
+ <Underlined>False</Underlined>
<Height>10.0</Height>
+ <HeightScalable>True</HeightScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
- <HorizontalAlignment>Center</HorizontalAlignment>
- <VerticalAlignment>Baseline</VerticalAlignment>
- <Justification>Center</Justification>
+ <HorizontalAlignment>'Center'</HorizontalAlignment>
+ <VerticalAlignment>'Baseline'</VerticalAlignment>
+ <Justification>'Center'</Justification>
<LineSpacing>15.0</LineSpacing>
<TextColor>%TEXTCOLOR%</TextColor>
<GhostColor>ffffffff</GhostColor>
@@ -90,7 +93,7 @@
<FillColor>ffff0000</FillColor>
<LineColor>ff00ff00</LineColor>
<LineWeight>1.0</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
+ <LineWeightScalable>True</LineWeightScalable>
<LineCap>'None'</LineCap>
<LineJoin>'None'</LineJoin>
<LineMiterLimit>5.0</LineMiterLimit>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MdfTestSimpleSymbol.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MdfTestSimpleSymbol.sd 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MdfTestSimpleSymbol.sd 2007-03-23 23:47:20 UTC (rev 1363)
@@ -9,7 +9,7 @@
<FillColor>ffff0000</FillColor>
<LineColor>%OUTLINE%</LineColor>
<LineWeight>2*(%THICKNESS% + 1)</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
+ <LineWeightScalable>True</LineWeightScalable>
<LineCap>'None'</LineCap>
<LineJoin>'None'</LineJoin>
<LineMiterLimit>5.0</LineMiterLimit>
@@ -19,6 +19,7 @@
<Content>R0lGODlhcgGSALMAAAQCAEMmCZtuMFQxDS8b</Content>
<SizeX>100.0</SizeX>
<SizeY>100.0</SizeY>
+ <SizeScalable>True</SizeScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
@@ -28,24 +29,26 @@
<Reference>Library://Image.jpg</Reference>
<SizeX>100.0</SizeX>
<SizeY>100.0</SizeY>
+ <SizeScalable>True</SizeScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
</Image>
<Text>
<ResizeControl>'AddToResizeBox'</ResizeControl>
- <String>Some text</String>
- <FontName>Arial</FontName>
- <Bold>false</Bold>
- <Italic>false</Italic>
- <Underlined>false</Underlined>
+ <String>'Some text'</String>
+ <FontName>'Arial'</FontName>
+ <Bold>False</Bold>
+ <Italic>False</Italic>
+ <Underlined>False</Underlined>
<Height>10.0</Height>
+ <HeightScalable>True</HeightScalable>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
<Angle>0.0</Angle>
- <HorizontalAlignment>Center</HorizontalAlignment>
- <VerticalAlignment>Baseline</VerticalAlignment>
- <Justification>Center</Justification>
+ <HorizontalAlignment>'Center'</HorizontalAlignment>
+ <VerticalAlignment>'Baseline'</VerticalAlignment>
+ <Justification>'Center'</Justification>
<LineSpacing>15.0</LineSpacing>
<TextColor>%TEXTCOLOR%</TextColor>
<GhostColor>ffffffff</GhostColor>
@@ -86,7 +89,7 @@
<FillColor>ffff0000</FillColor>
<LineColor>ff00ff00</LineColor>
<LineWeight>1.0</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
+ <LineWeightScalable>True</LineWeightScalable>
<LineCap>'None'</LineCap>
<LineJoin>'None'</LineJoin>
<LineMiterLimit>5.0</LineMiterLimit>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.ldf 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.ldf 2007-03-23 23:47:20 UTC (rev 1363)
@@ -6,8 +6,6 @@
<FeatureNameType>FeatureClass</FeatureNameType>
<Geometry>Geometry</Geometry>
<VectorScaleRange>
- <MinScale>0</MinScale>
- <MaxScale>1000000000000</MaxScale>
<CompositeTypeStyle>
<CompositeRule>
<LegendLabel/>
@@ -15,8 +13,8 @@
<SymbolInstance>
<SymbolReference>Library://Symbology/Symbols/LineSymbol.SymbolDefinition</SymbolReference>
<ParameterOverrides/>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
+ <ScaleX>1.0</ScaleX>
+ <ScaleY>1.0</ScaleY>
<SizeContext>DeviceUnits</SizeContext>
</SymbolInstance>
</CompositeSymbolization>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLinesCrossTick.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLinesCrossTick.ldf 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLinesCrossTick.ldf 2007-03-23 23:47:20 UTC (rev 1363)
@@ -6,8 +6,6 @@
<FeatureNameType>FeatureClass</FeatureNameType>
<Geometry>Geometry</Geometry>
<VectorScaleRange>
- <MinScale>0</MinScale>
- <MaxScale>1000000000000</MaxScale>
<CompositeTypeStyle>
<CompositeRule>
<LegendLabel/>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.ldf 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.ldf 2007-03-23 23:47:20 UTC (rev 1363)
@@ -18,8 +18,6 @@
</PropertyMapping>
<Geometry>Data</Geometry>
<VectorScaleRange>
- <MinScale>0</MinScale>
- <MaxScale>1000000000000</MaxScale>
<CompositeTypeStyle>
<CompositeRule>
<LegendLabel/>
@@ -27,8 +25,8 @@
<SymbolInstance>
<SymbolReference>Library://Symbology/Symbols/PointSymbol.SymbolDefinition</SymbolReference>
<ParameterOverrides/>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
+ <ScaleX>1.0</ScaleX>
+ <ScaleY>1.0</ScaleY>
<SizeContext>DeviceUnits</SizeContext>
<DrawLast>False</DrawLast>
<CheckExclusionRegion>False</CheckExclusionRegion>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPointsParam.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPointsParam.ldf 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPointsParam.ldf 2007-03-23 23:47:20 UTC (rev 1363)
@@ -18,8 +18,6 @@
</PropertyMapping>
<Geometry>Data</Geometry>
<VectorScaleRange>
- <MinScale>0</MinScale>
- <MaxScale>1000000000000</MaxScale>
<CompositeTypeStyle>
<CompositeRule>
<LegendLabel/>
@@ -33,8 +31,8 @@
<ParameterValue>FF00FF00</ParameterValue>
</Override>
</ParameterOverrides>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
+ <ScaleX>1.0</ScaleX>
+ <ScaleY>1.0</ScaleY>
<SizeContext>DeviceUnits</SizeContext>
<DrawLast>False</DrawLast>
<CheckExclusionRegion>False</CheckExclusionRegion>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.ldf 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.ldf 2007-03-23 23:47:20 UTC (rev 1363)
@@ -22,8 +22,6 @@
</PropertyMapping>
<Geometry>Data</Geometry>
<VectorScaleRange>
- <MinScale>0</MinScale>
- <MaxScale>1000000000000</MaxScale>
<CompositeTypeStyle>
<CompositeRule>
<LegendLabel/>
@@ -31,8 +29,8 @@
<SymbolInstance>
<SymbolReference>Library://Symbology/Symbols/LineSymbol.SymbolDefinition</SymbolReference>
<ParameterOverrides/>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
+ <ScaleX>1.0</ScaleX>
+ <ScaleY>1.0</ScaleY>
<SizeContext>DeviceUnits</SizeContext>
<DrawLast>False</DrawLast>
<CheckExclusionRegion>False</CheckExclusionRegion>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd 2007-03-23 22:33:54 UTC (rev 1362)
+++ trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd 2007-03-23 23:47:20 UTC (rev 1363)
@@ -40,15 +40,15 @@
</Parameter>
<Parameter>
<Identifier>THICKNESS</Identifier>
- <DefaultValue>-.5</DefaultValue>
+ <DefaultValue>-0.5</DefaultValue>
<DisplayName>Line Thickness</DisplayName>
<Description>The thickness of the line in mm...minus 2 and halved</Description>
<AllowedValues>
- <Value>-1</Value>
- <Value>-.5</Value>
- <Value>0</Value>
- <Value>.5</Value>
- <Value>1</Value>
+ <Value>-1.0</Value>
+ <Value>-0.5</Value>
+ <Value>0.0</Value>
+ <Value>0.5</Value>
+ <Value>1.0</Value>
</AllowedValues>
</Parameter>
</ParameterDefinition>
More information about the mapguide-commits
mailing list