[mapguide-commits] r1308 - in trunk/MgDev: Common/MdfModel
Common/MdfParser Common/Schema Common/Stylization
UnitTest/TestData/Symbology
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Mar 20 20:47:38 EDT 2007
Author: waltweltonlair
Date: 2007-03-20 20:47:37 -0400 (Tue, 20 Mar 2007)
New Revision: 1308
Removed:
trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.cpp
trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.h
Modified:
trunk/MgDev/Common/MdfModel/CompositeSymbolization.cpp
trunk/MgDev/Common/MdfModel/CompositeSymbolization.h
trunk/MgDev/Common/MdfModel/SymbolInstance.cpp
trunk/MgDev/Common/MdfModel/SymbolInstance.h
trunk/MgDev/Common/MdfParser/IOCompositeSymbolization.cpp
trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp
trunk/MgDev/Common/MdfParser/Makefile.am
trunk/MgDev/Common/MdfParser/MdfParser.vcproj
trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd
trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd
trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp
trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf
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
Log:
One last symbolization schema update. This submission makes the following
changes:
* move CompositeSymbolization::ParameterOverrides into SymbolInstance
=> this lets someone use the same SymbolDefinition multiple times in
a symbolization, but specify different overrides for each instance
* with ParameterOverrides out of CompositeSymbolization, the latter is
just a collection of SymbolInstances, and there's no longer a need to
group these instances in a separate SymbolCollection sub-element
Modified: trunk/MgDev/Common/MdfModel/CompositeSymbolization.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/CompositeSymbolization.cpp 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfModel/CompositeSymbolization.cpp 2007-03-21 00:47:37 UTC (rev 1308)
@@ -51,15 +51,6 @@
}
//-------------------------------------------------------------------------
-// PURPOSE:
-// PARAMETERS:
-//-------------------------------------------------------------------------
-OverrideCollection* CompositeSymbolization::GetParameterOverrides()
-{
- return &this->m_collOverrides;
-}
-
-//-------------------------------------------------------------------------
// PURPOSE: Implementation of the Visitor pattern. The pure, virtual method
// is defined in Symbol and is implemented by all of its concrete
// subclasses.
Modified: trunk/MgDev/Common/MdfModel/CompositeSymbolization.h
===================================================================
--- trunk/MgDev/Common/MdfModel/CompositeSymbolization.h 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfModel/CompositeSymbolization.h 2007-03-21 00:47:37 UTC (rev 1308)
@@ -21,7 +21,6 @@
#include "MdfModel.h"
#include "Symbolization.h"
#include "SymbolInstance.h"
-#include "Override.h"
BEGIN_NAMESPACE_MDFMODEL
@@ -37,8 +36,6 @@
SymbolInstanceCollection* GetSymbolCollection();
- OverrideCollection* GetParameterOverrides();
-
// Visitor Pattern method defined in Symbolization.
virtual void AcceptVisitor(ISymbolizationVisitor& isyVisitor);
@@ -49,7 +46,6 @@
// Data members
SymbolInstanceCollection m_collSymbols;
- OverrideCollection m_collOverrides;
};
END_NAMESPACE_MDFMODEL
Modified: trunk/MgDev/Common/MdfModel/SymbolInstance.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/SymbolInstance.cpp 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfModel/SymbolInstance.cpp 2007-03-21 00:47:37 UTC (rev 1308)
@@ -49,6 +49,32 @@
// PURPOSE:
// PARAMETERS:
//-------------------------------------------------------------------------
+const MdfString& SymbolInstance::GetSymbolReference() const
+{
+ return this->m_sSymbolReference;
+}
+
+//-------------------------------------------------------------------------
+// PURPOSE:
+// PARAMETERS:
+//-------------------------------------------------------------------------
+void SymbolInstance::SetSymbolReference(const MdfString& symbolReference)
+{
+ this->m_sSymbolReference = symbolReference;
+
+ // Definition and Reference are mutually exclusive. Setting one
+ // clears the other.
+ if (this->m_pSymbolDefinition != NULL)
+ {
+ delete this->m_pSymbolDefinition;
+ this->m_pSymbolDefinition = NULL;
+ }
+}
+
+//-------------------------------------------------------------------------
+// PURPOSE:
+// PARAMETERS:
+//-------------------------------------------------------------------------
SymbolDefinition* SymbolInstance::GetSymbolDefinition()
{
return this->m_pSymbolDefinition;
@@ -87,32 +113,15 @@
// PURPOSE:
// PARAMETERS:
//-------------------------------------------------------------------------
-const MdfString& SymbolInstance::GetSymbolReference() const
+OverrideCollection* SymbolInstance::GetParameterOverrides()
{
- return this->m_sSymbolReference;
+ return &this->m_collOverrides;
}
//-------------------------------------------------------------------------
// PURPOSE:
// PARAMETERS:
//-------------------------------------------------------------------------
-void SymbolInstance::SetSymbolReference(const MdfString& symbolReference)
-{
- this->m_sSymbolReference = symbolReference;
-
- // Definition and Reference are mutually exclusive. Setting one
- // clears the other.
- if (this->m_pSymbolDefinition != NULL)
- {
- delete this->m_pSymbolDefinition;
- this->m_pSymbolDefinition = NULL;
- }
-}
-
-//-------------------------------------------------------------------------
-// PURPOSE:
-// PARAMETERS:
-//-------------------------------------------------------------------------
const MdfString& SymbolInstance::GetScaleX() const
{
return this->m_sScaleX;
Modified: trunk/MgDev/Common/MdfModel/SymbolInstance.h
===================================================================
--- trunk/MgDev/Common/MdfModel/SymbolInstance.h 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfModel/SymbolInstance.h 2007-03-21 00:47:37 UTC (rev 1308)
@@ -23,6 +23,7 @@
#include "MdfOwnerCollection.h"
#include "SymbolDefinition.h"
#include "SizeContexts.h"
+#include "Override.h"
BEGIN_NAMESPACE_MDFMODEL
@@ -36,12 +37,14 @@
SymbolInstance();
virtual ~SymbolInstance();
+ const MdfString& GetSymbolReference() const;
+ void SetSymbolReference(const MdfString& symbolReference);
+
SymbolDefinition* GetSymbolDefinition();
void AdoptSymbolDefinition(SymbolDefinition* symbolDefinition);
SymbolDefinition* OrphanSymbolDefinition();
- const MdfString& GetSymbolReference() const;
- void SetSymbolReference(const MdfString& symbolReference);
+ OverrideCollection* GetParameterOverrides();
const MdfString& GetScaleX() const;
void SetScaleX(const MdfString& scaleX);
@@ -76,8 +79,9 @@
SymbolInstance& operator=(const SymbolInstance&);
// Data members
+ MdfString m_sSymbolReference;
SymbolDefinition* m_pSymbolDefinition;
- MdfString m_sSymbolReference;
+ OverrideCollection m_collOverrides;
MdfString m_sScaleX;
MdfString m_sScaleY;
Modified: trunk/MgDev/Common/MdfParser/IOCompositeSymbolization.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOCompositeSymbolization.cpp 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfParser/IOCompositeSymbolization.cpp 2007-03-21 00:47:37 UTC (rev 1308)
@@ -17,8 +17,7 @@
#include "stdafx.h"
#include "IOCompositeSymbolization.h"
-#include "IOSymbolInstanceCollection.h"
-#include "IOOverrideCollection.h"
+#include "IOSymbolInstance.h"
using namespace XERCES_CPP_NAMESPACE;
using namespace MDFMODEL_NAMESPACE;
@@ -42,18 +41,12 @@
m_startElemName = name;
this->_compositeSymbolization = new CompositeSymbolization();
}
- else if (m_currElemName == L"SymbolCollection") // NOXLATE
+ else if (m_currElemName == L"SymbolInstance") // NOXLATE
{
- IOSymbolInstanceCollection* IO = new IOSymbolInstanceCollection(this->_compositeSymbolization->GetSymbolCollection());
+ IOSymbolInstance* IO = new IOSymbolInstance(this->_compositeSymbolization->GetSymbolCollection());
handlerStack->push(IO);
IO->StartElement(name, handlerStack);
}
- else if (m_currElemName == L"ParameterOverrides") // NOXLATE
- {
- IOOverrideCollection* IO = new IOOverrideCollection(this->_compositeSymbolization->GetParameterOverrides());
- handlerStack->push(IO);
- IO->StartElement(name, handlerStack);
- }
}
void IOCompositeSymbolization::ElementChars(const wchar_t *ch)
@@ -78,8 +71,13 @@
fd << tab() << "<CompositeSymbolization>" << std::endl; // NOXLATE
inctab();
- IOSymbolInstanceCollection::Write(fd, compositeSymbolization->GetSymbolCollection());
- IOOverrideCollection::Write(fd, compositeSymbolization->GetParameterOverrides());
+ SymbolInstanceCollection* instanceCollection = compositeSymbolization->GetSymbolCollection();
+ int numInstances = instanceCollection->GetCount();
+ for (int i=0; i<numInstances; ++i)
+ {
+ SymbolInstance* instance = instanceCollection->GetAt(i);
+ IOSymbolInstance::Write(fd, instance);
+ }
dectab();
fd << tab() << "</CompositeSymbolization>" << std::endl; // NOXLATE
Modified: trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp 2007-03-21 00:47:37 UTC (rev 1308)
@@ -17,6 +17,7 @@
#include "stdafx.h"
#include "IOSymbolInstance.h"
+#include "IOOverrideCollection.h"
#include "IOSimpleSymbolDefinition.h"
#include "IOCompoundSymbolDefinition.h"
@@ -53,6 +54,12 @@
handlerStack->push(IO);
IO->StartElement(name, handlerStack);
}
+ else if (m_currElemName == L"ParameterOverrides") // NOXLATE
+ {
+ IOOverrideCollection* IO = new IOOverrideCollection(this->_symbolInstance->GetParameterOverrides());
+ handlerStack->push(IO);
+ IO->StartElement(name, handlerStack);
+ }
}
void IOSymbolInstance::ElementChars(const wchar_t *ch)
@@ -104,6 +111,8 @@
EMIT_STRING_PROPERTY(fd, symbolInstance, SymbolReference, false)
}
+ IOOverrideCollection::Write(fd, symbolInstance->GetParameterOverrides());
+
EMIT_STRING_PROPERTY(fd, symbolInstance, ScaleX, true)
EMIT_STRING_PROPERTY(fd, symbolInstance, ScaleY, true)
EMIT_STRING_PROPERTY(fd, symbolInstance, InsertionOffsetX, true)
Deleted: trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.cpp 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.cpp 2007-03-21 00:47:37 UTC (rev 1308)
@@ -1,75 +0,0 @@
-//
-// Copyright (C) 2007 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "stdafx.h"
-#include "IOSymbolInstanceCollection.h"
-#include "IOSymbolInstance.h"
-
-using namespace XERCES_CPP_NAMESPACE;
-using namespace MDFMODEL_NAMESPACE;
-using namespace MDFPARSER_NAMESPACE;
-
-IOSymbolInstanceCollection::IOSymbolInstanceCollection(SymbolInstanceCollection* instanceCollection)
-{
- this->_instanceCollection = instanceCollection;
-}
-
-void IOSymbolInstanceCollection::StartElement(const wchar_t *name, HandlerStack *handlerStack)
-{
- m_currElemName = name;
- if (m_currElemName == L"SymbolCollection") // NOXLATE
- {
- m_startElemName = name;
- }
- else if (m_currElemName == L"SymbolInstance") // NOXLATE
- {
- IOSymbolInstance* IO = new IOSymbolInstance(this->_instanceCollection);
- handlerStack->push(IO);
- IO->StartElement(name, handlerStack);
- }
-}
-
-void IOSymbolInstanceCollection::ElementChars(const wchar_t *ch)
-{
-}
-
-void IOSymbolInstanceCollection::EndElement(const wchar_t *name, HandlerStack *handlerStack)
-{
- if (m_startElemName == name)
- {
- this->_instanceCollection = NULL;
- m_startElemName = L"";
- handlerStack->pop();
- delete this;
- }
-}
-
-void IOSymbolInstanceCollection::Write(MdfStream &fd, SymbolInstanceCollection* instanceCollection)
-{
- fd << tab() << "<SymbolCollection>" << std::endl; // NOXLATE
- inctab();
-
- int numInstances = instanceCollection->GetCount();
- for (int i=0; i<numInstances; ++i)
- {
- SymbolInstance* instance = instanceCollection->GetAt(i);
- IOSymbolInstance::Write(fd, instance);
- }
-
- dectab();
- fd << tab() << "</SymbolCollection>" << std::endl; // NOXLATE
-}
Deleted: trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.h 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfParser/IOSymbolInstanceCollection.h 2007-03-21 00:47:37 UTC (rev 1308)
@@ -1,45 +0,0 @@
-//
-// Copyright (C) 2007 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifndef _IOSYMBOLINSTANCECOLLECTION_H
-#define _IOSYMBOLINSTANCECOLLECTION_H
-
-#include "SAX2ElementHandler.h"
-#include "SymbolInstance.h"
-
-using namespace XERCES_CPP_NAMESPACE;
-using namespace MDFMODEL_NAMESPACE;
-
-BEGIN_NAMESPACE_MDFPARSER
-
-class IOSymbolInstanceCollection : public SAX2ElementHandler
-{
- public:
- IOSymbolInstanceCollection(SymbolInstanceCollection* instanceCollection);
-
- virtual void StartElement(const wchar_t *name, HandlerStack *handlerStack);
- virtual void ElementChars(const wchar_t *ch);
- virtual void EndElement(const wchar_t *name, HandlerStack *handlerStack);
-
- static void Write(MdfStream &fd, SymbolInstanceCollection* instanceCollection);
-
- private:
- SymbolInstanceCollection* _instanceCollection;
-};
-
-END_NAMESPACE_MDFPARSER
-#endif // _IOSYMBOLINSTANCECOLLECTION_H
Modified: trunk/MgDev/Common/MdfParser/Makefile.am
===================================================================
--- trunk/MgDev/Common/MdfParser/Makefile.am 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfParser/Makefile.am 2007-03-21 00:47:37 UTC (rev 1308)
@@ -74,7 +74,6 @@
IOSupplementalSpatialContextInfo.cpp \
IOSymbol.cpp \
IOSymbolInstance.cpp \
- IOSymbolInstanceCollection.cpp \
IOText.cpp \
IOTextFrame.cpp \
IOUnknown.cpp \
@@ -152,7 +151,6 @@
IOSupplementalSpatialContextInfo.h \
IOSymbol.h \
IOSymbolInstance.h \
- IOSymbolInstanceCollection.h \
IOText.h \
IOTextFrame.h \
IOUnknown.h \
Modified: trunk/MgDev/Common/MdfParser/MdfParser.vcproj
===================================================================
--- trunk/MgDev/Common/MdfParser/MdfParser.vcproj 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/MdfParser/MdfParser.vcproj 2007-03-21 00:47:37 UTC (rev 1308)
@@ -700,14 +700,6 @@
>
</File>
<File
- RelativePath=".\IOSymbolInstanceCollection.cpp"
- >
- </File>
- <File
- RelativePath=".\IOSymbolInstanceCollection.h"
- >
- </File>
- <File
RelativePath=".\IOText.cpp"
>
</File>
Modified: trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd 2007-03-21 00:47:37 UTC (rev 1308)
@@ -831,17 +831,39 @@
<xs:documentation>Stylization attributes of a point, line, or area feature.</xs:documentation>
</xs:annotation>
<xs:sequence>
- <xs:element name="SymbolCollection">
+ <xs:element name="SymbolInstance" type="SymbolInstanceType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>The collection of symbols used for stylization.</xs:documentation>
+ <xs:documentation>The symbol instances used for stylization.</xs:documentation>
</xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SymbolInstance" type="SymbolInstanceType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
</xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="SymbolInstanceType">
+ <xs:annotation>
+ <xs:documentation>An instance of a symbol.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="SymbolReference" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A library reference to an existing SymbolDefinition, either simple or compound.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinitionType">
+ <xs:annotation>
+ <xs:documentation>An inlined SimpleSymbolDefinition.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompoundSymbolDefinition" type="CompoundSymbolDefinitionType">
+ <xs:annotation>
+ <xs:documentation>An inlined CompoundSymbolDefinition.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
<xs:element name="ParameterOverrides">
+ <xs:annotation>
+ <xs:documentation>Specifies all parameter overrides for this symbol instance.</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="Override" minOccurs="0" maxOccurs="unbounded">
@@ -868,30 +890,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="SymbolInstanceType">
- <xs:annotation>
- <xs:documentation>An instance of a symbol.</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:choice>
- <xs:element name="SymbolReference" type="xs:string">
- <xs:annotation>
- <xs:documentation>A library reference to an existing SymbolDefinition, either simple or compound.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinitionType">
- <xs:annotation>
- <xs:documentation>An inlined SimpleSymbolDefinition.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CompoundSymbolDefinition" type="CompoundSymbolDefinitionType">
- <xs:annotation>
- <xs:documentation>An inlined CompoundSymbolDefinition.</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:choice>
<xs:element name="ScaleX" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>The additional amount to scale the symbol horizontally in symbol space.</xs:documentation>
Modified: trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd 2007-03-21 00:47:37 UTC (rev 1308)
@@ -227,8 +227,8 @@
<xs:documentation>The list of parameters used in this symbol. If a parameter is not listed here this is considered a bug in the symbol definition.</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element name="Parameter">
+ <xs:sequence>
+ <xs:element name="Parameter" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>The metadata for a parameter.</xs:documentation>
</xs:annotation>
@@ -259,8 +259,8 @@
<xs:documentation>A list of allowed values for this parameter.</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:sequence maxOccurs="unbounded">
- <xs:element name="Value" type="xs:string">
+ <xs:sequence>
+ <xs:element name="Value" type="xs:string" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>A value in the list.</xs:documentation>
</xs:annotation>
Modified: trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp 2007-03-21 00:47:37 UTC (rev 1308)
@@ -62,9 +62,9 @@
ParseStringExpression(pointUsage.GetAngleControl(), style->angleControl);
//set flag if all properties are constant
- style->cacheable = ! (style->angle.expression
+ style->cacheable = ! (style->angle.expression
|| style->angleControl.expression
- || style->originOffset[0].expression
+ || style->originOffset[0].expression
|| style->originOffset[1].expression);
return style;
@@ -442,8 +442,8 @@
polygon->fill = color;
ParseColorExpression(path.GetLineColor(), polygon->color);
ParseBooleanExpression(path.GetLineWeightScalable(), polygon->weightScalable);
- polygon->cacheable = !(polygon->weight.expression ||
- polygon->color.expression ||
+ polygon->cacheable = !(polygon->weight.expression ||
+ polygon->color.expression ||
polygon->fill.expression ||
polygon->weightScalable.expression);
}
@@ -619,9 +619,6 @@
if (symbolization == NULL)
return;
- //TODO: remove this when param overrides are moved to the SymbolInstance
- SetParameterValues(symbolization->GetParameterOverrides());
-
SymbolInstanceCollection* symbols = symbolization->GetSymbolCollection();
int nSymbols = symbols->GetCount();
@@ -629,8 +626,7 @@
{
SymbolInstance* instance = symbols->GetAt(i);
- //TODO: add this when param overrides are moved to the SymbolInstance
- //SetParameterValues(instance->GetParameterOverrodes());
+ SetParameterValues(instance->GetParameterOverrides());
// get the symbol definition, either inlined or by reference
SymbolDefinition* def = instance->GetSymbolDefinition();
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf 2007-03-21 00:47:37 UTC (rev 1308)
@@ -24,184 +24,183 @@
<CompositeRule>
<LegendLabel></LegendLabel>
<CompositeSymbolization>
- <SymbolCollection>
- <SymbolInstance>
- <SymbolReference>Library://Symbology/Symbols/PointSymbolParam.SymbolDefinition</SymbolReference>
- <ScaleX>1.0</ScaleX>
- <ScaleY>1.0</ScaleY>
- <SizeContext>MappingUnits</SizeContext>
- <DrawLast>False</DrawLast>
- <CheckExclusionRegion>False</CheckExclusionRegion>
- <AddToExclusionRegion>False</AddToExclusionRegion>
- </SymbolInstance>
- <SymbolInstance>
- <CompoundSymbolDefinition>
- <Name>MdfTestCompoundSymbol</Name>
- <Description>A dummy symbol used to test the MdfModel/MdfParser code.</Description>
- <SimpleSymbol>
- <SimpleSymbolDefinition>
- <Name>MdfTestSimpleSymbol</Name>
- <Description>A dummy symbol used to test the MdfModel/MdfParser code.</Description>
- <Graphics>
- <Path>
- <ResizeControl>'AddToResizeBox'</ResizeControl>
- <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
- <FillColor>ffff0000</FillColor>
- <LineColor>%OUTLINE%</LineColor>
- <LineWeight>2*(%THICKNESS% + 1)</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
- <LineCap>'None'</LineCap>
- <LineJoin>'None'</LineJoin>
- <LineMiterLimit>5.0</LineMiterLimit>
- </Path>
- <Image>
- <ResizeControl>'AddToResizeBox'</ResizeControl>
- <Content>R0lGODlhcgGSALMAAAQCAEMmCZtuMFQxDS8b</Content>
- <SizeX>100.0</SizeX>
- <SizeY>100.0</SizeY>
- <PositionX>0.0</PositionX>
- <PositionY>0.0</PositionY>
- <Angle>0.0</Angle>
- </Image>
- <Image>
- <ResizeControl>'AddToResizeBox'</ResizeControl>
- <Reference>Library://Image.jpg</Reference>
- <SizeX>100.0</SizeX>
- <SizeY>100.0</SizeY>
- <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>
- <Height>10.0</Height>
- <PositionX>0.0</PositionX>
- <PositionY>0.0</PositionY>
- <Angle>0.0</Angle>
- <HorizontalAlignment>Center</HorizontalAlignment>
- <VerticalAlignment>Baseline</VerticalAlignment>
- <Justification>Center</Justification>
- <LineSpacing>15.0</LineSpacing>
- <TextColor>%TEXTCOLOR%</TextColor>
- <GhostColor>ffffffff</GhostColor>
- <Frame>
- <LineColor>ff000000</LineColor>
- <FillColor>ffff0000</FillColor>
- <OffsetX>5.0</OffsetX>
- <OffsetY>5.0</OffsetY>
- </Frame>
- </Text>
- </Graphics>
- <ResizeBox>
+ <SymbolInstance>
+ <SymbolReference>Library://Symbology/Symbols/PointSymbolParam.SymbolDefinition</SymbolReference>
+ <ParameterOverrides>
+ <Override>
+ <SymbolName>X_on_Box</SymbolName>
+ <ParameterIdentifier>COLOR</ParameterIdentifier>
+ <ParameterValue>FF00FF00</ParameterValue>
+ </Override>
+ </ParameterOverrides>
+ <ScaleX>1.0</ScaleX>
+ <ScaleY>1.0</ScaleY>
+ <SizeContext>MappingUnits</SizeContext>
+ <DrawLast>False</DrawLast>
+ <CheckExclusionRegion>False</CheckExclusionRegion>
+ <AddToExclusionRegion>False</AddToExclusionRegion>
+ </SymbolInstance>
+ <SymbolInstance>
+ <CompoundSymbolDefinition>
+ <Name>MdfTestCompoundSymbol</Name>
+ <Description>A dummy symbol used to test the MdfModel/MdfParser code.</Description>
+ <SimpleSymbol>
+ <SimpleSymbolDefinition>
+ <Name>MdfTestSimpleSymbol</Name>
+ <Description>A dummy symbol used to test the MdfModel/MdfParser code.</Description>
+ <Graphics>
+ <Path>
+ <ResizeControl>'AddToResizeBox'</ResizeControl>
+ <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
+ <FillColor>ffff0000</FillColor>
+ <LineColor>%OUTLINE%</LineColor>
+ <LineWeight>2*(%THICKNESS% + 1)</LineWeight>
+ <LineWeightScalable>true</LineWeightScalable>
+ <LineCap>'None'</LineCap>
+ <LineJoin>'None'</LineJoin>
+ <LineMiterLimit>5.0</LineMiterLimit>
+ </Path>
+ <Image>
+ <ResizeControl>'AddToResizeBox'</ResizeControl>
+ <Content>R0lGODlhcgGSALMAAAQCAEMmCZtuMFQxDS8b</Content>
+ <SizeX>100.0</SizeX>
+ <SizeY>100.0</SizeY>
<PositionX>0.0</PositionX>
<PositionY>0.0</PositionY>
- <SizeX>50.0</SizeX>
- <SizeY>10.0</SizeY>
- <GrowControl>'GrowInXYMaintainAspect'</GrowControl>
- </ResizeBox>
- <PointUsage>
- <AngleControl>'FromGeometry'</AngleControl>
<Angle>0.0</Angle>
- <OriginOffsetX>0.0</OriginOffsetX>
- <OriginOffsetY>0.0</OriginOffsetY>
- </PointUsage>
- <LineUsage>
- <AngleControl>'FromGeometry'</AngleControl>
- <UnitsControl>'Absolute'</UnitsControl>
- <VertexControl>'NoOverlap'</VertexControl>
+ </Image>
+ <Image>
+ <ResizeControl>'AddToResizeBox'</ResizeControl>
+ <Reference>Library://Image.jpg</Reference>
+ <SizeX>100.0</SizeX>
+ <SizeY>100.0</SizeY>
+ <PositionX>0.0</PositionX>
+ <PositionY>0.0</PositionY>
<Angle>0.0</Angle>
- <StartOffset>0.0</StartOffset>
- <EndOffset>0.0</EndOffset>
- <Repeat>10.0</Repeat>
- <VertexAngleLimit>5.0</VertexAngleLimit>
- <VertexJoin>'None'</VertexJoin>
- <DefaultPath>
- <ResizeControl>'AddToResizeBox'</ResizeControl>
- <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
- <FillColor>ffff0000</FillColor>
- <LineColor>ff00ff00</LineColor>
- <LineWeight>1.0</LineWeight>
- <LineWeightScalable>true</LineWeightScalable>
- <LineCap>'None'</LineCap>
- <LineJoin>'None'</LineJoin>
- <LineMiterLimit>5.0</LineMiterLimit>
- </DefaultPath>
- </LineUsage>
- <AreaUsage>
- <AngleControl>'FromGeometry'</AngleControl>
- <OriginControl>'Global'</OriginControl>
- <ClippingControl>'Clip'</ClippingControl>
+ </Image>
+ <Text>
+ <ResizeControl>'AddToResizeBox'</ResizeControl>
+ <String>Some text</String>
+ <FontName>Arial</FontName>
+ <Bold>false</Bold>
+ <Italic>false</Italic>
+ <Underlined>false</Underlined>
+ <Height>10.0</Height>
+ <PositionX>0.0</PositionX>
+ <PositionY>0.0</PositionY>
<Angle>0.0</Angle>
- <OriginX>0.0</OriginX>
- <OriginY>0.0</OriginY>
- <RepeatX>10.0</RepeatX>
- <RepeatY>5.0</RepeatY>
- <BufferWidth>0.0</BufferWidth>
- </AreaUsage>
- <ParameterDefinition>
- <Parameter>
- <Identifier>OUTLINE</Identifier>
- <DefaultValue>FFFF0000</DefaultValue>
- <DisplayName>Outline Color</DisplayName>
- <Description>The color of the outline of the box.</Description>
- <AllowedValues>
- <Value>FFFF0000</Value>
- <Value>FFFFFFFF</Value>
- </AllowedValues>
- </Parameter>
- <Parameter>
- <Identifier>THICKNESS</Identifier>
- <DefaultValue>-0.5</DefaultValue>
- <DisplayName>Line Thickness</DisplayName>
- <Description>The thickness of the line in mm... minus 2 and halved.</Description>
- <AllowedValues>
- <Value>-1.0</Value>
- <Value>-0.5</Value>
- <Value>0.0</Value>
- <Value>0.5</Value>
- <Value>1.0</Value>
- </AllowedValues>
- </Parameter>
- <Parameter>
- <Identifier>TEXTCOLOR</Identifier>
- <DefaultValue>FFFFFF00</DefaultValue>
- <DisplayName>Text Color</DisplayName>
- <Description>The color of the text.</Description>
- <AllowedValues>
- <Value>FFFF0000</Value>
- <Value>FFFFFF00</Value>
- <Value>FF00FF00</Value>
- </AllowedValues>
- </Parameter>
- </ParameterDefinition>
- </SimpleSymbolDefinition>
- <RenderingPass>10</RenderingPass>
- </SimpleSymbol>
- <SimpleSymbol>
- <SymbolReference>Library://Symbology/Symbols/MdfTestSimpleSymbol.SymbolDefinition</SymbolReference>
- <RenderingPass>20</RenderingPass>
- </SimpleSymbol>
- </CompoundSymbolDefinition>
- <ScaleX>2.0</ScaleX>
- <ScaleY>2.0</ScaleY>
- <SizeContext>MappingUnits</SizeContext>
- <DrawLast>False</DrawLast>
- <CheckExclusionRegion>False</CheckExclusionRegion>
- <AddToExclusionRegion>False</AddToExclusionRegion>
- </SymbolInstance>
- </SymbolCollection>
- <ParameterOverrides>
- <Override>
- <SymbolName>X_on_Box</SymbolName>
- <ParameterIdentifier>COLOR</ParameterIdentifier>
- <ParameterValue>FF00FF00</ParameterValue>
- </Override>
- </ParameterOverrides>
+ <HorizontalAlignment>Center</HorizontalAlignment>
+ <VerticalAlignment>Baseline</VerticalAlignment>
+ <Justification>Center</Justification>
+ <LineSpacing>15.0</LineSpacing>
+ <TextColor>%TEXTCOLOR%</TextColor>
+ <GhostColor>ffffffff</GhostColor>
+ <Frame>
+ <LineColor>ff000000</LineColor>
+ <FillColor>ffff0000</FillColor>
+ <OffsetX>5.0</OffsetX>
+ <OffsetY>5.0</OffsetY>
+ </Frame>
+ </Text>
+ </Graphics>
+ <ResizeBox>
+ <PositionX>0.0</PositionX>
+ <PositionY>0.0</PositionY>
+ <SizeX>50.0</SizeX>
+ <SizeY>10.0</SizeY>
+ <GrowControl>'GrowInXYMaintainAspect'</GrowControl>
+ </ResizeBox>
+ <PointUsage>
+ <AngleControl>'FromGeometry'</AngleControl>
+ <Angle>0.0</Angle>
+ <OriginOffsetX>0.0</OriginOffsetX>
+ <OriginOffsetY>0.0</OriginOffsetY>
+ </PointUsage>
+ <LineUsage>
+ <AngleControl>'FromGeometry'</AngleControl>
+ <UnitsControl>'Absolute'</UnitsControl>
+ <VertexControl>'NoOverlap'</VertexControl>
+ <Angle>0.0</Angle>
+ <StartOffset>0.0</StartOffset>
+ <EndOffset>0.0</EndOffset>
+ <Repeat>10.0</Repeat>
+ <VertexAngleLimit>5.0</VertexAngleLimit>
+ <VertexJoin>'None'</VertexJoin>
+ <DefaultPath>
+ <ResizeControl>'AddToResizeBox'</ResizeControl>
+ <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
+ <FillColor>ffff0000</FillColor>
+ <LineColor>ff00ff00</LineColor>
+ <LineWeight>1.0</LineWeight>
+ <LineWeightScalable>true</LineWeightScalable>
+ <LineCap>'None'</LineCap>
+ <LineJoin>'None'</LineJoin>
+ <LineMiterLimit>5.0</LineMiterLimit>
+ </DefaultPath>
+ </LineUsage>
+ <AreaUsage>
+ <AngleControl>'FromGeometry'</AngleControl>
+ <OriginControl>'Global'</OriginControl>
+ <ClippingControl>'Clip'</ClippingControl>
+ <Angle>0.0</Angle>
+ <OriginX>0.0</OriginX>
+ <OriginY>0.0</OriginY>
+ <RepeatX>10.0</RepeatX>
+ <RepeatY>5.0</RepeatY>
+ <BufferWidth>0.0</BufferWidth>
+ </AreaUsage>
+ <ParameterDefinition>
+ <Parameter>
+ <Identifier>OUTLINE</Identifier>
+ <DefaultValue>FFFF0000</DefaultValue>
+ <DisplayName>Outline Color</DisplayName>
+ <Description>The color of the outline of the box.</Description>
+ <AllowedValues>
+ <Value>FFFF0000</Value>
+ <Value>FFFFFFFF</Value>
+ </AllowedValues>
+ </Parameter>
+ <Parameter>
+ <Identifier>THICKNESS</Identifier>
+ <DefaultValue>-0.5</DefaultValue>
+ <DisplayName>Line Thickness</DisplayName>
+ <Description>The thickness of the line in mm... minus 2 and halved.</Description>
+ <AllowedValues>
+ <Value>-1.0</Value>
+ <Value>-0.5</Value>
+ <Value>0.0</Value>
+ <Value>0.5</Value>
+ <Value>1.0</Value>
+ </AllowedValues>
+ </Parameter>
+ <Parameter>
+ <Identifier>TEXTCOLOR</Identifier>
+ <DefaultValue>FFFFFF00</DefaultValue>
+ <DisplayName>Text Color</DisplayName>
+ <Description>The color of the text.</Description>
+ <AllowedValues>
+ <Value>FFFF0000</Value>
+ <Value>FFFFFF00</Value>
+ <Value>FF00FF00</Value>
+ </AllowedValues>
+ </Parameter>
+ </ParameterDefinition>
+ </SimpleSymbolDefinition>
+ <RenderingPass>10</RenderingPass>
+ </SimpleSymbol>
+ <SimpleSymbol>
+ <SymbolReference>Library://Symbology/Symbols/MdfTestSimpleSymbol.SymbolDefinition</SymbolReference>
+ <RenderingPass>20</RenderingPass>
+ </SimpleSymbol>
+ </CompoundSymbolDefinition>
+ <ParameterOverrides/>
+ <ScaleX>2.0</ScaleX>
+ <ScaleY>2.0</ScaleY>
+ <SizeContext>MappingUnits</SizeContext>
+ <DrawLast>False</DrawLast>
+ <CheckExclusionRegion>False</CheckExclusionRegion>
+ <AddToExclusionRegion>False</AddToExclusionRegion>
+ </SymbolInstance>
</CompositeSymbolization>
</CompositeRule>
</CompositeTypeStyle>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.ldf 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.ldf 2007-03-21 00:47:37 UTC (rev 1308)
@@ -12,15 +12,13 @@
<CompositeRule>
<LegendLabel/>
<CompositeSymbolization>
- <SymbolCollection>
- <SymbolInstance>
- <SymbolReference>Library://Symbology/Symbols/LineSymbol.SymbolDefinition</SymbolReference>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
- <SizeContext>DeviceUnits</SizeContext>
- </SymbolInstance>
- </SymbolCollection>
- <ParameterOverrides/>
+ <SymbolInstance>
+ <SymbolReference>Library://Symbology/Symbols/LineSymbol.SymbolDefinition</SymbolReference>
+ <ParameterOverrides/>
+ <ScaleX>1</ScaleX>
+ <ScaleY>1</ScaleY>
+ <SizeContext>DeviceUnits</SizeContext>
+ </SymbolInstance>
</CompositeSymbolization>
</CompositeRule>
</CompositeTypeStyle>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLinesCrossTick.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLinesCrossTick.ldf 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLinesCrossTick.ldf 2007-03-21 00:47:37 UTC (rev 1308)
@@ -12,15 +12,13 @@
<CompositeRule>
<LegendLabel/>
<CompositeSymbolization>
- <SymbolCollection>
- <SymbolInstance>
- <SymbolReference>Library://Symbology/Symbols/MTYP1500a.SymbolDefinition</SymbolReference>
- <ScaleX>0.5</ScaleX>
- <ScaleY>0.5</ScaleY>
- <SizeContext>DeviceUnits</SizeContext>
- </SymbolInstance>
- </SymbolCollection>
- <ParameterOverrides/>
+ <SymbolInstance>
+ <SymbolReference>Library://Symbology/Symbols/MTYP1500a.SymbolDefinition</SymbolReference>
+ <ParameterOverrides/>
+ <ScaleX>0.5</ScaleX>
+ <ScaleY>0.5</ScaleY>
+ <SizeContext>DeviceUnits</SizeContext>
+ </SymbolInstance>
</CompositeSymbolization>
</CompositeRule>
</CompositeTypeStyle>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.ldf 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.ldf 2007-03-21 00:47:37 UTC (rev 1308)
@@ -24,18 +24,16 @@
<CompositeRule>
<LegendLabel/>
<CompositeSymbolization>
- <SymbolCollection>
- <SymbolInstance>
- <SymbolReference>Library://Symbology/Symbols/PointSymbol.SymbolDefinition</SymbolReference>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
- <SizeContext>DeviceUnits</SizeContext>
- <DrawLast>False</DrawLast>
- <CheckExclusionRegion>False</CheckExclusionRegion>
- <AddToExclusionRegion>False</AddToExclusionRegion>
- </SymbolInstance>
- </SymbolCollection>
- <ParameterOverrides/>
+ <SymbolInstance>
+ <SymbolReference>Library://Symbology/Symbols/PointSymbol.SymbolDefinition</SymbolReference>
+ <ParameterOverrides/>
+ <ScaleX>1</ScaleX>
+ <ScaleY>1</ScaleY>
+ <SizeContext>DeviceUnits</SizeContext>
+ <DrawLast>False</DrawLast>
+ <CheckExclusionRegion>False</CheckExclusionRegion>
+ <AddToExclusionRegion>False</AddToExclusionRegion>
+ </SymbolInstance>
</CompositeSymbolization>
</CompositeRule>
</CompositeTypeStyle>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPointsParam.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPointsParam.ldf 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPointsParam.ldf 2007-03-21 00:47:37 UTC (rev 1308)
@@ -24,24 +24,22 @@
<CompositeRule>
<LegendLabel/>
<CompositeSymbolization>
- <SymbolCollection>
- <SymbolInstance>
- <SymbolReference>Library://Symbology/Symbols/PointSymbolParam.SymbolDefinition</SymbolReference>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
- <SizeContext>DeviceUnits</SizeContext>
- <DrawLast>False</DrawLast>
- <CheckExclusionRegion>False</CheckExclusionRegion>
- <AddToExclusionRegion>False</AddToExclusionRegion>
- </SymbolInstance>
- </SymbolCollection>
- <ParameterOverrides>
- <Override>
- <SymbolName>X_on_Box</SymbolName>
- <ParameterIdentifier>COLOR</ParameterIdentifier>
- <ParameterValue>FF00FF00</ParameterValue>
- </Override>
- </ParameterOverrides>
+ <SymbolInstance>
+ <SymbolReference>Library://Symbology/Symbols/PointSymbolParam.SymbolDefinition</SymbolReference>
+ <ParameterOverrides>
+ <Override>
+ <SymbolName>X_on_Box</SymbolName>
+ <ParameterIdentifier>COLOR</ParameterIdentifier>
+ <ParameterValue>FF00FF00</ParameterValue>
+ </Override>
+ </ParameterOverrides>
+ <ScaleX>1</ScaleX>
+ <ScaleY>1</ScaleY>
+ <SizeContext>DeviceUnits</SizeContext>
+ <DrawLast>False</DrawLast>
+ <CheckExclusionRegion>False</CheckExclusionRegion>
+ <AddToExclusionRegion>False</AddToExclusionRegion>
+ </SymbolInstance>
</CompositeSymbolization>
</CompositeRule>
</CompositeTypeStyle>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.ldf 2007-03-20 23:03:07 UTC (rev 1307)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.ldf 2007-03-21 00:47:37 UTC (rev 1308)
@@ -28,18 +28,16 @@
<CompositeRule>
<LegendLabel/>
<CompositeSymbolization>
- <SymbolCollection>
- <SymbolInstance>
- <SymbolReference>Library://Symbology/Symbols/LineSymbol.SymbolDefinition</SymbolReference>
- <ScaleX>1</ScaleX>
- <ScaleY>1</ScaleY>
- <SizeContext>DeviceUnits</SizeContext>
- <DrawLast>False</DrawLast>
- <CheckExclusionRegion>False</CheckExclusionRegion>
- <AddToExclusionRegion>False</AddToExclusionRegion>
- </SymbolInstance>
- </SymbolCollection>
- <ParameterOverrides/>
+ <SymbolInstance>
+ <SymbolReference>Library://Symbology/Symbols/LineSymbol.SymbolDefinition</SymbolReference>
+ <ParameterOverrides/>
+ <ScaleX>1</ScaleX>
+ <ScaleY>1</ScaleY>
+ <SizeContext>DeviceUnits</SizeContext>
+ <DrawLast>False</DrawLast>
+ <CheckExclusionRegion>False</CheckExclusionRegion>
+ <AddToExclusionRegion>False</AddToExclusionRegion>
+ </SymbolInstance>
</CompositeSymbolization>
</CompositeRule>
</CompositeTypeStyle>
More information about the mapguide-commits
mailing list