[mapguide-commits] r1305 - in trunk/MgDev: Common/MdfParser
Common/Schema Server/src/Services/Resource
UnitTest/TestData/Symbology
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Mar 20 16:51:34 EDT 2007
Author: waltweltonlair
Date: 2007-03-20 16:51:33 -0400 (Tue, 20 Mar 2007)
New Revision: 1305
Removed:
trunk/MgDev/Common/MdfParser/IOSymbolDefinition.cpp
trunk/MgDev/Common/MdfParser/IOSymbolDefinition.h
Modified:
trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.cpp
trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.h
trunk/MgDev/Common/MdfParser/IOSimpleSymbol.cpp
trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.cpp
trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.h
trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp
trunk/MgDev/Common/MdfParser/Makefile.am
trunk/MgDev/Common/MdfParser/MdfParser.vcproj
trunk/MgDev/Common/MdfParser/SAX2Parser.cpp
trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd
trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd
trunk/MgDev/Server/src/Services/Resource/ResourceContentManager.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/linesymbol.sd
trunk/MgDev/UnitTest/TestData/Symbology/symbol.sd
trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd
Log:
More symbolization schema update. This submission makes the following
change:
* simplify SymbolDefinition element
=> create SimpleSymbolDefinition and CompoundSymbolDefinition elements
which are of the corresponding types
=> update SymbolInstance to have a choice of either a SymbolReference,
a SimpleSymbolDefinition, or a CompoundSymbolDefinition
=> delete SymbolDefinition and SymbolDefinitionType
Modified: trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.cpp 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.cpp 2007-03-20 20:51:33 UTC (rev 1305)
@@ -60,11 +60,14 @@
}
}
-void IOCompoundSymbolDefinition::Write(MdfStream &fd, CompoundSymbolDefinition* symbolDefinition)
+void IOCompoundSymbolDefinition::Write(MdfStream &fd, CompoundSymbolDefinition* symbolDefinition, bool writeAsRootElement)
{
SimpleSymbolCollection* symbolCollection = symbolDefinition->GetSymbols();
- fd << tab() << "<CompoundSymbolDefinition>" << std::endl; // NOXLATE
+ if (writeAsRootElement)
+ fd << tab() << "<CompoundSymbolDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:noNamespaceSchemaLocation=\"SymbolDefinition-1.0.0.xsd\">" << std::endl; // NOXLATE
+ else
+ fd << tab() << "<CompoundSymbolDefinition>" << std::endl; // NOXLATE
inctab();
EMIT_STRING_PROPERTY(fd, symbolDefinition, Name, false)
Modified: trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.h 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOCompoundSymbolDefinition.h 2007-03-20 20:51:33 UTC (rev 1305)
@@ -35,7 +35,7 @@
virtual void ElementChars(const wchar_t *ch);
virtual void EndElement(const wchar_t *name, HandlerStack *handlerStack);
- static void Write(MdfStream &fd, CompoundSymbolDefinition* symbolDefinition);
+ static void Write(MdfStream &fd, CompoundSymbolDefinition* symbolDefinition, bool writeAsRootElement);
private:
CompoundSymbolDefinition* _symbolDefinition;
Modified: trunk/MgDev/Common/MdfParser/IOSimpleSymbol.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSimpleSymbol.cpp 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOSimpleSymbol.cpp 2007-03-20 20:51:33 UTC (rev 1305)
@@ -73,7 +73,7 @@
// we must write either a symbol definition or reference, but not both
if (simpleSymbol->GetSymbolDefinition())
- IOSimpleSymbolDefinition::Write(fd, simpleSymbol->GetSymbolDefinition());
+ IOSimpleSymbolDefinition::Write(fd, simpleSymbol->GetSymbolDefinition(), false);
else
{
EMIT_STRING_PROPERTY(fd, simpleSymbol, SymbolReference, false)
Modified: trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.cpp 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.cpp 2007-03-20 20:51:33 UTC (rev 1305)
@@ -95,9 +95,12 @@
}
}
-void IOSimpleSymbolDefinition::Write(MdfStream &fd, SimpleSymbolDefinition* symbolDefinition)
+void IOSimpleSymbolDefinition::Write(MdfStream &fd, SimpleSymbolDefinition* symbolDefinition, bool writeAsRootElement)
{
- fd << tab() << "<SimpleSymbolDefinition>" << std::endl; // NOXLATE
+ if (writeAsRootElement)
+ fd << tab() << "<SimpleSymbolDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:noNamespaceSchemaLocation=\"SymbolDefinition-1.0.0.xsd\">" << std::endl; // NOXLATE
+ else
+ fd << tab() << "<SimpleSymbolDefinition>" << std::endl; // NOXLATE
inctab();
EMIT_STRING_PROPERTY(fd, symbolDefinition, Name, false)
Modified: trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.h 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOSimpleSymbolDefinition.h 2007-03-20 20:51:33 UTC (rev 1305)
@@ -35,7 +35,7 @@
virtual void ElementChars(const wchar_t *ch);
virtual void EndElement(const wchar_t *name, HandlerStack *handlerStack);
- static void Write(MdfStream &fd, SimpleSymbolDefinition* symbolDefinition);
+ static void Write(MdfStream &fd, SimpleSymbolDefinition* symbolDefinition, bool writeAsRootElement);
private:
SimpleSymbolDefinition* _symbolDefinition;
Deleted: trunk/MgDev/Common/MdfParser/IOSymbolDefinition.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSymbolDefinition.cpp 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOSymbolDefinition.cpp 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,95 +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 "IOSymbolDefinition.h"
-#include "SimpleSymbolDefinition.h"
-#include "CompoundSymbolDefinition.h"
-#include "IOSimpleSymbolDefinition.h"
-#include "IOCompoundSymbolDefinition.h"
-
-using namespace XERCES_CPP_NAMESPACE;
-using namespace MDFMODEL_NAMESPACE;
-using namespace MDFPARSER_NAMESPACE;
-
-IOSymbolDefinition::IOSymbolDefinition(SymbolInstance* symbolInstance)
-{
- this->_symbolInstance = symbolInstance;
- this->_symbolDefinition = NULL;
-}
-
-void IOSymbolDefinition::StartElement(const wchar_t* name, HandlerStack* handlerStack)
-{
- m_currElemName = name;
- if (m_currElemName == L"SymbolDefinition") // NOXLATE
- {
- m_startElemName = name;
- }
- else if (m_currElemName == L"SimpleSymbolDefinition") // NOXLATE
- {
- SimpleSymbolDefinition* simpleSymbol = new SimpleSymbolDefinition();
- this->_symbolDefinition = simpleSymbol;
- IOSimpleSymbolDefinition* IO = new IOSimpleSymbolDefinition(simpleSymbol);
- handlerStack->push(IO);
- IO->StartElement(name, handlerStack);
- }
- else if (m_currElemName == L"CompoundSymbolDefinition") // NOXLATE
- {
- CompoundSymbolDefinition* compoundSymbol = new CompoundSymbolDefinition();
- this->_symbolDefinition = compoundSymbol;
- IOCompoundSymbolDefinition* IO = new IOCompoundSymbolDefinition(compoundSymbol);
- handlerStack->push(IO);
- IO->StartElement(name, handlerStack);
- }
-}
-
-void IOSymbolDefinition::ElementChars(const wchar_t *ch)
-{
-}
-
-void IOSymbolDefinition::EndElement(const wchar_t *name, HandlerStack *handlerStack)
-{
- if (m_startElemName == name)
- {
- this->_symbolInstance->AdoptSymbolDefinition(this->_symbolDefinition);
- this->_symbolInstance = NULL;
- this->_symbolDefinition = NULL;
- m_startElemName = L"";
- handlerStack->pop();
- delete this;
- }
-}
-
-void IOSymbolDefinition::Write(MdfStream &fd, SymbolDefinition* symbolDefinition, bool writeAsRootElement)
-{
- if (writeAsRootElement)
- fd << tab() << "<SymbolDefinition xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:noNamespaceSchemaLocation=\"SymbolDefinition-1.0.0.xsd\">" << std::endl; // NOXLATE
- else
- fd << tab() << "<SymbolDefinition>" << std::endl; // NOXLATE
- inctab();
-
- SimpleSymbolDefinition* simpleSymbol = dynamic_cast<SimpleSymbolDefinition*>(symbolDefinition);
- if (simpleSymbol)
- IOSimpleSymbolDefinition::Write(fd, simpleSymbol);
-
- CompoundSymbolDefinition* compoundSymbol = dynamic_cast<CompoundSymbolDefinition*>(symbolDefinition);
- if (compoundSymbol)
- IOCompoundSymbolDefinition::Write(fd, compoundSymbol);
-
- dectab();
- fd << tab() << "</SymbolDefinition>" << std::endl; // NOXLATE
-}
Deleted: trunk/MgDev/Common/MdfParser/IOSymbolDefinition.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSymbolDefinition.h 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOSymbolDefinition.h 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,47 +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 _IOSYMBOLDEFINITION_H
-#define _IOSYMBOLDEFINITION_H
-
-#include "SAX2ElementHandler.h"
-#include "SymbolInstance.h"
-#include "SymbolDefinition.h"
-
-using namespace XERCES_CPP_NAMESPACE;
-using namespace MDFMODEL_NAMESPACE;
-
-BEGIN_NAMESPACE_MDFPARSER
-
-class IOSymbolDefinition : public SAX2ElementHandler
-{
- public:
- IOSymbolDefinition(SymbolInstance* symbolInstance);
-
- 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, SymbolDefinition* symbolDefinition, bool writeAsRootElement);
-
- protected:
- SymbolInstance* _symbolInstance;
- SymbolDefinition* _symbolDefinition;
-};
-
-END_NAMESPACE_MDFPARSER
-#endif // _IOSYMBOLDEFINITION_H
Modified: trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/IOSymbolInstance.cpp 2007-03-20 20:51:33 UTC (rev 1305)
@@ -17,7 +17,8 @@
#include "stdafx.h"
#include "IOSymbolInstance.h"
-#include "IOSymbolDefinition.h"
+#include "IOSimpleSymbolDefinition.h"
+#include "IOCompoundSymbolDefinition.h"
using namespace XERCES_CPP_NAMESPACE;
using namespace MDFMODEL_NAMESPACE;
@@ -36,12 +37,22 @@
m_startElemName = name;
this->_symbolInstance = new SymbolInstance();
}
- else if (m_currElemName == L"SymbolDefinition") // NOXLATE
+ else if (m_currElemName == L"SimpleSymbolDefinition") // NOXLATE
{
- IOSymbolDefinition* IO = new IOSymbolDefinition(this->_symbolInstance);
+ SimpleSymbolDefinition* simpleSymbol = new SimpleSymbolDefinition();
+ this->_symbolInstance->AdoptSymbolDefinition(simpleSymbol);
+ IOSimpleSymbolDefinition* IO = new IOSimpleSymbolDefinition(simpleSymbol);
handlerStack->push(IO);
IO->StartElement(name, handlerStack);
}
+ else if (m_currElemName == L"CompoundSymbolDefinition") // NOXLATE
+ {
+ CompoundSymbolDefinition* compoundSymbol = new CompoundSymbolDefinition();
+ this->_symbolInstance->AdoptSymbolDefinition(compoundSymbol);
+ IOCompoundSymbolDefinition* IO = new IOCompoundSymbolDefinition(compoundSymbol);
+ handlerStack->push(IO);
+ IO->StartElement(name, handlerStack);
+ }
}
void IOSymbolInstance::ElementChars(const wchar_t *ch)
@@ -77,8 +88,17 @@
inctab();
// we must write either a symbol definition or reference, but not both
- if (symbolInstance->GetSymbolDefinition())
- IOSymbolDefinition::Write(fd, symbolInstance->GetSymbolDefinition(), false);
+ SymbolDefinition* pSymbol = symbolInstance->GetSymbolDefinition();
+ if (pSymbol)
+ {
+ SimpleSymbolDefinition* pSimpleSymbol = dynamic_cast<SimpleSymbolDefinition*>(pSymbol);
+ CompoundSymbolDefinition* pCompoundSymbol = dynamic_cast<CompoundSymbolDefinition*>(pSymbol);
+
+ if (pSimpleSymbol)
+ IOSimpleSymbolDefinition::Write(fd, pSimpleSymbol, false);
+ else if (pCompoundSymbol)
+ IOCompoundSymbolDefinition::Write(fd, pCompoundSymbol, false);
+ }
else
{
EMIT_STRING_PROPERTY(fd, symbolInstance, SymbolReference, false)
Modified: trunk/MgDev/Common/MdfParser/Makefile.am
===================================================================
--- trunk/MgDev/Common/MdfParser/Makefile.am 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/Makefile.am 2007-03-20 20:51:33 UTC (rev 1305)
@@ -73,7 +73,6 @@
IOStroke.cpp \
IOSupplementalSpatialContextInfo.cpp \
IOSymbol.cpp \
- IOSymbolDefinition.cpp \
IOSymbolInstance.cpp \
IOSymbolInstanceCollection.cpp \
IOText.cpp \
@@ -152,7 +151,6 @@
IOStroke.h \
IOSupplementalSpatialContextInfo.h \
IOSymbol.h \
- IOSymbolDefinition.h \
IOSymbolInstance.h \
IOSymbolInstanceCollection.h \
IOText.h \
Modified: trunk/MgDev/Common/MdfParser/MdfParser.vcproj
===================================================================
--- trunk/MgDev/Common/MdfParser/MdfParser.vcproj 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/MdfParser.vcproj 2007-03-20 20:51:33 UTC (rev 1305)
@@ -692,14 +692,6 @@
>
</File>
<File
- RelativePath=".\IOSymbolDefinition.cpp"
- >
- </File>
- <File
- RelativePath=".\IOSymbolDefinition.h"
- >
- </File>
- <File
RelativePath=".\IOSymbolInstance.cpp"
>
</File>
Modified: trunk/MgDev/Common/MdfParser/SAX2Parser.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/SAX2Parser.cpp 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/MdfParser/SAX2Parser.cpp 2007-03-20 20:51:33 UTC (rev 1305)
@@ -22,7 +22,6 @@
#include "IOVectorLayerDefinition.h"
#include "IODrawingLayerDefinition.h"
#include "IOGridLayerDefinition.h"
-#include "IOSymbolDefinition.h"
#include "IOSimpleSymbolDefinition.h"
#include "IOCompoundSymbolDefinition.h"
#include "UnicodeString.h"
@@ -301,7 +300,14 @@
{
zerotab();
fd << tab() << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << std::endl; // NOXLATE
- IOSymbolDefinition::Write(fd, pSymbol, true);
+
+ SimpleSymbolDefinition* pSimpleSymbol = dynamic_cast<SimpleSymbolDefinition*>(pSymbol);
+ CompoundSymbolDefinition* pCompoundSymbol = dynamic_cast<CompoundSymbolDefinition*>(pSymbol);
+
+ if (NULL != pSimpleSymbol)
+ IOSimpleSymbolDefinition::Write(fd, pSimpleSymbol, true);
+ else if (NULL != pCompoundSymbol)
+ IOCompoundSymbolDefinition::Write(fd, pCompoundSymbol, true);
}
fd.close();
}
@@ -361,9 +367,9 @@
CompoundSymbolDefinition* pCompoundSymbol = dynamic_cast<CompoundSymbolDefinition*>(pSymbol);
if (NULL != pSimpleSymbol)
- IOSimpleSymbolDefinition::Write(fd, pSimpleSymbol);
+ IOSimpleSymbolDefinition::Write(fd, pSimpleSymbol, true);
else if (NULL != pCompoundSymbol)
- IOCompoundSymbolDefinition::Write(fd, pCompoundSymbol);
+ IOCompoundSymbolDefinition::Write(fd, pCompoundSymbol, true);
return fd.str();
}
Modified: trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/Schema/LayerDefinition-1.1.0.xsd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -876,16 +876,21 @@
</xs:annotation>
<xs:sequence>
<xs:choice>
- <xs:element name="SymbolDefinition" type="SymbolDefinitionType">
+ <xs:element name="SymbolReference" type="xs:string">
<xs:annotation>
- <xs:documentation>An inlined SymbolDefinition, either simple or compound.</xs:documentation>
+ <xs:documentation>A library reference to an existing SymbolDefinition, either simple or compound.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="SymbolReference" type="xs:string">
+ <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinitionType">
<xs:annotation>
- <xs:documentation>A library reference to an existing SymbolDefinition, either simple or compound.</xs:documentation>
+ <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>
Modified: trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Common/Schema/SymbolDefinition-1.0.0.xsd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="SymbolDefinition" type="SymbolDefinitionType">
+ <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinitionType">
<xs:annotation>
- <xs:documentation>A 2D symbol for stylization.</xs:documentation>
+ <xs:documentation>A 2D simple symbol for stylization.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:complexType name="SymbolDefinitionType">
+ <xs:element name="CompoundSymbolDefinition" type="CompoundSymbolDefinitionType">
<xs:annotation>
- <xs:documentation>Encapsulates the definition of a 2D symbol.</xs:documentation>
+ <xs:documentation>A 2D compound symbol for stylization.</xs:documentation>
</xs:annotation>
- <xs:choice>
- <xs:element name="SimpleSymbolDefinition" type="SimpleSymbolDefinitionType"/>
- <xs:element name="CompoundSymbolDefinition" type="CompoundSymbolDefinitionType"/>
- </xs:choice>
- </xs:complexType>
+ </xs:element>
<xs:complexType name="SymbolDefinitionBaseType">
<xs:annotation>
<xs:documentation>Base type used with all symbol definitions.</xs:documentation>
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceContentManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceContentManager.cpp 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceContentManager.cpp 2007-03-20 20:51:33 UTC (rev 1305)
@@ -566,16 +566,36 @@
bool valid = false;
- // TODO: Enforce versioning in future release.
- if (STRING::npos != schemaName.find(rootName))
+ // The symbol definition schema contains two root elements whose
+ // names don't exactly match the schema name and resource type.
+ // We therefore require special handling for symbol definition
+ // resources.
+ STRING resourceType = resource.GetResourceType();
+ if (resourceType == MgResourceType::SymbolDefinition)
{
- if (resource.IsRoot())
+ // verify the schema name matches the resource type
+ if (STRING::npos != schemaName.find(resourceType))
{
- valid = (L"RepositoryContent" == rootName);
+ // verify the rootname is one of the symbol definition elements
+ if (STRING::npos != rootName.find(resourceType))
+ {
+ valid = true;
+ }
}
- else if (!resource.IsFolder())
+ }
+ else
+ {
+ // TODO: Enforce versioning in future release.
+ if (STRING::npos != schemaName.find(rootName))
{
- valid = (resource.GetResourceType() == rootName);
+ if (resource.IsRoot())
+ {
+ valid = (L"RepositoryContent" == rootName);
+ }
+ else if (!resource.IsFolder())
+ {
+ valid = (resourceType == rootName);
+ }
}
}
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MTYP1500a.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MTYP1500a.sd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MTYP1500a.sd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,40 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
- <CompoundSymbolDefinition>
- <Name>MTYP1500a</Name>
- <SimpleSymbol>
- <SimpleSymbolDefinition>
- <Name>UpperLowerDashing</Name>
- <Graphics>
- <Path>
- <Geometry>
- M 0,-2.5 h 8 m 2,0 h 8 m 2,0 h 2
- M 0,2.5 h 8 m 2,0 h 8 m 2,0 h 2
- </Geometry>
- </Path>
- </Graphics>
- <LineUsage>
- <VertexControl>OverlapWrap</VertexControl>
- <Repeat>24</Repeat>
- </LineUsage>
- <ParameterDefinition/>
- </SimpleSymbolDefinition>
- </SimpleSymbol>
- <SimpleSymbol>
- <SimpleSymbolDefinition>
- <Name>OffsetCrossTick</Name>
- <Graphics>
- <Path>
- <Geometry>M 0.0,-2.5 v 5</Geometry>
- </Path>
- </Graphics>
- <LineUsage>
- <VertexControl>OverlapWrap</VertexControl>
- <StartOffset>28</StartOffset>
- <Repeat>24</Repeat>
- </LineUsage>
- <ParameterDefinition/>
- </SimpleSymbolDefinition>
- </SimpleSymbol>
- </CompoundSymbolDefinition>
-</SymbolDefinition>
+<CompoundSymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
+ <Name>MTYP1500a</Name>
+ <SimpleSymbol>
+ <SimpleSymbolDefinition>
+ <Name>UpperLowerDashing</Name>
+ <Graphics>
+ <Path>
+ <Geometry>
+ M 0,-2.5 h 8 m 2,0 h 8 m 2,0 h 2
+ M 0,2.5 h 8 m 2,0 h 8 m 2,0 h 2
+ </Geometry>
+ </Path>
+ </Graphics>
+ <LineUsage>
+ <VertexControl>OverlapWrap</VertexControl>
+ <Repeat>24</Repeat>
+ </LineUsage>
+ <ParameterDefinition/>
+ </SimpleSymbolDefinition>
+ </SimpleSymbol>
+ <SimpleSymbol>
+ <SimpleSymbolDefinition>
+ <Name>OffsetCrossTick</Name>
+ <Graphics>
+ <Path>
+ <Geometry>M 0.0,-2.5 v 5</Geometry>
+ </Path>
+ </Graphics>
+ <LineUsage>
+ <VertexControl>OverlapWrap</VertexControl>
+ <StartOffset>28</StartOffset>
+ <Repeat>24</Repeat>
+ </LineUsage>
+ <ParameterDefinition/>
+ </SimpleSymbolDefinition>
+ </SimpleSymbol>
+</CompoundSymbolDefinition>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompTypeStyle.ldf 2007-03-20 20:51:33 UTC (rev 1305)
@@ -35,160 +35,158 @@
<AddToExclusionRegion>False</AddToExclusionRegion>
</SymbolInstance>
<SymbolInstance>
- <SymbolDefinition>
- <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>
+ <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>
- </SymbolDefinition>
+ <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>
<ScaleX>2.0</ScaleX>
<ScaleY>2.0</ScaleY>
<SizeContext>MappingUnits</SizeContext>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompoundSymbol.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompoundSymbol.sd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MdfTestCompoundSymbol.sd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,155 +1,153 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
- <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>
+<CompoundSymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
+ <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>
-</SymbolDefinition>
+ <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>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/MdfTestSimpleSymbol.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/MdfTestSimpleSymbol.sd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/UnitTest/TestData/Symbology/MdfTestSimpleSymbol.sd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,144 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
- <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>
+<SimpleSymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
+ <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>
-</SymbolDefinition>
+ <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>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/linesymbol.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/linesymbol.sd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/UnitTest/TestData/Symbology/linesymbol.sd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,24 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
- <SimpleSymbolDefinition>
- <Name>LineSymbol</Name>
- <Graphics>
- <Path>
- <Geometry>M -1,0 L 1,0 L 0,1.5 L -1,0</Geometry>
- <FillColor>ffff0000</FillColor>
- <LineColor>00000000</LineColor>
- <LineWeight>0</LineWeight>
- </Path>
- <Path>
- <Geometry>M -2,0 L 2,0</Geometry>
- <FillColor>00000000</FillColor>
- <LineColor>ffff0000</LineColor>
- <LineWeight>0</LineWeight>
- </Path>
- </Graphics>
- <LineUsage>
- <Repeat>4</Repeat>
- </LineUsage>
- <ParameterDefinition/>
- </SimpleSymbolDefinition>
-</SymbolDefinition>
+<SimpleSymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
+ <Name>LineSymbol</Name>
+ <Graphics>
+ <Path>
+ <Geometry>M -1,0 L 1,0 L 0,1.5 L -1,0</Geometry>
+ <FillColor>ffff0000</FillColor>
+ <LineColor>00000000</LineColor>
+ <LineWeight>0</LineWeight>
+ </Path>
+ <Path>
+ <Geometry>M -2,0 L 2,0</Geometry>
+ <FillColor>00000000</FillColor>
+ <LineColor>ffff0000</LineColor>
+ <LineWeight>0</LineWeight>
+ </Path>
+ </Graphics>
+ <LineUsage>
+ <Repeat>4</Repeat>
+ </LineUsage>
+ <ParameterDefinition/>
+</SimpleSymbolDefinition>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/symbol.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/symbol.sd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/UnitTest/TestData/Symbology/symbol.sd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,22 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
- <SimpleSymbolDefinition>
- <Name>Symbol</Name>
- <Graphics>
- <Path>
- <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
- <FillColor>ff0000ff</FillColor>
- <LineColor>ffff0000</LineColor>
- <LineWeight>0</LineWeight>
- </Path>
- <Path>
- <Geometry>M -2,-2 L 7,7 M 7,-2 L -2,7</Geometry>
- <FillColor>00000000</FillColor>
- <LineColor>ffffff00</LineColor>
- <LineWeight>1</LineWeight>
- </Path>
- </Graphics>
- <PointUsage/>
- <ParameterDefinition/>
- </SimpleSymbolDefinition>
-</SymbolDefinition>
+<SimpleSymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
+ <Name>Symbol</Name>
+ <Graphics>
+ <Path>
+ <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
+ <FillColor>ff0000ff</FillColor>
+ <LineColor>ffff0000</LineColor>
+ <LineWeight>0</LineWeight>
+ </Path>
+ <Path>
+ <Geometry>M -2,-2 L 7,7 M 7,-2 L -2,7</Geometry>
+ <FillColor>00000000</FillColor>
+ <LineColor>ffffff00</LineColor>
+ <LineWeight>1</LineWeight>
+ </Path>
+ </Graphics>
+ <PointUsage/>
+ <ParameterDefinition/>
+</SimpleSymbolDefinition>
Modified: trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd 2007-03-20 19:05:34 UTC (rev 1304)
+++ trunk/MgDev/UnitTest/TestData/Symbology/symbolp.sd 2007-03-20 20:51:33 UTC (rev 1305)
@@ -1,57 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
- <SimpleSymbolDefinition>
- <Name>X_on_Box</Name>
- <Graphics>
- <Path>
- <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
- <FillColor>%FILL%</FillColor>
- <LineColor>%OUTLINE%</LineColor>
- <LineWeight>2*(%THICKNESS% + 1)</LineWeight>
- </Path>
- <Path>
- <Geometry>M -2,-2 L 7,7 M 7,-2 L -2,7</Geometry>
- <FillColor>00000000</FillColor>
- <LineColor>%COLOR%</LineColor>
- <LineWeight>1</LineWeight>
- </Path>
- </Graphics>
- <PointUsage/>
- <ParameterDefinition>
- <Parameter>
- <Identifier>COLOR</Identifier>
- <DefaultValue>FFFFFF00</DefaultValue>
- <DisplayName>X Color</DisplayName>
- <Description>The color of the X thingie that is across the box</Description>
- <AllowedValues>
- <Value>FFFF0000</Value>
- <Value>FFFFFF00</Value>
- <Value>FF00FF00</Value>
- </AllowedValues>
- </Parameter>
- <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>-.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>
- </AllowedValues>
- </Parameter>
- </ParameterDefinition>
- </SimpleSymbolDefinition>
-</SymbolDefinition>
+<SimpleSymbolDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="SymbolDefinition-1.0.0.xsd">
+ <Name>X_on_Box</Name>
+ <Graphics>
+ <Path>
+ <Geometry>M 0,0 L 5,0 L 5,5 L 0,5 L 0,0</Geometry>
+ <FillColor>%FILL%</FillColor>
+ <LineColor>%OUTLINE%</LineColor>
+ <LineWeight>2*(%THICKNESS% + 1)</LineWeight>
+ </Path>
+ <Path>
+ <Geometry>M -2,-2 L 7,7 M 7,-2 L -2,7</Geometry>
+ <FillColor>00000000</FillColor>
+ <LineColor>%COLOR%</LineColor>
+ <LineWeight>1</LineWeight>
+ </Path>
+ </Graphics>
+ <PointUsage/>
+ <ParameterDefinition>
+ <Parameter>
+ <Identifier>COLOR</Identifier>
+ <DefaultValue>FFFFFF00</DefaultValue>
+ <DisplayName>X Color</DisplayName>
+ <Description>The color of the X thingie that is across the box</Description>
+ <AllowedValues>
+ <Value>FFFF0000</Value>
+ <Value>FFFFFF00</Value>
+ <Value>FF00FF00</Value>
+ </AllowedValues>
+ </Parameter>
+ <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>-.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>
+ </AllowedValues>
+ </Parameter>
+ </ParameterDefinition>
+</SimpleSymbolDefinition>
More information about the mapguide-commits
mailing list