[mapguide-commits] r6564 - in sandbox/adsk/vik:
Common/CoordinateSystem Common/Foundation
Common/Foundation/Data Common/Foundation/Exception
Common/Foundation/System Common/Geometry
Common/Geometry/CoordinateSystem Oem
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Mar 31 14:20:08 EDT 2012
Author: traianstanev
Date: 2012-03-31 11:20:08 -0700 (Sat, 31 Mar 2012)
New Revision: 6564
Removed:
sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h
sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp
sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.h
sandbox/adsk/vik/Common/Geometry/AgfStream.cpp
sandbox/adsk/vik/Common/Geometry/AgfStream.h
Modified:
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.h
sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.cpp
sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.h
sandbox/adsk/vik/Common/Foundation/Data/Collection.h
sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp
sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.h
sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp
sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.h
sandbox/adsk/vik/Common/Foundation/Data/Property.cpp
sandbox/adsk/vik/Common/Foundation/Data/Property.h
sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.cpp
sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.h
sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp
sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.h
sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp
sandbox/adsk/vik/Common/Foundation/Data/StringCollection.h
sandbox/adsk/vik/Common/Foundation/Data/StringProperty.cpp
sandbox/adsk/vik/Common/Foundation/Data/StringProperty.h
sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp
sandbox/adsk/vik/Common/Foundation/Exception/Exception.h
sandbox/adsk/vik/Common/Foundation/Foundation.h
sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters
sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp
sandbox/adsk/vik/Common/Foundation/System/Disposable.h
sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp
sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.h
sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp
sandbox/adsk/vik/Common/Foundation/System/FileUtil.h
sandbox/adsk/vik/Common/Foundation/System/Object.cpp
sandbox/adsk/vik/Common/Foundation/System/Object.h
sandbox/adsk/vik/Common/Foundation/System/Resources.cpp
sandbox/adsk/vik/Common/Foundation/System/Resources.h
sandbox/adsk/vik/Common/Foundation/System/Serializable.h
sandbox/adsk/vik/Common/Foundation/System/Util.cpp
sandbox/adsk/vik/Common/Foundation/System/Util.h
sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp
sandbox/adsk/vik/Common/Geometry/AggregateGeometry.h
sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp
sandbox/adsk/vik/Common/Geometry/ArcSegment.h
sandbox/adsk/vik/Common/Geometry/Coordinate.cpp
sandbox/adsk/vik/Common/Geometry/Coordinate.h
sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateIterator.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystem.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformDefParams.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h
sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXY.h
sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXYM.h
sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.h
sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.h
sandbox/adsk/vik/Common/Geometry/Curve.cpp
sandbox/adsk/vik/Common/Geometry/Curve.h
sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp
sandbox/adsk/vik/Common/Geometry/CurvePolygon.h
sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp
sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.h
sandbox/adsk/vik/Common/Geometry/CurveRing.cpp
sandbox/adsk/vik/Common/Geometry/CurveRing.h
sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp
sandbox/adsk/vik/Common/Geometry/CurveRingCollection.h
sandbox/adsk/vik/Common/Geometry/CurveSegment.h
sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp
sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.h
sandbox/adsk/vik/Common/Geometry/CurveString.cpp
sandbox/adsk/vik/Common/Geometry/CurveString.h
sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp
sandbox/adsk/vik/Common/Geometry/CurveStringCollection.h
sandbox/adsk/vik/Common/Geometry/Envelope.cpp
sandbox/adsk/vik/Common/Geometry/Envelope.h
sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp
sandbox/adsk/vik/Common/Geometry/GeometricEntity.h
sandbox/adsk/vik/Common/Geometry/Geometry.cpp
sandbox/adsk/vik/Common/Geometry/Geometry.h
sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj
sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters
sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp
sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp
sandbox/adsk/vik/Common/Geometry/GeometryCollection.h
sandbox/adsk/vik/Common/Geometry/GeometryCommon.h
sandbox/adsk/vik/Common/Geometry/GeometryComponent.h
sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp
sandbox/adsk/vik/Common/Geometry/GeometryFactory.h
sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp
sandbox/adsk/vik/Common/Geometry/GeometryUtil.h
sandbox/adsk/vik/Common/Geometry/LineString.cpp
sandbox/adsk/vik/Common/Geometry/LineString.h
sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp
sandbox/adsk/vik/Common/Geometry/LineStringCollection.h
sandbox/adsk/vik/Common/Geometry/LinearRing.cpp
sandbox/adsk/vik/Common/Geometry/LinearRing.h
sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp
sandbox/adsk/vik/Common/Geometry/LinearRingCollection.h
sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp
sandbox/adsk/vik/Common/Geometry/LinearSegment.h
sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp
sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.h
sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp
sandbox/adsk/vik/Common/Geometry/MultiCurveString.h
sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp
sandbox/adsk/vik/Common/Geometry/MultiGeometry.h
sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp
sandbox/adsk/vik/Common/Geometry/MultiLineString.h
sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp
sandbox/adsk/vik/Common/Geometry/MultiPoint.h
sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp
sandbox/adsk/vik/Common/Geometry/MultiPolygon.h
sandbox/adsk/vik/Common/Geometry/Point.cpp
sandbox/adsk/vik/Common/Geometry/Point.h
sandbox/adsk/vik/Common/Geometry/PointCollection.cpp
sandbox/adsk/vik/Common/Geometry/PointCollection.h
sandbox/adsk/vik/Common/Geometry/Polygon.cpp
sandbox/adsk/vik/Common/Geometry/Polygon.h
sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp
sandbox/adsk/vik/Common/Geometry/PolygonCollection.h
sandbox/adsk/vik/Common/Geometry/Region.cpp
sandbox/adsk/vik/Common/Geometry/Region.h
sandbox/adsk/vik/Common/Geometry/Ring.h
sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp
sandbox/adsk/vik/Common/Geometry/WktReaderWriter.h
sandbox/adsk/vik/Oem/
Log:
Cleanup of remaining ACE dependencies -- they were previously #ifdefed out, now they are gone.
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -47,7 +47,6 @@
virtual bool GetCompareInternalDatumOldParameters();
protected:
-// INT32 GetClassId();
//from MgDisposable
virtual void Dispose();
Modified: sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -41,16 +41,6 @@
//////////////////////////////////////////////////////////////////
/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgBatchPropertyCollection::GetClassId()
-{
- return m_cls_id;
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
/// Sets the item in the collection at the specified index to the specified value.
/// </summary>
/// <param name="index">Input index</param>
@@ -195,66 +185,6 @@
return m_dCollection->IndexOf(value);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Creates an XML document representing the collection.
-/// </summary>
-/// <returns>
-/// Returns a pointer to an MgByteReader object.
-/// </returns>
-MgByteReader* MgBatchPropertyCollection::ToXml()
-{
- string xmlStr = "<BatchPropertyCollection>";
-
- INT32 cnt = this->GetCount();
- for (int i=0; i < cnt; i++)
- {
- Ptr<MgPropertyCollection> ptr = (MgPropertyCollection*)m_dCollection->GetItem(i);
- if (ptr != NULL)
- ptr->ToXml(xmlStr);
- }
-
- xmlStr += "</BatchPropertyCollection>";
-
- return MgUtil::GetByteReader(xmlStr, (STRING*)&MgMimeType::Xml);
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Serializes data to a TCP/IP stream.
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgBatchPropertyCollection::Serialize(MgStream* stream)
-{
- INT32 count = this->GetCount();
- stream->WriteInt32(count);
- for (INT32 i = 0; i < count; i++)
- stream->WriteObject(Ptr<MgPropertyCollection>(this->GetItem(i)));
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Deserializes data from a TCP/IP stream.
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgBatchPropertyCollection::Deserialize(MgStream* stream)
-{
- INT32 count = 0;
- stream->GetInt32(count);
- for (INT32 i = 0; i < count; i++)
- {
- Ptr<MgPropertyCollection> prop;
- prop = (MgPropertyCollection*)stream->GetObject();
- this->Add(prop);
- }
-}
-#endif //WANT_ACE
-
/////////////////////////////////////////////////////////////////
/// <summary>
/// Disposes the object.
@@ -264,16 +194,3 @@
delete this;
}
-//////////////////////////////////////////////////////////////////
-// Convert to XML
-#if WANT_ACE
-void MgBatchPropertyCollection::ToXml(string& str)
-{
- INT32 count = this->GetCount();
- for (INT32 i = 0; i < count; i++)
- {
- Ptr<MgPropertyCollection> propDefCol = this->GetItem(i);
- propDefCol->ToXml(str);
- }
-}
-#endif //WANT_ACE
\ No newline at end of file
Modified: sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/BatchPropertyCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -298,22 +298,8 @@
virtual INT32 IndexOf(const MgPropertyDefinition* value) const;
EXTERNAL_API:
-#if WANT_ACE
//////////////////////////////////////////////////////////
/// \brief
- /// Creates an XML document representing the collection.
- /// The order of properties in the XML would be same as the order of the properties in the collection.
- /// It starts with item zero to length of collection.
- /// TODO: Add a snippet of XML here?
- ///
- /// \return
- /// A pointer to an MgByteReader object.
- ///
- virtual MgByteReader* ToXml();
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////
- /// \brief
/// Deletes the collection and the properties contained in it.
///
/// \return
@@ -323,42 +309,10 @@
INTERNAL_API:
-#if WANT_ACE
- //////////////////////////////////////////////////////////
- /// \brief
- /// Serializes data to a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////
- /// \brief
- /// Deserializes data from a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-
- /// Convert to XML
- void ToXml(string& xmlStr);
-#endif //WANT_ACE
-
protected:
//////////////////////////////////////////////////////////
/// \brief
- /// Gets the class Id
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
- //////////////////////////////////////////////////////////
- /// \brief
/// Disposes the object.
///
virtual void Dispose();
@@ -366,9 +320,6 @@
private:
Ptr<MgDisposableCollection> m_dCollection;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Collection_BatchPropertyCollection;
};
/// \}
Modified: sandbox/adsk/vik/Common/Foundation/Data/Collection.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/Collection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/Collection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -97,16 +97,6 @@
virtual void RemoveAt(INT32 index) = 0;
EXTERNAL_API:
-#if WANT_ACE
- //////////////////////////////////////////////////////////
- /// \brief
- /// Creates an XML document representing the collection.
- ///
- /// \return
- /// A pointer to an MgByteReader object.
- ///
- virtual MgByteReader* ToXml() = 0;
-#endif //WANT_ACE
INTERNAL_API:
//////////////////////////////////////////////////////////
/// \brief
Modified: sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -67,16 +67,6 @@
//////////////////////////////////////////////////////////////////
/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgNamedCollection::GetClassId()
-{
- return m_cls_id;
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
/// Returns number of items in the collection.
/// </summary>
INT32 MgNamedCollection::GetCount() const
@@ -399,64 +389,8 @@
return -1;
}
-#if WANT_ACE
-
//////////////////////////////////////////////////////////////////
/// <summary>
-/// Creates an XML document representing the collection.
-/// </summary>
-/// <returns>
-/// Returns a pointer to an MgByteReader object.
-/// </returns>
-MgByteReader* MgNamedCollection::ToXml()
-{
- throw new MgNotImplementedException(L"MgNamedCollection.ToXml", __LINE__, __WFILE__, NULL, L"", NULL);
-
- return NULL;
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Serialize data to TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgNamedCollection::Serialize(MgStream* stream)
-{
- INT32 size = GetCount();
- stream->WriteInt32(size);
-
- for (INT32 i = 0; i < size; ++i)
- {
- Ptr<MgNamedSerializable> obj = GetItem(i);
- stream->WriteObject(obj);
- }
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Deserialize data from TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgNamedCollection::Deserialize(MgStream* stream)
-{
- INT32 size = 0;
- stream->GetInt32(size);
-
- for (INT32 i = 0; i < size; ++i)
- {
- Ptr<MgNamedSerializable> obj = (MgNamedSerializable*)stream->GetObject();
- Add(obj);
- }
-}
-#endif //WANT_ACE
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
/// Disposes the object.
/// </summary>
void MgNamedCollection::Dispose()
Modified: sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -235,35 +235,6 @@
///
virtual INT32 IndexOf(CREFSTRING name) const;
-#if WANT_ACE
- //////////////////////////////////////////////////////////
- /// \brief
- /// Creates an XML document representing the collection.
- ///
- /// \return
- /// A pointer to an MgByteReader object.
- ///
- virtual MgByteReader* ToXml();
-
- //////////////////////////////////////////////////////////
- /// \brief
- /// Serializes data to a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////
- /// \brief
- /// Deserializes data from a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
MgNamedCollection(bool allowDuplicate, bool caseSensitive);
MgNamedCollection(bool caseSensitive = true);
bool GetAllowDuplicate();
@@ -274,15 +245,6 @@
//////////////////////////////////////////////////////////
/// \brief
- /// Gets the class Id.
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
- //////////////////////////////////////////////////////////
- /// \brief
/// Disposes the object.
///
virtual void Dispose();
@@ -316,9 +278,6 @@
bool m_bAllowDuplicate;
bool m_bCaseSensitive;
bool m_bCheckDuplicate;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Collection_NamedCollection;
};
/// \endcond
Modified: sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -71,34 +71,3 @@
}
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-///<summary>
-/// Serialize data to TCP/IP stream
-///</summary>
-///<param name="stream">
-/// Stream
-///</param>
-void MgNullableProperty::Serialize(MgStream* stream)
-{
- stream->WriteString(GetName());
- stream->WriteBoolean(m_bIsNull);
-}
-
-//////////////////////////////////////////////////////////////////
-///<summary>
-/// Deserialize data from TCP/IP stream
-///</summary>
-///<param name="stream">
-/// Stream
-///</param>
-void MgNullableProperty::Deserialize(MgStream* stream)
-{
- STRING str;
-
- stream->GetString(str);
- SetName(str);
-
- stream->GetBoolean(m_bIsNull);
-}
-#endif WANT_ACE
\ No newline at end of file
Modified: sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -82,26 +82,6 @@
///
bool IsNull();
-INTERNAL_API:
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
protected:
/// Constructor
Modified: sandbox/adsk/vik/Common/Foundation/Data/Property.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/Property.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/Property.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -36,15 +36,6 @@
/////////////////////////////////////////////////////////////////
/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgProperty::GetClassId()
-{
- return m_cls_id;
-}
-
-/////////////////////////////////////////////////////////////////
-/// <summary>
/// Returns the property name
/// </summary>
/// <returns>
Modified: sandbox/adsk/vik/Common/Foundation/Data/Property.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/Property.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/Property.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -116,15 +116,6 @@
protected:
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Gets the class Id.
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
/// Constructor
MgProperty();
@@ -142,9 +133,6 @@
friend class MgPropertyCollection;
STRING m_propertyName;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Property_Property;
};
/// \}
Modified: sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -51,16 +51,7 @@
}
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgPropertyCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////////////////////////
/// <summary>
/// Sets the item in the collection at the specified index to the specified value.
@@ -267,75 +258,6 @@
return m_nCollection->IndexOf(name);
}
-
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Creates an XML document representing the collection.
-/// </summary>
-/// <returns>
-/// Returns a pointer to an MgByteReader object.
-/// </returns>
-MgByteReader* MgPropertyCollection::ToXml()
-{
- string xmlStr;
- ToXml(xmlStr);
- return MgUtil::GetByteReader(xmlStr);
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Serialize data to TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgPropertyCollection::Serialize(MgStream* stream)
-{
- INT32 count = this->GetCount();
- stream->WriteInt32(count);
- bool bAllowDuplicate = m_nCollection->GetAllowDuplicate();
- stream->WriteBoolean(bAllowDuplicate);
- bool bCaseSensitive = m_nCollection->GetCaseSenstive();
- stream->WriteBoolean(bCaseSensitive);
- for (INT32 i = 0; i < count; i++)
- {
- Ptr<MgProperty> prop = this->GetItem(i);
- stream->WriteObject(prop);
- }
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Deserialize data from TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgPropertyCollection::Deserialize(MgStream* stream)
-{
- INT32 count = 0;
- stream->GetInt32(count);
- bool bAllowDuplicate = false;
- stream->GetBoolean(bAllowDuplicate);
- bool bCaseSensitive = false;
- stream->GetBoolean(bCaseSensitive);
-
- if (m_nCollection)
- {
- m_nCollection = NULL;
- }
-
- m_nCollection = new MgNamedCollection(bAllowDuplicate, bCaseSensitive);
-
- for (INT32 i = 0; i < count; i++)
- {
- Ptr<MgProperty> prop = (MgProperty*)stream->GetObject();
- this->Add(prop);
- }
-}
-#endif
-
/////////////////////////////////////////////////////////////////
/// <summary>
/// Disposes the object.
Modified: sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/PropertyCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -367,22 +367,8 @@
EXTERNAL_API:
-#if WANT_ACE
//////////////////////////////////////////////////////////
/// \brief
- /// Creates an XML document representing the collection.
- /// The order of the properties in the XML is the same as the order of the properties in the collection.
- /// It starts with item zero to length of collection.
- /// TODO: Add a snippet of XML here?
- ///
- /// \return
- /// A pointer to an MgByteReader object.
- ///
- virtual MgByteReader* ToXml();
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////
- /// \brief
/// Deletes the collection and the properties contained in it.
///
/// \return
@@ -415,26 +401,6 @@
///
virtual MgProperty* FindItem(CREFSTRING name);
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serializes data to a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserializes data from a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
/// Convert to XML
void ToXml(string& str, bool includeType, string rootElmName = "Property");
void ToXml(string& str);
@@ -449,15 +415,6 @@
/////////////////////////////////////////////////////////////////
/// \brief
- /// Gets the class Id.
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
- /////////////////////////////////////////////////////////////////
- /// \brief
/// Disposes the object.
///
virtual void Dispose();
@@ -465,9 +422,6 @@
private:
Ptr<MgNamedCollection> m_nCollection;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Collection_PropertyCollection;
};
/// \}
Modified: sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -79,15 +79,6 @@
/////////////////////////////////////////////////////////////////
/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgPropertyDefinition::GetClassId()
-{
- return m_cls_id;
-}
-
-/////////////////////////////////////////////////////////////////
-/// <summary>
/// Returns the property type
/// </summary>
/// <returns>
@@ -149,52 +140,6 @@
str += "</" + rootElmName + ">";
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-///<summary>
-/// Serialize data to TCP/IP stream
-///</summary>
-///<param name="stream">
-/// Stream
-///</param>
-void MgPropertyDefinition::Serialize(MgStream* stream)
-{
- stream->WriteString(GetName());
- stream->WriteString(GetDescription());
- stream->WriteString(GetQualifiedName());
- stream->WriteInt16((INT16)m_propertyType);
- stream->WriteBoolean(m_isDeleted);
-}
-
-//////////////////////////////////////////////////////////////////
-///<summary>
-/// Deserialize data from TCP/IP stream
-///</summary>
-///<param name="stream">
-/// Stream
-///</param>
-void MgPropertyDefinition::Deserialize(MgStream* stream)
-{
- STRING str;
- INT16 type;
- bool isDeleted;
-
- stream->GetString(str);
- SetName(str);
-
- stream->GetString(str);
- SetDescription(str);
-
- stream->GetString(str);
- SetQualifiedName(str);
-
- stream->GetInt16(type);
- m_propertyType = type;
-
- stream->GetBoolean(isDeleted);
- m_isDeleted = isDeleted;
-}
-#endif //WANT_ACE
/////////////////////////////////////////////////////////////////
/// <summary>
/// Marks the property definition for deletion.
Modified: sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -222,28 +222,8 @@
///
MgPropertyDefinition();
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
/// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Checks whether the property definition is marked as deleted.
///
/// \return
@@ -254,15 +234,6 @@
protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId();
-
friend class MgPropertyDefinitionCollection;
/////////////////////////////////////////////////////////////////
@@ -289,9 +260,6 @@
STRING m_description;
INT16 m_propertyType;
bool m_isDeleted;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Property_PropertyDefinition;
};
/// \}
Modified: sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -37,19 +37,8 @@
m_strProperty.clear();
}
-
//////////////////////////////////////////////////////////////////
/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgStringCollection::GetClassId()
-{
- return m_cls_id;
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
/// Gets the number of items in the collection.
/// </summary>
/// <returns>
@@ -217,70 +206,8 @@
return index;
}
-#if WANT_ACE
-
//////////////////////////////////////////////////////////////////
/// <summary>
-/// Creates an XML document representing the collection.
-/// </summary>
-/// <returns>
-/// Returns a pointer to an MgByteReader object.
-/// </returns>
-MgByteReader* MgStringCollection::ToXml()
-{
- // TODO: define a schema for this XML
- string xmlStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
- xmlStr += "<StringCollection>";
-
- INT32 cnt = this->GetCount();
- for (int i=0; i < cnt; i++)
- {
- xmlStr += "<Item>";
- xmlStr += MgUtil::WideCharToMultiByte(MgUtil::ReplaceEscapeCharInXml(m_strProperty[i]));
- xmlStr += "</Item>";
- }
-
- xmlStr += "</StringCollection>";
-
- return MgUtil::GetByteReader(xmlStr, (STRING*)&MgMimeType::Xml);
-}
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Serialize data to TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgStringCollection::Serialize(MgStream* stream)
-{
- INT32 count = this->GetCount();
- stream->WriteInt32(count);
- for (INT32 i = 0; i < count; i++)
- stream->WriteString(this->GetItem(i));
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Deserialize data from TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgStringCollection::Deserialize(MgStream* stream)
-{
- INT32 count = 0;
- stream->GetInt32(count);
- for (INT32 i = 0; i < count; i++)
- {
- STRING str;
- stream->GetString(str);
- this->Add(str);
- }
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
/// Disposes the object.
/// </summary>
void MgStringCollection::Dispose()
Modified: sandbox/adsk/vik/Common/Foundation/Data/StringCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/StringCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/StringCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -293,19 +293,6 @@
virtual INT32 IndexOf(CREFSTRING value);
EXTERNAL_API:
-#if WANT_ACE
- //////////////////////////////////////////////////////////
- /// \brief
- /// Creates an XML document representing the collection.
- /// The order of the properties in the XML is the same as the order of properties in the collection.
- /// It starts with item zero to length of collection.
- /// TODO: Add a snippet of XML here?
- ///
- /// \return
- /// A pointer to an MgByteReader object.
- ///
- virtual MgByteReader* ToXml();
-#endif //WANT_ACE
//////////////////////////////////////////////////////////
/// \brief
@@ -317,28 +304,8 @@
virtual ~MgStringCollection();
INTERNAL_API:
-
-#if WANT_ACE
//////////////////////////////////////////////////////////
/// \brief
- /// Serializes data to a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////
- /// \brief
- /// Deserializes data from a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
- //////////////////////////////////////////////////////////
- /// \brief
/// Builds a log friendly string representation
///
/// \return
@@ -366,15 +333,6 @@
//////////////////////////////////////////////////////////
/// \brief
- /// Gets the class Id.
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
- //////////////////////////////////////////////////////////
- /// \brief
/// Disposes the object.
///
virtual void Dispose();
@@ -385,9 +343,6 @@
void ValidateIndex(INT32 index) const;
std::vector<STRING> m_strProperty;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Collection_StringCollection;
};
/// \}
Modified: sandbox/adsk/vik/Common/Foundation/Data/StringProperty.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/StringProperty.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/StringProperty.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -48,15 +48,6 @@
/////////////////////////////////////////////////////////////////
/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgStringProperty::GetClassId()
-{
- return m_cls_id;
-}
-
-/////////////////////////////////////////////////////////////////
-/// <summary>
/// Returns the property type
/// </summary>
/// <returns>
@@ -145,36 +136,3 @@
}
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-///<summary>
-/// Serialize data to TCP/IP stream
-///</summary>
-///<param name="stream">
-/// Stream
-///</param>
-void MgStringProperty::Serialize(MgStream* stream)
-{
- MgNullableProperty::Serialize(stream);
- stream->WriteString(GetName());
- stream->WriteString(m_value);
-}
-
-//////////////////////////////////////////////////////////////////
-///<summary>
-/// Deserialize data from TCP/IP stream
-///</summary>
-///<param name="stream">
-/// Stream
-///</param>
-void MgStringProperty::Deserialize(MgStream* stream)
-{
- MgNullableProperty::Deserialize(stream);
- STRING str;
-
- stream->GetString(str);
- SetName(str);
-
- stream->GetString(m_value);
-}
-#endif //WANT_ACE
\ No newline at end of file
Modified: sandbox/adsk/vik/Common/Foundation/Data/StringProperty.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/StringProperty.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Data/StringProperty.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -143,37 +143,8 @@
///
MgStringProperty();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serializes data to a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserializes data from a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Gets the class Id.
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
friend class MgPropertyCollection;
friend class MgStringPropertyCollection;
friend class MgStringCollection;
@@ -204,9 +175,6 @@
private:
STRING m_value;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Property_StringProperty;
};
/// \}
Modified: sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -71,26 +71,7 @@
if (locale.empty())
{
-#if WANT_ACE
- MG_TRY()
-
- MgConfiguration* configuration = MgConfiguration::GetInstance();
-
- if (NULL != configuration && configuration->IsFileLoaded())
- {
- configuration->GetStringValue(
- MgFoundationConfigProperties::GeneralPropertiesSection,
- MgFoundationConfigProperties::GeneralPropertyDefaultMessageLocale,
- locale,
- MgFoundationConfigProperties::DefaultGeneralPropertyDefaultMessageLocale);
- }
-
- MG_CATCH_AND_RELEASE()
-#endif //WANT_ACE
- if (locale.empty())
- {
- locale = MgResources::DefaultMessageLocale;
- }
+ locale = MgResources::DefaultMessageLocale;
}
return locale;
@@ -177,49 +158,8 @@
}
}
-#if WANT_ACE
///////////////////////////////////////////////////////////////////////////////
/// \brief
-/// Serialize data to TCP/IP stream.
-///
-void MgException::Serialize(MgStream* stream) throw()
-{
- m_methodNames.Serialize(stream);
- m_methodParams.Serialize(stream);
- m_lineNumbers.Serialize(stream);
- m_fileNames.Serialize(stream);
-
- m_whatArguments.Serialize(stream);
- stream->WriteString(m_whyMessageId);
- m_whyArguments.Serialize(stream);
-
- stream->WriteString(m_message);
- stream->WriteString(m_details);
- stream->WriteString(m_stackTrace);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Deserialize data from TCP/IP stream.
-///
-void MgException::Deserialize(MgStream* stream) throw()
-{
- m_methodNames.Deserialize(stream);
- m_methodParams.Deserialize(stream);
- m_lineNumbers.Deserialize(stream);
- m_fileNames.Deserialize(stream);
-
- m_whatArguments.Deserialize(stream);
- stream->GetString(m_whyMessageId);
- m_whyArguments.Deserialize(stream);
-
- stream->GetString(m_message);
- stream->GetString(m_details);
- stream->GetString(m_stackTrace);
-}
-#endif //WANT_ACE
-///////////////////////////////////////////////////////////////////////////////
-/// \brief
/// Format a message with the specified arguments.
/// This method should be called for critical errors when the configuration
/// or resource file has not been loaded.
@@ -229,18 +169,6 @@
{
assert(NULL != arguments);
STRING message;
-
-#if WANT_ACE
- MG_TRY()
- MgResources* resources = MgResources::GetInstance();
-
- if (NULL != resources)
- {
- message = resources->FormatMessage(resourceStr, arguments);
- }
- MG_CATCH_AND_RELEASE()
-#endif
-
return message;
}
@@ -254,48 +182,6 @@
STRING message;
MgResources* resources = NULL;
-#if WANT_ACE
- MG_TRY()
-
- resources = MgResources::GetInstance();
-
- if (NULL != resources)
- {
- // try using the supplied locale
- STRING resourceStr = resources->GetStringResource(locale, section,
- resourceId);
-
- message = resources->FormatMessage(resourceStr, arguments);
- }
-
- MG_CATCH_AND_RELEASE()
-
- if (message.empty() && NULL != resources && locale != MgResources::DefaultMessageLocale)
- {
- MG_TRY()
-
- // try using the default locale as a backup
- STRING resourceStr = resources->GetStringResource(MgResources::DefaultMessageLocale, section,
- resourceId);
-
- message = resources->FormatMessage(resourceStr, arguments);
-
- MG_CATCH_AND_RELEASE()
- }
-
- if (message.empty() && NULL != resources)
- {
- MG_TRY()
-
- MgStringCollection resourceArguments;
- resourceArguments.Add(resourceId);
-
- message = resources->FormatMessage(
- MgResources::FailedToRetrieveMessage, &resourceArguments);
-
- MG_CATCH_AND_RELEASE()
- }
-#endif
return message;
}
@@ -316,34 +202,6 @@
{
const INT32 startIndex = stackSize - 1;
-#if WANT_ACE
- MG_TRY()
-
- MgResources* resources = MgResources::GetInstance();
-
- if (NULL != resources)
- {
- STRING resourceId = L"MgFormatAllExceptionStackTrace";
- STRING resourceStr = resources->GetStringResource(locale,
- MgResources::ErrorDescription, resourceId);
-
- for (INT32 i = startIndex; i >= 0; --i)
- {
- MgStringCollection arguments;
-
- arguments.Add(m_methodNames.GetItem(i));
- arguments.Add(m_methodParams.GetItem(i));
- arguments.Add(m_lineNumbers.GetItem(i));
- arguments.Add(m_fileNames.GetItem(i));
-
- stackTrace += resources->FormatMessage(resourceStr, &arguments);
- stackTrace += L"\n";
- }
- }
-
- MG_CATCH_AND_RELEASE()
-#endif //WANT_ACE
-
if (stackTrace.empty())
{
STRING methodStr = MgResources::FormatExceptionLocationMethods;
@@ -380,35 +238,6 @@
if (stackSize > 0)
{
const INT32 startIndex = stackSize - 1;
-
-#if WANT_ACE
- MG_TRY()
-
- MgResources* resources = MgResources::GetInstance();
-
- if (NULL != resources)
- {
- STRING resourceId = L"MgFormatAllExceptionDetail";
- STRING resourceStr = resources->GetStringResource(locale,
- MgResources::ErrorDescription, resourceId);
-
- for (INT32 i = startIndex; i >= 0; --i)
- {
- if (!m_methodParams.GetItem(i).empty())
- {
- MgStringCollection arguments;
-
- arguments.Add(m_methodNames.GetItem(i));
- arguments.Add(m_methodParams.GetItem(i));
-
- stackTrace += resources->FormatMessage(resourceStr, &arguments);
- stackTrace += L"\n";
- }
- }
- }
-
- MG_CATCH_AND_RELEASE()
-#endif //WANT_ACE
}
return stackTrace;
@@ -600,5 +429,4 @@
//MgObject Defaults
MgException::MgException() throw() {}
MgObject* MgException::CreateObject() { return new MgException(); }
-INT32 MgException::GetClassId() { return m_cls_id; }
void MgException::Raise() { throw this; }
Modified: sandbox/adsk/vik/Common/Foundation/Exception/Exception.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/Exception.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Exception/Exception.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -194,26 +194,6 @@
///
virtual ~MgException() throw();
-INTERNAL_API:
-#if WANT_ACE
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream) throw();
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream) throw();
-#endif
protected:
///////////////////////////////////////////////////////////////////////////
@@ -350,7 +330,6 @@
//MgObject defaults
static MgObject* CreateObject();
- virtual INT32 GetClassId();
virtual void Raise();
protected:
MgException() throw();
@@ -358,10 +337,6 @@
private:
static LocaleCallbackFunc sm_localeCallbackFunc;
-
-CLASS_ID:
-
- static const INT32 m_cls_id = Foundation_Exception_MgException;
};
#endif
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -18,151 +18,19 @@
#ifndef MG_FOUNDATION_H
#define MG_FOUNDATION_H
-//#define WANT_ACE
//#define WANT_XERCES
//dll interface
#pragma warning(disable: 4251)
-
-#if WANT_ACE
-// Enable logging, our log files use this
-#ifdef ACE_NLOGGING
-#undef ACE_NLOGGING
-#define ACE_NLOGGING 0
-#endif
-
-// Disable tracing by default
-#ifdef ACE_NTRACE
-#undef ACE_NTRACE
-#define ACE_NTRACE 1
-#endif
-
-#ifdef _DEBUG
-#ifdef ACE_NDEBUG
-#undef ACE_NDEBUG
-#endif
-#else
-#ifndef ACE_NDEBUG
-#define ACE_NDEBUG
-#endif
-#endif
-
-// ignore warnings about using deprecated methods
-#pragma warning(disable: 4996)
-
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "ace/OS.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_sys_stat.h"
-#include "ace/UUID.h"
-
-#include "ace/Acceptor.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/LOCK_SOCK_Acceptor.h"
-#include "ace/Reactor.h"
-#include "ace/Thread_Manager.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Task_T.h"
-#include "ace/Service_Object.h"
-#include "ace/svc_export.h"
-#include "ace/Configuration.h"
-#include "ace/Configuration_Import_Export.h"
-#include "ace/Process_Manager.h"
-#include "ace/Date_Time.h"
-
-#include "System/ServerConnectionBase.h"
-#include "System/ByteSourceImpl.h"
-#include "Data/ByteSource.h"
-#include "Data/ByteSink.h"
-
-#include "Exception/ClassNotFoundException.h"
-#include "Exception/ConfigurationException.h"
-#include "Exception/ConfigurationLoadFailedException.h"
-#include "Exception/ConfigurationSaveFailedException.h"
-#include "Exception/DateTimeException.h"
-#include "Exception/DecryptionException.h"
-#include "Exception/DirectoryNotFoundException.h"
-#include "Exception/DivideByZeroException.h"
-#include "Exception/DomainException.h"
-#include "Exception/DuplicateDirectoryException.h"
-#include "Exception/DuplicateFileException.h"
-#include "Exception/DuplicateObjectException.h"
-#include "Exception/EncryptionException.h"
-#include "Exception/FileNotFoundException.h"
-#include "Exception/GridDensityException.h"
-#include "Exception/IndexOutOfRangeException.h"
-#include "Exception/InvalidArgumentException.h"
-#include "Exception/InvalidCastException.h"
-#include "Exception/InvalidMimeTypeException.h"
-#include "Exception/InvalidOperationException.h"
-#include "Exception/InvalidPropertyTypeException.h"
-#include "Exception/InvalidStreamHeaderException.h"
-#include "Exception/LengthException.h"
-#include "Exception/LogicException.h"
-#include "Exception/NotFiniteNumberException.h"
-#include "Exception/NotImplementedException.h"
-#include "Exception/NullArgumentException.h"
-#include "Exception/NullPropertyValueException.h"
-#include "Exception/NullReferenceException.h"
-#include "Exception/ObjectNotFoundException.h"
-#include "Exception/OutOfMemoryException.h"
-#include "Exception/OverflowException.h"
-#include "Exception/PlatformNotSupportedException.h"
-#include "Exception/ResourcesException.h"
-#include "Exception/ResourcesLoadFailedException.h"
-#include "Exception/ResourceTagNotFoundException.h"
-#include "Exception/RuntimeException.h"
-#include "Exception/TemporaryFileNotAvailableException.h"
-#include "Exception/ThirdPartyException.h"
-#include "Exception/UnclassifiedException.h"
-#include "Exception/UnderflowException.h"
-#include "Exception/XmlException.h"
-#include "Exception/XmlParserException.h"
-#include "Exception/SystemException.h"
-#include "Exception/OutOfRangeException.h"
-#include "Exception/IoException.h"
-#include "Exception/FileIoException.h"
-#include "Exception/StreamIoException.h"
-#include "Exception/ArgumentOutOfRangeException.h"
-
-#include "System/PacketStructure.h"
-#include "System/StreamData.h"
-#include "System/PacketParser.h"
-#include "System/StreamHeader.h"
-#include "System/StreamHelper.h"
-#include "System/AceStreamHelper.h"
-#include "System/MemoryStreamHelper.h"
-#include "System/StreamReader.h"
-#include "System/StreamWriter.h"
-#include "System/Stream.h"
-#include "System/StreamParser.h"
-
-#include "System/ByteSourceFileImpl.h"
-#include "System/ByteSourceMemoryImpl.h"
-
-#include "Data/MimeType.h"
-#include "System/ClassFactory.h"
-#include "System/ConfigurationSectionCollection.h"
-#include "System/ConfigurationHeap.h"
-
-#else //WANT_ACE
-
#include <assert.h>
#define ACE_TRACE(x)
#define ACE_ASSERT assert
#undef GetClassName
#define ACE_DEBUG(X)
-#endif
#undef GetObject
#include "FoundationDefs.h"
-#include "System/FoundationClassId.h"
#include "System/Object.h"
#include "System/Ptr.h"
#include "System/Disposable.h"
@@ -199,50 +67,4 @@
#include "System/Mutex.h"
-#if WANT_ACE
-#if !defined (ACE_HAS_WCHAR)
-#error Please define ACE_HAS_WCHAR
#endif
-
-#if !defined (ACE_MT_SAFE)
-#error Please define ACE_MT_SAFE
-#endif
-
-#if !defined (ACE_HAS_THREADS)
-#error Please define ACE_HAS_THREADS
-#endif
-
-#if defined (ACE_HAS_THREAD_SAFE_ACCEPT)
-typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX> SOCK_Acceptor;
-#else
-#error Please define ACE_HAS_THREAD_SAFE_ACCEPT
-#endif /* ACE_HAS_THREAD_SAFE_ACCEPT */
-
-//Macros to order bytes in little endian
-# if defined (ACE_LITTLE_ENDIAN)
-# define MG_HTONS(x) x
-# define MG_NTOHS(x) x
-# define MG_HTONL(X) X
-# define MG_NTOHL(X) X
-# define MG_NTOH64(X) X
-# define MG_HTON64(X) X
-# else
-# define MG_HTONS(x) ACE_SWAP_WORD(*reinterpret_cast<WORD *>(&x))
-# define MG_NTOHS(x) ACE_SWAP_WORD(*reinterpret_cast<WORD *>(&x))
-# define MG_HTONL(X) ACE_SWAP_LONG (*reinterpret_cast<UINT *>(&X))
-# define MG_NTOHL(X) ACE_SWAP_LONG (*reinterpret_cast<UINT *>(&X))
-# define MG_NTOH64(X) ACE_SWAP_64 (*reinterpret_cast<i64u *>(&X))
-# define MG_HTON64(X) ACE_SWAP_64 (*reinterpret_cast<i64u *>(&X))
-
-# endif /* ACE_LITTLE_ENDIAN */
-
-#endif //WANT_ACE
-
-// Flag used for SIGPIPE handling
-#ifdef _WIN32
- static const int MG_MSG_NOSIGNAL = 0;
-#else
- static const int MG_MSG_NOSIGNAL = MSG_NOSIGNAL;
-#endif
-
-#endif
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj 2012-03-31 18:20:08 UTC (rev 6564)
@@ -262,7 +262,6 @@
<ClInclude Include="System\Disposable.h" />
<ClInclude Include="System\DisposableCollection.h" />
<ClInclude Include="System\FileUtil.h" />
- <ClInclude Include="System\FoundationClassId.h" />
<ClInclude Include="System\GuardDisposable.h" />
<ClInclude Include="System\LinuxMemoryStatus.h" />
<ClInclude Include="System\NamedSerializable.h" />
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters 2012-03-31 18:20:08 UTC (rev 6564)
@@ -130,9 +130,6 @@
<ClInclude Include="System\FileUtil.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\FoundationClassId.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\GuardDisposable.h">
<Filter>System</Filter>
</ClInclude>
Modified: sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -22,20 +22,6 @@
//////////////////////////////////////////////////////////////
INT32 MgDisposable::GetRefCount()
{
-#if WANT_ACE
-#ifdef _DEBUG
- // conditionally acquire the lock
- ACE_Guard<ACE_Recursive_Thread_Mutex> ace_mon(m_dbg_mutex, 0);
-
- // if this check fails then this object should be derived from MgGuardDisposable and not MgDisposable
- if (ace_mon.locked() == 0)
- {
- ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) ************ Concurrent refcount access in MgDisposable::GetRefCount(). Class Name: %W. This object should derive from MgGuardDisposable and not MgDisposable.\n"), GetClassName().c_str()));
- assert(false);
- }
-#endif
-#endif
-
return m_refCount;
}
@@ -43,20 +29,6 @@
//////////////////////////////////////////////////////////////
INT32 MgDisposable::AddRef()
{
-#if WANT_ACE
-#ifdef _DEBUG
- // conditionally acquire the lock
- ACE_Guard<ACE_Recursive_Thread_Mutex> ace_mon(m_dbg_mutex, 0);
-
- // if this check fails then this object should be derived from MgGuardDisposable and not MgDisposable
- if (ace_mon.locked() == 0)
- {
- ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) ************ Concurrent refcount access in MgDisposable::AddRef(). Class Name: %W. This object should derive from MgGuardDisposable and not MgDisposable.\n"), GetClassName().c_str()));
- assert(false);
- }
-#endif
-#endif
-
if (0 == m_refCount)
{
#ifdef _DEBUG
@@ -74,20 +46,6 @@
INT32 MgDisposable::Release()
{
{
-#if WANT_ACE
-#ifdef _DEBUG
- // conditionally acquire the lock
- ACE_Guard<ACE_Recursive_Thread_Mutex> ace_mon(m_dbg_mutex, 0);
-
- // if this check fails then this object should be derived from MgGuardDisposable and not MgDisposable
- if (ace_mon.locked() == 0)
- {
- ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) ************ Concurrent refcount access in MgDisposable::Release(). Class Name: %W. This object should derive from MgGuardDisposable and not MgDisposable.\n"), GetClassName().c_str()));
- assert(false);
- }
-#endif
-#endif
-
if (0 >= m_refCount)
{
#ifdef _DEBUG
Modified: sandbox/adsk/vik/Common/Foundation/System/Disposable.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Disposable.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Disposable.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -18,12 +18,6 @@
#ifndef _MGDISPOSABLE_H_
#define _MGDISPOSABLE_H_
-#if WANT_ACE
-#ifdef _DEBUG
-#include "ace/Process_Manager.h"
-#endif
-#endif
-
/// \cond INTERNAL
/////////////////////////////////////////////////////////////////
/// \brief
@@ -106,12 +100,6 @@
friend class MgGuardDisposable;
INT32 m_refCount;
-
-#if WANT_ACE
-#ifdef _DEBUG
- ACE_Recursive_Thread_Mutex m_dbg_mutex;
-#endif
-#endif
};
/// \endcond
Modified: sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -49,16 +49,6 @@
//////////////////////////////////////////////////////////////////
/// <summary>
-/// Returns the classId.
-/// </summary>
-INT32 MgDisposableCollection::GetClassId()
-{
- return m_cls_id;
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
/// Returns number of items in the collection.
/// </summary>
INT32 MgDisposableCollection::GetCount() const
@@ -271,46 +261,6 @@
return index;
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Creates an XML document representing the collection.
-/// </summary>
-/// <returns>
-/// Returns a pointer to an MgByteReader object.
-/// </returns>
-MgByteReader* MgDisposableCollection::ToXml()
-{
- throw new MgException(L"NotImplemented");
-
- return NULL;
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Serialize data to TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgDisposableCollection::Serialize(MgStream* stream)
-{
- throw new MgException(L"NotImplemented");
-}
-
-
-//////////////////////////////////////////////////////////////////
-/// <summary>
-/// Deserialize data from TCP/IP stream
-/// </summary>
-/// <param name="stream">Stream</param>
-/// <returns>Returns nothing.</returns>
-void MgDisposableCollection::Deserialize(MgStream* stream)
-{
- throw new MgException(L"NotImplemented");
-}
-#endif
-
/////////////////////////////////////////////////////////////////
/// <summary>
/// Disposes the object.
Modified: sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -179,37 +179,6 @@
///
virtual INT32 IndexOf(const MgDisposable* value) const;
-#if WANT_ACE
- //////////////////////////////////////////////////////////
- /// \brief
- /// Creates an XML document representing the collection.
- ///
- /// \return
- /// A pointer to an MgByteReader object.
- ///
- virtual MgByteReader* ToXml();
-
-INTERNAL_API:
-
- //////////////////////////////////////////////////////////
- /// \brief
- /// Serializes data to a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////
- /// \brief
- /// Deserializes data from a TCP/IP stream.
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif
-
EXTERNAL_API:
//////////////////////////////////////////////////////////
@@ -227,15 +196,6 @@
//////////////////////////////////////////////////////////
/// \brief
- /// Gets the class Id.
- ///
- /// \return
- /// Returns the integer value of the class Id.
- ///
- INT32 GetClassId();
-
- //////////////////////////////////////////////////////////
- /// \brief
/// Disposes the object.
///
virtual void Dispose();
@@ -250,9 +210,6 @@
MgDisposable** m_list;
INT32 m_capacity;
INT32 m_size;
-
-CLASS_ID:
- static const INT32 m_cls_id = Foundation_Collection_Collection;
};
/// \endcond
Modified: sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -430,337 +430,8 @@
}
}
-#if WANT_ACE
///----------------------------------------------------------------------------
/// <summary>
-/// Deletes a directory.
-/// </summary>
-///
-/// <exceptions>
-/// MgNullArgumentException
-/// MgInvalidArgumentException
-/// MgFileIoException
-/// </exceptions>
-///----------------------------------------------------------------------------
-
-void MgFileUtil::DeleteDirectory(CREFSTRING path, bool recursive, bool strict)
-{
- MgLock lock(sm_mutex);
-
- if (CleanDirectory(path, recursive, strict) == false)
- {
- return;
- }
-
- int errCode = _rmdir(MgUtil::WideCharToMultiByte(path).c_str());
-
- if (0 != errCode)
- {
- errCode = errno; // This is not thread safe - requires guard
- MgStringCollection arguments;
- arguments.Add(path);
-
- switch (errCode)
- {
- case ENOENT: // PathnameExists is more reliable. It gets called above, so this error should not be detected.
- case ENOTEMPTY:
- case EACCES:
- default:
- throw new MgFileIoException(L"MgFileUtil.DeleteDirectory",
- __LINE__, __WFILE__, &arguments, L"", NULL);
- break;
- }
- }
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Cleans up a directory.
-/// </summary>
-///
-/// <exceptions>
-/// MgNullArgumentException
-/// MgInvalidArgumentException
-/// MgFileIoException
-/// </exceptions>
-///----------------------------------------------------------------------------
-
-bool MgFileUtil::CleanDirectory(CREFSTRING path, bool recursive, bool strict)
-{
- struct dirent **dirEntries = NULL;
- int numEntries = 0;
-
- MG_TRY()
-
- MgLock lock(sm_mutex);
-
- if (!PathnameExists(path))
- {
- if (strict)
- {
- MgStringCollection arguments;
- arguments.Add(path);
-
- throw new MgDirectoryNotFoundException(L"MgFileUtil.CleanDirectory",
- __LINE__, __WFILE__, &arguments, L"", NULL);
- }
-
- return false;
- }
-
- numEntries = ACE_OS::scandir(MG_WCHAR_TO_TCHAR(path), &dirEntries,
- MgDirEntrySelector, MgDirEntryComparator);
-
- if (NULL != dirEntries)
- {
- STRING root = path;
-
- AppendSlashToEndOfPath(root);
-
- for (int i = 0; i < numEntries; ++i)
- {
- STRING pathname = root;
-
- pathname += MG_TCHAR_TO_WCHAR(dirEntries[i]->d_name);
-
- if (IsFile(pathname))
- {
- DeleteFile(pathname, strict);
- }
- else if (recursive)
- {
- DeleteDirectory(pathname, recursive, strict);
- }
- }
- }
-
- MG_CATCH(L"MgFileUtil.CleanDirectory")
-
- if (NULL != dirEntries)
- {
- for (int i = 0; i < numEntries; ++i)
- {
-#if defined (ACE_LACKS_STRUCT_DIR)
- // By default, ACE_LACKS_STRUCT_DIR is defined for Windows but not for Linux.
- // When ACE_LACKS_STRUCT_DIR is NOT defined, d_name is initialized via ACE_OS::memcpy,
- // When ACE_LACKS_STRUCT_DIR is defined, d_name is created via ACE_OS::malloc,
- // and therefore it must be freed.
-
- ACE_OS::free(dirEntries[i]->d_name);
-#endif
- ACE_OS::free(dirEntries[i]);
- }
-
- ACE_OS::free(dirEntries);
- }
-
- MG_THROW()
-
- return true;
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Gets all files in the specified directory.
-/// </summary>
-///----------------------------------------------------------------------------
-
-bool MgFileUtil::GetFilesInDirectory(
- MgStringCollection* files,
- CREFSTRING path,
- bool recursive,
- bool fileNameOnly)
-{
- if (files == NULL)
- {
- throw new MgNullArgumentException(L"MgFileUtil.GetFilesInDirectory", __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- struct dirent **dirEntries = NULL;
- int numEntries = 0;
-
- MG_TRY()
-
- MgLock lock(sm_mutex);
-
- if (!PathnameExists(path))
- {
- MgStringCollection arguments;
- arguments.Add(path);
-
- throw new MgDirectoryNotFoundException(L"MgFileUtil.GetFilesInDirectory",
- __LINE__, __WFILE__, &arguments, L"", NULL);
-
- return false;
- }
-
- numEntries = ACE_OS::scandir(MG_WCHAR_TO_TCHAR(path), &dirEntries,
- MgDirEntrySelector, MgDirEntryComparator);
-
- if (NULL != dirEntries)
- {
- STRING root = path;
-
- AppendSlashToEndOfPath(root);
-
- for (int i = 0; i < numEntries; ++i)
- {
- STRING pathname = root;
- STRING fileName = MG_TCHAR_TO_WCHAR(dirEntries[i]->d_name);
-
- pathname += fileName;
- if (IsFile(pathname))
- {
- if (fileNameOnly)
- files->Add(fileName);
- else
- files->Add(pathname);
- }
- else if (recursive)
- {
- GetFilesInDirectory(files, pathname, recursive);
- }
- }
- }
-
- MG_CATCH(L"MgFileUtil.GetFilesInDirectory")
-
- if (NULL != dirEntries)
- {
- for (int i = 0; i < numEntries; ++i)
- {
-#if defined (ACE_LACKS_STRUCT_DIR)
- // By default, ACE_LACKS_STRUCT_DIR is defined for Windows but not for Linux.
- // When ACE_LACKS_STRUCT_DIR is NOT defined, d_name is initialized via ACE_OS::memcpy,
- // When ACE_LACKS_STRUCT_DIR is defined, d_name is created via ACE_OS::malloc,
- // and therefore it must be freed.
-
- ACE_OS::free(dirEntries[i]->d_name);
-#endif
- ACE_OS::free(dirEntries[i]);
- }
-
- ACE_OS::free(dirEntries);
- }
-
- MG_THROW()
-
- return true;
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Copies a file from one location to another.
-/// </summary>
-///
-/// <exceptions>
-/// MgNullArgumentException
-/// MgInvalidArgumentException
-/// MgFileNotFoundException
-/// MgFileIoException
-/// </exceptions>
-///----------------------------------------------------------------------------
-
-void MgFileUtil::CopyFile(CREFSTRING sourcePathname, CREFSTRING destPathname,
- bool overwrite)
-{
- if (sourcePathname.empty() || destPathname.empty())
- {
- throw new MgNullArgumentException(L"MgFileUtil.CopyFile",
- __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- if (_wcsicmp(sourcePathname.c_str(), destPathname.c_str()) == 0)
- {
- MgStringCollection arguments;
- arguments.Add(destPathname);
-
- throw new MgDuplicateFileException(L"MgFileUtil.CopyFile",
- __LINE__, __WFILE__, &arguments, L"", NULL);
- }
-
- if (overwrite)
- {
- DeleteFile(destPathname);
- }
- else if (PathnameExists(destPathname))
- {
- MgStringCollection arguments;
- arguments.Add(destPathname);
-
- throw new MgDuplicateFileException(L"MgFileUtil.CopyFile",
- __LINE__, __WFILE__, &arguments, L"", NULL);
- }
-
- Ptr<MgByteSource> byteSource = new MgByteSource(sourcePathname);
- Ptr<MgByteReader> byteReader = byteSource->GetReader();
-
- MgByteSink byteSink(byteReader);
- byteSink.ToFile(destPathname);
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Gets the TempPath defined in the configuration file. If the TempPath doesn't
-/// exist, then create it.
-/// </summary>
-///
-/// <returns>
-/// Returns the TempPath defined in the configuration file.
-/// </returns>
-///----------------------------------------------------------------------------
-
-STRING MgFileUtil::GetTempPath()
-{
- STRING tempPathname;
-
- // TODO: Server Drawing Service GETDRAWINGLAYER API does not work well
- // if using Mg temporary directory.
- MgConfiguration* config = MgConfiguration::GetInstance();
-
- config->GetStringValue(
- MgFoundationConfigProperties::GeneralPropertiesSection,
- MgFoundationConfigProperties::GeneralPropertyTempPath,
- tempPathname,
- MgFoundationConfigProperties::DefaultGeneralPropertyTempPath);
-
- CreateDirectory(tempPathname);
- AppendSlashToEndOfPath(tempPathname);
-
- return tempPathname;
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Generates a temporary file folder using a UUID in the TempPath defined in
-/// the configuration file.
-/// </summary>
-///
-/// <returns>
-/// Returns full path name of the temporary path.
-/// </returns>
-///----------------------------------------------------------------------------
-
-STRING MgFileUtil::GenerateTempPath()
-{
- STRING tempPathname;
-
- tempPathname = GetTempPath();
-
- STRING uuid;
- MgUtil::GenerateUuid(uuid);
- tempPathname.append(uuid);
-
- CreateDirectory(tempPathname);
-
- return tempPathname;
-}
-
-
-#endif //WANT_ACE
-
-///----------------------------------------------------------------------------
-/// <summary>
/// Changes the current working directory to the specified directory.
/// </summary>
///
@@ -1006,51 +677,26 @@
{
STRING tempPathname;
-#if WANT_ACE
- if (useMgTempPath)
- {
- tempPathname = GetTempPath();
- if (!prefix.empty())
- {
- tempPathname.append(prefix);
- tempPathname.append(L"-");
- }
+ // Note that ::tempnam uses the TMP environment variable as the path
+ // to the temporary file. Alternately, ACE_OS::mkstemp() could be used.
+ // Add current thread id to the mix to ensure that the name is unique.
- STRING uuid;
+ MgLock lock(sm_mutex);
+ string mbPrefix;
- MgUtil::GenerateUuid(uuid);
- tempPathname.append(uuid);
- }
- else
+ char* tempFileName = ::tempnam(NULL, mbPrefix.c_str());
+
+ if (0 == tempFileName)
{
-#endif
- // Note that ::tempnam uses the TMP environment variable as the path
- // to the temporary file. Alternately, ACE_OS::mkstemp() could be used.
- // Add current thread id to the mix to ensure that the name is unique.
+ throw new MgException(L"TemporaryFileNotAvailable");
+ }
- MgLock lock(sm_mutex);
- string mbPrefix;
-#if WANT_ACE
- ACE_thread_t threadId = ACE_OS::thr_self();
- MgUtil::Int32ToString(threadId, mbPrefix);
- mbPrefix.append( MgUtil::WideCharToMultiByte(prefix) );
-#endif
+ string tempStr = tempFileName;
+ ::free(tempFileName);
- char* tempFileName = ::tempnam(NULL, mbPrefix.c_str());
+ MgUtil::MultiByteToWideChar(tempStr, tempPathname);
- if (0 == tempFileName)
- {
- throw new MgException(L"TemporaryFileNotAvailable");
- }
- string tempStr = tempFileName;
- ::free(tempFileName);
-
- MgUtil::MultiByteToWideChar(tempStr, tempPathname);
-#if WANT_ACE
- }
-#endif
-
if (!extension.empty())
{
if (!BeginsWithDot(extension))
Modified: sandbox/adsk/vik/Common/Foundation/System/FileUtil.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/FileUtil.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/FileUtil.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -81,17 +81,6 @@
static bool IsDriveLetter(wchar_t letter);
static void CreateDirectory(CREFSTRING path, bool strict = false,
bool recursive = false);
-#if WANT_ACE
- static void DeleteDirectory(CREFSTRING path, bool recursive = true,
- bool strict = false);
- static bool CleanDirectory(CREFSTRING path, bool recursive = true,
- bool strict = false);
- static bool GetFilesInDirectory(MgStringCollection* files, CREFSTRING path, bool recursive = true, bool fileNameOnly = false);
- static void CopyFile(CREFSTRING sourcePathname,
- CREFSTRING destPathname, bool overwrite = false);
- static STRING GetTempPath();
- static STRING GenerateTempPath();
-#endif
static STRING ChangeDirectory(CREFSTRING path);
Deleted: sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -1,57 +0,0 @@
-//
-// Copyright (C) 2004-2011 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
-//
-
-// Predefined object identifiers ranges for each class of object. By convention,
-// each library has a range of 10 thousand ids. Ids are broken into groups.
-#define FOUNDATION_COLLECTION_ID 1000
-#define FOUNDATION_DATA_ID 1250
-#define FOUNDATION_EXCEPTION_ID 1500
-#define FOUNDATION_PROPERTY_ID 2000
-#define FOUNDATION_SYSTEM_ID 2250
-
-// Foundation Collection
-#define Foundation_Collection_Collection FOUNDATION_COLLECTION_ID+0
-#define Foundation_Collection_NamedCollection FOUNDATION_COLLECTION_ID+1
-#define Foundation_Collection_PropertyCollection FOUNDATION_COLLECTION_ID+2
-#define Foundation_Collection_StringCollection FOUNDATION_COLLECTION_ID+3
-#define Foundation_Collection_StringPropertyCollection FOUNDATION_COLLECTION_ID+4
-#define Foundation_Collection_BatchPropertyCollection FOUNDATION_COLLECTION_ID+5
-
-// Foundation Data
-#define Foundation_Data_ByteReader FOUNDATION_DATA_ID+0
-#define Foundation_Data_ByteSource FOUNDATION_DATA_ID+1
-#define Foundation_Data_ByteSourceFileImpl FOUNDATION_DATA_ID+2
-#define Foundation_Data_ByteSourceImpl FOUNDATION_DATA_ID+3
-#define Foundation_Data_ByteSourceMemoryImpl FOUNDATION_DATA_ID+4
-#define Foundation_Data_ByteSourceSocketStreamImpl FOUNDATION_DATA_ID+5
-#define Foundation_Data_DateTime FOUNDATION_DATA_ID+6
-#define Foundation_Data_ByteSink FOUNDATION_DATA_ID+7
-#define Foundation_Data_Stream FOUNDATION_DATA_ID+8
-
-// Foundation Exception
-#define Foundation_Exception_MgException FOUNDATION_EXCEPTION_ID+0
-
-// Foundation Property
-
-#define Foundation_Property_Property FOUNDATION_PROPERTY_ID+0
-#define Foundation_Property_StringProperty FOUNDATION_PROPERTY_ID+1
-#define Foundation_Property_PropertyDefinition FOUNDATION_PROPERTY_ID+2
-
-// Foundation System
-#define Foundation_System_Disposable FOUNDATION_SYSTEM_ID+1
-#define Foundation_System_Object FOUNDATION_SYSTEM_ID+2
-#define Foundation_System_CryptographyManager FOUNDATION_SYSTEM_ID+3
Modified: sandbox/adsk/vik/Common/Foundation/System/Object.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Object.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Object.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -17,7 +17,6 @@
#include "stdafx.h"
#include "Foundation.h"
-#undef GetClassName
///////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -30,64 +29,3 @@
{
}
-///////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Get the unique identifier for the class.
-///
-/// \return
-/// Class Identifier.
-///
-INT32 MgObject::GetClassId()
-{
- return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Get the name of the class.
-///
-/// \return
-/// Returns the name of the class.
-///
-STRING MgObject::GetClassName()
-{
- return L"Not Defined"; // NOXLATE
-}
-
-
-///////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Get the name of the class.
-///
-/// \return
-/// Returns the name of the class.
-///
-char* MgObject::GetMultiByteClassName()
-{
- return "MgObject"; // NOXLATE
-}
-
-///////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Get the namespace of the class. This is an interanl method used by
-/// SWIG to create .NET API.
-///
-/// \return
-/// Returns the namespace of the class.
-///
-char* MgObject::GetNameSpace()
-{
- return "OSGeo.MapGuide"; // NOXLATE
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Determine if this object is of the specified class.
-///
-/// \return
-/// true if this object is of the specified class, false otherwise.
-///
-bool MgObject::IsOfClass(INT32 classId)
-{
- return (GetClassId() == classId);
-}
Modified: sandbox/adsk/vik/Common/Foundation/System/Object.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Object.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Object.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -24,66 +24,17 @@
/// Root class of all non-exception objects
class MG_FOUNDATION_API MgObject
{
-EXTERNAL_API:
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class.
- ///
- /// \return
- /// Class Identifier.
- ///
- virtual INT32 GetClassId();
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the name of the class.
- ///
- /// \return
- /// Returns the name of the class.
- ///
- virtual STRING GetClassName();
-
INTERNAL_API:
///////////////////////////////////////////////////////////////////////////
/// \brief
- /// Get the name of the class. This is an interanl method used by
- /// SWIG to create .NET API.
- ///
- /// \return
- /// Returns the name of the class.
- ///
- virtual char* GetMultiByteClassName();
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the namespace of the class. This is an interanl method used by
- /// SWIG to create .NET API.
- ///
- /// \return
- /// Returns the namespace of the class.
- ///
- virtual char* GetNameSpace();
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
/// Default destructor for this class.
///
/// \return
/// Returns nothing.
///
virtual ~MgObject();
-
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Determine if this object is of the specified class.
- ///
- /// \return
- /// true if this object is of the specified class, false otherwise.
- ///
- bool IsOfClass(INT32 classId);
};
/// \endcond
Modified: sandbox/adsk/vik/Common/Foundation/System/Resources.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Resources.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Resources.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -18,11 +18,6 @@
#include "stdafx.h"
#include "Foundation.h"
-#if WANT_ACE
-// Process-wide MgResources
-Ptr<MgResources> MgResources::m_resources = (MgResources*)NULL;
-#endif
-
const STRING MgResources::DefaultMessageLocale = L"en"; // Do not translate (ISO 639-1)
const STRING MgResources::ResourceFilenameExtension = L".res"; // Do not translate
const STRING MgResources::ResourceFilenameUnderscore = L"_"; // Do not translate
@@ -166,467 +161,3 @@
const STRING MgResources::Stylization = L"Stylization"; // Do not translate
const STRING MgResources::WhiteSpace = L"\n\r\t ";
-#if WANT_ACE
-
-// for locale
-static const STRING ResourceFilenameDash = L"-"; // Do not translate
-static const int ExtendedLocaleLength = 5;
-static const int ExtendedLocaleDashLocation = 2;
-static const int ParentLocaleLength = 2;
-
-MgResources::MgResources()
-{
- // default path
- m_path = L"Resources/";
-
- // default component
- m_component = MgResources::ResourceComponent;
-}
-
-
-MgResources::~MgResources()
-{
- // Clean up the resource cache
- ResourceCache::iterator iterator;
-
- for(iterator = m_resourceCache.begin(); iterator != m_resourceCache.end(); ++iterator)
- {
- DeleteResourceFile(iterator->second);
- iterator->second = NULL;
- }
- m_resourceCache.clear();
-}
-
-
-void MgResources::Dispose()
-{
- delete this;
-}
-
-
-MgResources* MgResources::GetInstance()
-{
- MG_RESOURCES_TRY()
-
- ACE_TRACE ("MgResources::GetInstance");
-
- if (MgResources::m_resources == NULL)
- {
- // Perform Double-Checked Locking Optimization.
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance (), 0));
- if (MgResources::m_resources == NULL)
- {
- MgResources::m_resources = new MgResources();
- }
- }
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.GetInstance")
-
- // To avoid overheads and maintain thread safety,
- // do not assign this returned static singleton to a Ptr object.
- return MgResources::m_resources;
-}
-
-
-void MgResources::SetComponent(CREFSTRING component)
-{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
- m_component = component;
-}
-
-
-void MgResources::Initialize(CREFSTRING path)
-{
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
-
- MG_RESOURCES_TRY()
-
- m_path = path;
-
- // Check if path ends with a '/' if not, add one if needed
- MgFileUtil::AppendSlashToEndOfPath(m_path);
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.Initialize")
-}
-
-
-STRING MgResources::GetResourceFilename(CREFSTRING locale)
-{
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, L""));
-
- STRING filename;
-
- MG_RESOURCES_TRY()
-
- // Note: No validation is done on the locale.
- if (locale.length() > 0)
- {
- filename = m_path + m_component + ResourceFilenameUnderscore + locale + ResourceFilenameExtension;
- }
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.GetResourceFilename")
-
- return filename;
-}
-
-
-void MgResources::LoadResources(CREFSTRING locale)
-{
- // allow only one thread to load at a time
- ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
-
- MG_RESOURCES_TRY()
-
- // Check to see if this is already in the cache. If it is we need to remove it, load it
- // and then add it to the cache. Otherwise, we just load it and add it to the cache.
-
- ResourceCache::iterator iterator = GetResources(locale, false);
- if (m_resourceCache.end() != iterator)
- {
- // Remove specified locale from the cache as we want to update it.
- DeleteResourceFile(iterator->second);
- iterator->second = NULL;
- m_resourceCache.erase(iterator);
- }
-
- STRING strResourceFilename = GetResourceFilename(locale);
-
- // five character locales are required to be of the form lower-upper - verify this
- if (ExtendedLocaleLength == locale.length())
- {
- STRING lowerPart = MgUtil::ToLower(locale.substr(0,3));
- STRING upperPart = MgUtil::ToUpper(locale.substr(3,2));
- if (lowerPart.compare(locale.substr(0,3)) != 0 ||
- upperPart.compare(locale.substr(3,2)) != 0)
- {
- MgStringCollection arguments;
- arguments.Add(strResourceFilename.c_str());
- arguments.Add(locale.c_str());
-
- throw new MgResourcesLoadFailedException(L"MgResources.LoadResources",
- __LINE__, __WFILE__, &arguments, L"", NULL);
- }
- }
-
- ResourceFile* pResources = new ResourceFile();
- if (NULL != pResources)
- {
- bool bSuccess = false;
- if (MgFileUtil::PathnameExists(strResourceFilename) && true == ParseFile(strResourceFilename, pResources))
- {
- m_resourceCache[locale] = pResources;
- bSuccess = true;
- }
- else
- {
- if (ExtendedLocaleLength == locale.length() && ExtendedLocaleDashLocation == (int)locale.find(ResourceFilenameDash))
- {
- // if the locale is of the form "en-GB", and there wasn't a matching resource file,
- // try to find the resource file of the parent locale, i.e. "en"
- STRING strParentLocale = locale.substr(0, ParentLocaleLength);
- STRING strParentResourceFilename = GetResourceFilename(strParentLocale);
- if (MgFileUtil::PathnameExists(strParentResourceFilename) && true == ParseFile(strParentResourceFilename, pResources))
- {
- m_resourceCache[locale] = pResources;
- bSuccess = true;
- }
- }
- }
-
- if (!bSuccess)
- {
- MgStringCollection arguments;
- arguments.Add(strResourceFilename.c_str());
- arguments.Add(locale.c_str());
-
- throw new MgResourcesLoadFailedException(L"MgResources.LoadResources",
- __LINE__, __WFILE__, &arguments, L"", NULL);
- }
- }
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.LoadResources")
-}
-
-
-// This will call the load method if the resources are not already cached.
-// This (private) method is NOT thread-safe - callers are responsible for
-// serializing access.
-ResourceCache::iterator MgResources::GetResources(CREFSTRING locale, bool bLoad)
-{
- ResourceCache::iterator iterator;
-
- MG_RESOURCES_TRY()
-
- iterator = m_resourceCache.find(locale);
- if (m_resourceCache.end() == iterator)
- {
- if(true == bLoad)
- {
- // The locale was NOT found in the cache, so we need to load it.
- LoadResources(locale);
- iterator = m_resourceCache.find(locale);
- }
- }
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.GetResources")
-
- return iterator;
-}
-
-
-STRING MgResources::GetStringResource(CREFSTRING locale, CREFSTRING section, CREFSTRING resourceId)
-{
- // ensure thread-safe access to the ACE_Configuration_Heap below
- ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex, L""));
-
- STRING value;
-
- MG_RESOURCES_TRY()
-
- ResourceCache::iterator iterator = GetResources(locale, true);
- if (m_resourceCache.end() != iterator)
- {
- ResourceFile* pResources = iterator->second;
- if (NULL != pResources)
- {
- ResourceFile::iterator sectionIter = pResources->find(section);
- if (pResources->end() != sectionIter)
- {
- ResourceSection* pSection = sectionIter->second;
- ResourceSection::iterator resourceIter = pSection->find(resourceId);
- if (pSection->end() != resourceIter)
- {
- value = resourceIter->second;
- }
- }
- }
- }
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.GetStringResource")
-
- return value;
-}
-
-
-STRING MgResources::FormatMessage(CREFSTRING stringResource, MgStringCollection* arguments)
-{
- STRING value = stringResource;
-
- INT32 numArgsProvided = 0;
- INT32 numArgsNeeded = 0;
-
- STRING currentReplace;
- wchar_t buff[4];
- string::size_type pos = 0;
-
- INT32 i; // used in for loops
-
- MG_RESOURCES_TRY()
-
- // Determine the number of arguments provided.
- if (arguments != NULL)
- {
- numArgsProvided = arguments->GetCount();
- }
-
- // Determine the number of arguments needed
- for (i = 9; i > 0; i--)
- {
- ACE_OS::itoa(i, buff, 10);
- currentReplace = L"%";
- currentReplace += buff;
- pos = stringResource.find(currentReplace, 0);
-
- // if placeholder for argument i exists then i
- // is the number of arguments needed.
- if (pos != string::npos)
- {
- numArgsNeeded = i;
- break;
- }
- }
-
- // If the argument collection size is valid, format message
- if ((numArgsProvided == numArgsNeeded) && (numArgsProvided <= 9))
- {
- STRING currentArg;
- string::size_type currentArgSize;
-
- for (i = 0; i < numArgsProvided; i++)
- {
- currentArg = arguments->GetItem(i);
- currentArgSize = currentArg.size();
-
- // Item at index 0 will replace %1 and so on
- ACE_OS::itoa((i + 1), buff, 10);
- currentReplace = L"%";
- currentReplace += buff;
-
- // Replace all occurances of the placeholder
- pos = value.find(currentReplace, 0);
- while (pos != string::npos)
- {
- value.replace(pos, 2, currentArg);
- // Search for the placeholder after the end of the inserted argument
- pos = value.find(currentReplace, (pos+currentArgSize));
- }
- }
- }
- // Otherwise, collection size is invalid so throw exception
- else
- {
- STRING buffer;
- MgUtil::Int32ToString(numArgsProvided, buffer);
-
- MgStringCollection arguments;
- arguments.Add(L"2");
- arguments.Add(buffer);
-
- throw new MgInvalidArgumentException(L"MgResources.FormatMessage",
- __LINE__, __WFILE__, &arguments, L"MgArgumentsMismatch", NULL);
- }
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.FormatMessage")
-
- return value;
-}
-
-
-void MgResources::DeleteResourceFile(ResourceFile* file)
-{
- for (ResourceFile::iterator iter = file->begin(); iter != file->end(); ++iter)
- {
- if (NULL != iter->second)
- {
- iter->second->clear();
- delete iter->second;
- iter->second = NULL;
- }
- }
- file->clear();
- delete file;
-}
-
-
-bool MgResources::ParseFile(CREFSTRING strResourceFileName, ResourceFile* pResourceFile)
-{
- bool bParsed = false;
-
- MG_RESOURCES_TRY()
-
- // Read the entire file in assuming it is UTF-8 encoded.
- Ptr<MgByteSource> resourceFile = new MgByteSource(strResourceFileName);
- resourceFile->SetMimeType(MgMimeType::Text);
- Ptr<MgByteReader> reader = resourceFile->GetReader();
- STRING fileString = reader->ToString();
-
- ResourceSection* pSection = NULL;
-
- STRING::size_type offset = 0;
- while (offset < fileString.length() && offset != fileString.npos)
- {
- // break at newlines
- STRING::size_type newline = fileString.find(L"\n", offset);
- if (newline != fileString.npos)
- {
- // Trim leading/trailing all whitespace
- STRING subString = fileString.substr(offset, newline-offset);
- STRING::size_type start = subString.find_first_not_of(MgResources::WhiteSpace);
- STRING::size_type end = subString.find_last_not_of(MgResources::WhiteSpace);
-
- offset = newline+1;
-
- if (subString.npos != start && subString.npos != end)
- {
- subString = subString.substr(start, end-start+1);
-
- if (L'#' == subString[0])
- {
- // do nothing, skip to next line
- continue;
- }
-
- if (L'[' == subString[0])
- {
- // start of section, save section name and switch to new section
- STRING brackets = L"[]";
- STRING sectionName = MgUtil::Trim(subString, brackets);
- pSection = new ResourceSection();
- pResourceFile->operator[](sectionName) = pSection;
- continue;
- }
-
- STRING::size_type equals = subString.find(L'=');
- if (subString.npos != equals)
- {
- // This should be a configuration directive. Add it to the section.
- STRING directive = MgUtil::Trim(subString.substr(0, equals), MgResources::WhiteSpace);
- STRING value = MgUtil::Trim(subString.substr(equals+1), MgResources::WhiteSpace);
- if (NULL != pSection)
- {
- pSection->operator[](directive) = value;
- }
- else
- {
- throw new MgResourcesLoadFailedException(L"MgResources.ParseFile", __LINE__, __WFILE__, NULL, L"", NULL);
- }
- }
- }
- }
- }
-
- bParsed = true;
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.ParseFile")
-
- return bParsed;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Gets a message that is retrieved from the specified resource ID and is
-/// formatted with the specified arguments.
-///
-/// \param section
-/// Section in the resource file.
-/// \param resourceId
-/// Resource identifier in the section.
-/// \param arguments
-/// Pointer to an MgStringCollection that contains the text to be placed
-/// into the formatted message. If arguments is NULL then that is treated
-/// as having 0 arguments provided. A maximum of 9 arguments is allowed.
-///
-/// \return
-/// The formatted message string.
-///
-STRING MgResources::GetResourceMessage(CREFSTRING section, CREFSTRING resourceId,
- MgStringCollection* arguments)
-{
- STRING message;
-
- MG_RESOURCES_TRY()
-
- STRING locale = DefaultMessageLocale;
- MgConfiguration* configuration = MgConfiguration::GetInstance();
- ACE_ASSERT(NULL != configuration);
-
- if (NULL != configuration)
- {
- configuration->GetStringValue(
- MgFoundationConfigProperties::GeneralPropertiesSection,
- MgFoundationConfigProperties::GeneralPropertyDefaultMessageLocale,
- locale,
- MgFoundationConfigProperties::DefaultGeneralPropertyDefaultMessageLocale);
- }
-
- STRING resourceStr = GetStringResource(locale, section, resourceId);
-
- message = FormatMessage(resourceStr, arguments);
-
- MG_RESOURCES_CATCH_AND_THROW(L"MgResources.GetResourceMessage")
-
- return message;
-}
-
-#endif //WANT_ACE
\ No newline at end of file
Modified: sandbox/adsk/vik/Common/Foundation/System/Resources.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Resources.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Resources.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -45,125 +45,7 @@
DECLARE_CLASSNAME(MgResources)
INTERNAL_API:
-#if WANT_ACE
- /// \brief
- /// Destructor
- ///
- virtual ~MgResources();
- /// \brief
- /// Self Destructor
- ///
- virtual void Dispose();
-
- /// \brief
- /// Get pointer to a process-wide MgResources.
- ///
- static MgResources* GetInstance();
-
- /// \brief
- /// Sets the component for MgResources.
- /// By default this is the web. The server will set this at startup.
- ///
- /// Note: This method should only be called once at startup.
- ///
- void SetComponent(CREFSTRING component);
-
- /// \brief
- /// Initialize MgResources.
- ///
- /// Note: This method should only be called once at startup.
- ///
- void Initialize(CREFSTRING path);
-
- /// \brief
- /// Loads the resources for the specified locale
- ///
- /// \param locale
- /// The locale of the resources to load
- ///
- /// \exception MgResourcesException
- ///
- void LoadResources(CREFSTRING locale);
-
- /// \brief
- /// Gets the resource filename for the component and locale specified.
- /// The resource filenames use the following format:
- /// <component>_<ISO 639-1 name>.res
- /// Ex: mapguide_en.res
- ///
- /// \param locale
- /// The locale.
- /// \param filename
- /// Out parameter for the resource filename.
- ///
- /// \return
- /// filename if successful
- ///
- /// \exception MgResourcesException
- ///
- STRING GetResourceFilename(CREFSTRING locale);
-
- /// \brief
- /// Get the string resource for the the specified locale, section and resourceId
- ///
- /// \param locale
- /// The locale of the resources
- /// \param section
- /// Section in the resource file
- /// \param resourceId
- /// Resource identifier in the section
- /// \param value
- /// Out parameter for the value of the resource string requested
- ///
- /// \return
- /// resource string if found
- ///
- /// \exception MgResourcesException
- ///
- STRING GetStringResource(CREFSTRING locale, CREFSTRING section, CREFSTRING resourceId);
-
- /// \brief
- /// Format a string resource that was retrieved using GetStringResource. The number of arguments
- /// needed to be replaced in the stringResource must match the size of the collection given.
- ///
- /// Note: the argument place holder starts at %1 and goes to %9, so %0 will not get replaced.
- ///
- /// \param stringResource
- /// The STRING to be formatted. ie. "%1 %2"
- /// \param arguments
- /// A pointer to an MgStringCollection that contains the text to be placed into the formatted
- /// stringResource. If arguments is NULL then that is treated as having 0 arguments provided.
- /// A maximum of 9 arguments is allowed.
- ///
- /// \return
- /// The formatted message string
- ///
- /// \exception MgInvalidCollectionSizeException
- ///
- STRING FormatMessage(CREFSTRING stringResource, MgStringCollection* arguments);
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Gets a message that is retrieved from the specified resource ID and is
- /// formatted with the specified arguments.
- ///
- /// \param section
- /// Section in the resource file.
- /// \param resourceId
- /// Resource identifier in the section.
- /// \param arguments
- /// Pointer to an MgStringCollection that contains the text to be placed
- /// into the formatted message. If arguments is NULL then that is treated
- /// as having 0 arguments provided. A maximum of 9 arguments is allowed.
- ///
- /// \return
- /// The formatted message string.
- ///
- STRING GetResourceMessage(CREFSTRING section, CREFSTRING resourceId,
- MgStringCollection* arguments);
-#endif //WANT_ACE
-
/// Resource Components
static const STRING ResourceComponent;
@@ -274,30 +156,6 @@
static const STRING ResourceFilenameUnderscore;
static const STRING WhiteSpace;
-#if WANT_ACE
-private:
- /// \brief
- /// Constructor
- ///
- MgResources();
-
- /// Helper to get locale-specific resources
- ResourceCache::iterator GetResources(CREFSTRING locale, bool bLoad);
-
- /// Helper to delete ResourceFile map
- void DeleteResourceFile(ResourceFile* file);
-
- /// Helper function to read in UTF8 resource file and parse it
- bool ParseFile(CREFSTRING strResourceFileName, ResourceFile* resourceFile);
-
- /// Pointer to a process-wide singleton.
- static Ptr<MgResources> m_resources;
-
- STRING m_component;
- STRING m_path;
- ResourceCache m_resourceCache;
- ACE_Recursive_Thread_Mutex m_mutex;
-#endif //WANT_ACE
};
/// \endcond
Modified: sandbox/adsk/vik/Common/Foundation/System/Serializable.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Serializable.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Serializable.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -40,26 +40,6 @@
INTERNAL_API:
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream) = 0;
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream) = 0;
-#endif //WANT_ACE
-
//////////////////////////////////////////////////////////
/// \brief
/// Builds a log friendly string representation
Modified: sandbox/adsk/vik/Common/Foundation/System/Util.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Util.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Util.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -45,46 +45,7 @@
const STRING MgUtil::sm_classNameQualifier = L":"; // NOXLATE
const STRING MgUtil::sm_classPropertyQualifier = L"."; // NOXLATE
-#if WANT_ACE
-ACE_Utils::UUID_Generator uuidGenerator;
-bool MgUtil::uuidInitialized = false;
-
-void MgUtil::InitializeUuidGenerator()
-{
- if (false == uuidInitialized)
- {
- // Perform Double-Checked Locking Optimization.
- ACE_MT (ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance ()));
- if (false == uuidInitialized)
- {
- uuidGenerator.init();
- uuidInitialized = true;
- }
- }
-}
-#endif //WANT_ACE
-
-
-#if WANT_ACE
-MgObject* MgUtil::CreateMgObject(INT32 classId)
-{
- MgClassFactory* factory = MgClassFactory::GetInstance();
- if (NULL == factory)
- {
- throw new MgNullReferenceException(L"CreateMgObject", __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- MgObject* obj = factory->CreateMgObject(classId);
- if (NULL == obj)
- {
- throw new MgNullReferenceException(L"CreateMgObject", __LINE__, __WFILE__, NULL, L"", NULL);
- }
-
- return obj;
-}
-#endif //WANT_ACE
-
string MgUtil::Char2Hex(char a)
{
string str = "";
@@ -96,61 +57,6 @@
return str;
}
-#if WANT_ACE
-
-MgByteReader* MgUtil::GetByteReader(string &s, STRING* mimeType)
-{
- BYTE_ARRAY_IN bytes = (BYTE_ARRAY_IN)s.c_str();
- Ptr<MgByteSource> byteSource = new MgByteSource(bytes, (INT32)s.length());
- if(mimeType != NULL)
- byteSource->SetMimeType(*mimeType);
- return byteSource->GetReader();
-}
-
-string MgUtil::GetStringFromReader(MgByteReader* byteReader)
-{
- string strTemp;
-
- if ( byteReader == NULL)
- return strTemp;
-
- unsigned char buf[1024];
-
- INT32 len = byteReader->Read(((BYTE_ARRAY_OUT)&buf[0]),1024);
-
- while (len != 0)
- {
- for (int i=0; i < len; i++)
- strTemp += MgUtil::Char2Hex(buf[i]);
-
- len = byteReader->Read(buf,1024);
- }
-
- return strTemp;
-}
-
-string MgUtil::GetTextFromReader(MgByteReader* byteReader)
-{
- string strTemp;
-
- if ( byteReader == NULL)
- return strTemp;
-
- unsigned char buf[1025];
-
- INT32 len = byteReader->Read(((BYTE_ARRAY_OUT)&buf[0]),1024);
- buf[len]=0;
- while (len != 0)
- {
- strTemp += (char*)buf;
- len = byteReader->Read(buf,1024);
- buf[len]=0;
- }
-
- return strTemp;
-}
-
-#endif
///----------------------------------------------------------------------------
/// <summary>
/// Converts a wide character string to a multibyte character string.
@@ -677,63 +583,6 @@
return (tmp.compare("true") == 0 ? true : false);
}
-#if WANT_ACE
-///----------------------------------------------------------------------------
-/// <summary>
-/// Generates an Universal Unique IDentifier.
-/// </summary>
-///
-/// <param name="uuid">
-/// Generated UUID
-/// </param>
-///
-/// EXCEPTIONS: MgOutOfMemoryException
-///----------------------------------------------------------------------------
-
-void MgUtil::GenerateUuid(REFSTRING uuid)
-{
- InitializeUuidGenerator();
-
- string str;
-
- MgUtil::GenerateUuid(str);
-
- uuid = ACE_Ascii_To_Wide(str.c_str()).wchar_rep();
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Generates an Universal Unique IDentifier.
-/// </summary>
-///
-/// <param name="uuid">
-/// Generated UUID
-/// </param>
-///
-/// EXCEPTIONS: MgOutOfMemoryException
-///----------------------------------------------------------------------------
-
-void MgUtil::GenerateUuid(string& uuid)
-{
- InitializeUuidGenerator();
-
- ACE_Utils::UUID uuidObject;
-
- uuidGenerator.generate_UUID(uuidObject);
-
- const ACE_CString* str = uuidObject.to_string();
-
- if (0 == str)
- {
- throw new MgException(L"MgUtil.GenerateUuid",
- __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
- }
-
- uuid = str->c_str();
-}
-
-#endif
-
STRING MgUtil::ReplaceEscapeCharInXml(CREFSTRING str)
{
STRING newStr;
@@ -780,31 +629,6 @@
STRING MgUtil::GetResourceMessage(CREFSTRING section, CREFSTRING messageId)
{
STRING str;
-#if WANT_ACE
- MG_TRY()
-
- MgConfiguration* configuration = MgConfiguration::GetInstance();
- assert(NULL != configuration);
- MgResources* resources = MgResources::GetInstance();
- assert(NULL != resources);
-
- if (NULL != configuration && NULL != resources)
- {
- STRING locale;
-
- configuration->GetStringValue(
- MgFoundationConfigProperties::GeneralPropertiesSection,
- MgFoundationConfigProperties::GeneralPropertyDefaultMessageLocale,
- locale,
- MgFoundationConfigProperties::DefaultGeneralPropertyDefaultMessageLocale);
-
- str = resources->GetStringResource(locale, section, messageId);
- }
-
- // If no message is found, we do not fail.
-
- MG_CATCH_AND_RELEASE()
-#endif //WANT_ACE
return str;
}
Modified: sandbox/adsk/vik/Common/Foundation/System/Util.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Util.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Foundation/System/Util.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -77,44 +77,6 @@
///
static string Char2Hex(char ch);
-#if WANT_ACE
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Creates a reader from string
- ///
- /// \param s
- /// String to convert
- ///
- /// \return
- /// ByteReader
- ///
- static MgByteReader* GetByteReader(string &s, STRING* mimeType = NULL);
-
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Creates a String from bytereader
- ///
- /// \param byteReader
- /// ByteReader from which string to be returned
- ///
- /// \return
- /// String formed from ByteReader in hexa decimal
- ///
- static string GetStringFromReader(MgByteReader* byteReader);
-
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Creates a Text string from bytereader
- ///
- /// \param byteReader
- /// ByteReader from which string to be returned
- ///
- /// \return
- /// String formed from ByteReader
- ///
- static string GetTextFromReader(MgByteReader* byteReader);
-#endif
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Converts a wide character string to a multibyte character string.
@@ -334,17 +296,7 @@
///
static STRING EncodeXss(CREFSTRING str);
-#if WANT_ACE
- //////////////////////////////////////////////
- /// \brief
- /// Creates an object based on its class Id
- ///
- /// \exception MgNullReferenceException
- ///
- static MgObject* CreateMgObject(INT32 classId);
-#endif //WANT_ACE
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Converts a string to a boolean.
@@ -512,20 +464,6 @@
INTERNAL_API:
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Generates an Universal Unique IDentifier.
- ///
- /// \param uuid
- /// Generated UUID
- ///
- /// \exception MgOutOfMemoryException
- ///
- ///
-#if WANT_ACE
- static void GenerateUuid(string& uuid);
-#endif
-
static STRING GetResourceMessage(CREFSTRING section, CREFSTRING messageId);
///////////////////////////////////////////////////////////////////////////
Deleted: sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -1,127 +0,0 @@
-//
-// Copyright (C) 2004-2011 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 "AgfStream.h"
-
-#if WANT_ACE
-
-///////////////////////////////////////////////////////////////////////////
-// Creates an MgAgfReaderWriter object
-//
-MgAgfReaderWriter::MgAgfReaderWriter()
-{
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Reads a geometry object from a stream of bytes in AGF format.
-//
-MgGeometry* MgAgfReaderWriter::Read(MgByteReader* agf)
-{
- CHECKARGUMENTNULL(agf, L"MgAgfReaderWriter.Read");
-
- //wrap a stream around the byte reader to deserialize the geometry
- Ptr<MgByteSink> bs = new MgByteSink(agf);
- Ptr<MgByte> bytes = bs->ToBuffer();
-
- Ptr<MgMemoryStreamHelper> streamHelper = new MgMemoryStreamHelper((INT8*)bytes->Bytes(), bytes->GetLength());
- MgAgfStream stream(streamHelper);
-
- //check what is the geometry type without removing advancing the stream
- UINT32 type;
- streamHelper->GetUINT32(type, true, true);
-
- //create the geometry and deserialize it from the memory stream
- Ptr<MgGeometry> geom = MgGeometryFactory::CreateGeometry(type);
- if (geom == NULL)
- return NULL; //TODO: should we throw an exception instead?
-
- geom->Deserialize(&stream);
- return geom.Detach();
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Reads a geometry object from a stream of bytes in AGF format applying
-// the specified transform during the read.
-//
-MgGeometry* MgAgfReaderWriter::Read(MgByteReader* agf, MgTransform* transform)
-{
- //get the untransformed geometry
- Ptr<MgGeometry> geom = Read(agf);
- if (geom == NULL)
- return NULL; //TODO: should we throw an exception instead?
-
- //apply supplied transform
- if (transform)
- geom = (MgGeometry*)geom->Transform(transform);
-
- return geom.Detach();
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Writes a geometry object to a stream of bytes in AGF format.
-//
-MgByteReader* MgAgfReaderWriter::Write(MgGeometry* geometry)
-{
- CHECKARGUMENTNULL(geometry, L"MgAgfReaderWriter.Write");
-
- Ptr<MgMemoryStreamHelper> streamHelper = new MgMemoryStreamHelper();
- MgAgfStream stream(streamHelper);
-
- geometry->Serialize(&stream);
-
- Ptr<MgByteSource> bsource = new MgByteSource((BYTE_ARRAY_IN)streamHelper->GetBuffer(), streamHelper->GetLength());
- bsource->SetMimeType(MgMimeType::Agf);
- return bsource->GetReader();
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Writes a geometry object to a stream of bytes in AGF format applying
-// the specified transform during the write.
-//
-MgByteReader* MgAgfReaderWriter::Write(MgGeometry* geometry, MgTransform* transform)
-{
- CHECKARGUMENTNULL(geometry, L"MgAgfReaderWriter.Write");
-
- //apply supplied transform
- Ptr<MgGeometry> geomToWrite;
- if (transform)
- geomToWrite = (MgGeometry*)geometry->Transform(transform);
- else
- geomToWrite = SAFE_ADDREF(geometry);
-
- //write the transformed geometry
- return Write(geomToWrite);
-}
-
-//////////////////////////////////////////////
-// Dispose this object.
-//
-void MgAgfReaderWriter::Dispose()
-{
- delete this;
-}
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgAgfReaderWriter::GetClassId()
-{
- return m_cls_id;
-}
-
-#endif //WANT_ACE
\ No newline at end of file
Deleted: sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -1,304 +0,0 @@
-//
-// Copyright (C) 2004-2011 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 _MGAGFREADERWRITER_H_
-#define _MGAGFREADERWRITER_H_
-
-#if WANT_ACE
-
-/// \defgroup MgAgfReaderWriter MgAgfReaderWriter
-/// \ingroup Geometry_Module_classes
-/// \{
-
-class MgAgfReaderWriter;
-template class MG_GEOMETRY_API Ptr<MgAgfReaderWriter>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// The MgAgfReaderWriter class is used to translate an
-/// MgGeometry object into into an MgByteReader object and to do
-/// the reverse translation.
-///
-/// \remarks
-/// The MgGeometry object to be translated is obtained from an
-/// MgWktReaderWriter or MgGeometryFactory object. The resulting
-/// MgByteReader object is then used to create an
-/// MgGeometryProperty object for an \link MgInsertFeatures insert features \endlink
-/// operation.
-/// \n
-/// In the reverse direction an MgByteReader object from an
-/// MgFeatureReader object is translated into an MgGeometry
-/// object. The MgFeatureReader object is obtained from a \link MgFeatureService::SelectFeatures select features \endlink
-/// operation, and the MgByteReader object is returned by a call
-/// to the GetGeometry() method on the MgFeatureReader object.
-/// \n
-/// The stream of bytes contained in this MgByteReader object is
-/// in Autodesk Geometry Format (AGF).
-///
-/// <!-- Example (PHP) -->
-/// \htmlinclude PHPExampleTop.html
-/// \code
-/// $wktReaderWriter = new MgWktReaderWriter();
-/// $agfReaderWriter = new MgAgfReaderWriter();
-/// $geometryFactory = new MgGeometryFactory();
-///
-/// # In the MgGeometry to MgGeometryProperty direction:
-/// # get the geometry from MgWktReaderWriter
-/// $agfTextPoint = "POINT XY (0 0)";
-/// $pointGeometryFromWkt = $wktReaderWriter->Read($agfTextPoint);
-/// # or get the geometry from MgGeometryFactory
-/// $coordinateXY = $geometryFactory->CreateCoordinateXY(0, 0);
-/// $pointGeometryFromFactory = $geometryFactory->CreatePoint($coordinateXY);
-///
-/// # translate the MgGeometry object into an MgByteReader object
-/// $byteReader = $agfReaderWriter->Write($pointGeometryFromWkt);
-/// $byteReader = $agfReaderWriter->Write($pointGeometryFromFactory);
-///
-/// # create an MgGeometryProperty object from the byte reader
-/// $geometryProperty = new MgGeometryProperty("geomPropName", $byteReader);
-///
-/// # In the MgFeatureReader to MgGeometry direction:
-/// $byteReader = $featureReader->GetGeometry("geomPropName");
-/// $pointGeometry = $agfReaderWriter->Read($byteReader);
-/// $agfTextPoint = $wktReaderWriter->Write($pointGeometry);
-/// # print "POINT XY (0 0)" to screen
-/// echo "$agfTextPoint\n";
-/// \endcode
-/// \htmlinclude ExampleBottom.html
-///
-/// <!-- Example (C#) -->
-/// \htmlinclude CSharpExampleTop.html
-/// \code
-/// using OSGeo.MapGuide;
-/// private MgAgfReaderWriter agfReaderWriter;
-/// private MgWktReaderWriter wktReaderWriter;
-/// private MgGeometryFactory geometryFactory;
-/// private MgPoint pt11;
-/// private MgPoint pt11FromText;
-/// private String pt11TextSpec = "POINT XY ( 1 1 )";
-/// private MgByteReader byteReader;
-/// private MgGeometryProperty point11Prop;
-/// private MgFeatureQueryOptions containsPoint11QryOpt;
-/// private MgFeatureService featureService;
-/// private MgResourceIdentifier resourceId;
-/// private String className;
-/// private MgFeatureReader featureReader;
-/// private MgGeometry geometry;
-/// private String geometryText;
-///
-/// public MgByteReader WktTextToMgByteReader(String wktText)
-/// {
-/// MgByteReader byteReader = null;
-/// MgGeometry geometry = wktReaderWriter.Read(wktText);
-/// byteReader = agfReaderWriter.Write(geometry);
-/// return byteReader;
-/// }
-///
-/// public MgPoint CreateAPointXY(double x, double y)
-/// {
-/// MgCoordinate coord = geometryFactory.CreateCoordinateXY(x, y);
-/// return geometryFactory.CreatePoint(coord);
-/// }
-///
-/// className = "featureClassName";
-/// agfReaderWriter = new MgAgfReaderWriter();
-/// wktReaderWriter = new MgWktReaderWriter();
-/// geometryFactory = new MgGeometryFactory();
-/// // In the MgGeometry to MgGeometryProperty direction:
-/// // get the geometry from the MgWktReaderWriter
-/// pt11FromText = wktReaderWriter.Read(pt11TextSpec) as MgPoint;
-/// // or get the geometry from the geometry factory
-/// pt11 = CreateAPointXY(1, 1);
-///
-/// // translate the MgGeometry object into an MgByteReader object
-/// byteReader = agfReaderWriter.Write(pt11);
-/// byteReader = agfReaderWriter.Write(pt11FromText);
-///
-/// // create an MgGeometryProperty object from the byte reader
-/// point11Prop = new MgGeometryProperty("theFeatureGeometry", byteReader);
-///
-/// // In the MgFeatureReader to MgGeometry direction:
-/// containsPoint11QryOpt = new MgFeatureQueryOptions();
-/// containsPoint11QryOpt.SetFilter("theFeatureGeometry CONTAINS GEOMFROMTEXT( 'POINT(1 1)' )");
-/// // the MgResourceIdentifier object, resourceId, is the feature source being queried
-/// featureReader = featureService.SelectFeatures(resourceId, className, containsPoint11QryOpt);
-/// while (featureReader.ReadNext())
-/// {
-/// byteReader = featureReader.GetGeometry("theFeatureGeometry");
-/// geometry = agfReaderWriter.Read(byteReader);
-/// geometryText = wktReaderWriter.Write(geometry);
-/// // geometryText now contains the text representation of the geometry
-/// }
-/// \endcode
-/// \htmlinclude ExampleBottom.html
-///
-class MG_GEOMETRY_API MgAgfReaderWriter : public MgGuardDisposable
-{
- DECLARE_CLASSNAME(MgAgfReaderWriter)
-
-PUBLISHED_API:
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Creates an MgAgfReaderWriter object
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// MgAgfReaderWriter();
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// MgAgfReaderWriter();
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// MgAgfReaderWriter();
- /// \htmlinclude SyntaxBottom.html
- ///
- MgAgfReaderWriter();
-
- ////////////////////////////////////////////////////////////////
- /// \brief
- /// Translates an MgByteReader object into an MgGeometry object.
- /// The contents of the MgByteReader is in Autodesk Geometry
- /// Format (AGF).
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// virtual MgGeometry Read(MgByteReader agf);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// virtual MgGeometry Read(MgByteReader agf);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// virtual MgGeometry Read(MgByteReader agf);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param agf (MgByteReader)
- /// An MgByteReader that supplies the AGF byte
- /// stream.
- ///
- /// \return
- /// An instance of MgGeometry that corresponds to the specified
- /// AGF.
- ///
- virtual MgGeometry* Read(MgByteReader* agf);
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Reads a geometry object from a stream of bytes in AGF format applying
- /// the specified transform during the read.
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// virtual MgGeometry Read(MgByteReader agf, MgTransform transform);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// virtual MgGeometry Read(MgByteReader agf, MgTransform transform);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// virtual MgGeometry Read(MgByteReader agf, MgTransform transform);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param agf (MgByteReader)
- /// An MgByteReader that supplies the AGF byte stream.
- /// \param transform (MgTransform)
- /// An MgTransform that is used to transform each coordinate read from the
- /// AGF representation.
- ///
- /// \return
- /// An instance of MgGeometry that corresponds to the specified AGF with
- /// the specified transform applied.
- ///
- virtual MgGeometry* Read(MgByteReader* agf, MgTransform* transform);
-
- /////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Translates an MgGeometry object into a stream of bytes in AGF
- /// (Autodesk Geometry Format).
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// virtual MgByteReader Write(MgGeometry geometry);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// virtual MgByteReader Write(MgGeometry geometry);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// virtual MgByteReader Write(MgGeometry geometry);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param geometry (MgGeometry)
- /// An MgGeometry object to write to AGF.
- ///
- /// \return
- /// An MgByteReader which contains the AGF representation of the
- /// MgGeometry object.
- ///
- virtual MgByteReader* Write(MgGeometry* geometry);
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Writes a geometry object to a stream of bytes in AGF format applying
- /// the specified transform during the write.
- ///
- /// <!-- Syntax in .Net, Java, and PHP -->
- /// \htmlinclude DotNetSyntaxTop.html
- /// virtual MgByteReader Write(MgGeometry geometry, MgTransform transform);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude JavaSyntaxTop.html
- /// virtual MgByteReader Write(MgGeometry geometry, MgTransform transform);
- /// \htmlinclude SyntaxBottom.html
- /// \htmlinclude PHPSyntaxTop.html
- /// virtual MgByteReader Write(MgGeometry geometry, MgTransform transform);
- /// \htmlinclude SyntaxBottom.html
- ///
- /// \param geometry (MgGeometry)
- /// An MgGeometry object to write to AGF.
- /// \param transform (MgTransform)
- /// An MgTransform that is used to transform each coordinate written to the
- /// AGF representation.
- ///
- /// \return
- /// An MgByteReader that contains the transformed AGF representation.
- ///
- virtual MgByteReader* Write(MgGeometry* geometry, MgTransform* transform);
-
-INTERNAL_API:
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
-protected:
-
- //////////////////////////////////////////////
- /// \brief
- /// Dispose this object.
- ///
- virtual void Dispose();
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_AgfReaderWriter;
-};
-/// \}
-
-#endif //WANT_ACE
-
-#endif //_MGAGFREADERWRITER_H_
Deleted: sandbox/adsk/vik/Common/Geometry/AgfStream.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AgfStream.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/AgfStream.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -1,158 +0,0 @@
-//
-// Copyright (C) 2004-2011 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"
-
-#if WANT_ACE
-
-#include "AgfStream.h"
-
-//////////////////////////////////////////////////////////////////
-// Constructors
-//
-MgAgfStream::MgAgfStream() : MgStream()
-{
-}
-
-MgAgfStream::MgAgfStream(MgStreamHelper* streamHelper) : MgStream(streamHelper)
-{
-}
-
-//////////////////////////////////////////////////////////////////
-// This reads the int64 from the stream
-//
-void MgAgfStream::GetInt64(INT64& value)
-{
- MgStreamReader::m_sHelper->GetINT64(value);
-}
-
-//////////////////////////////////////////////////////////////////
-// This reads the int32 from the stream
-//
-void MgAgfStream::GetInt32(INT32& value)
-{
- UINT32 uVal = 0;
- MgStreamReader::m_sHelper->GetUINT32(uVal);
- value = (INT32) uVal;
-}
-
-//////////////////////////////////////////////////////////////////
-// This reads the int16 from the stream
-//
-void MgAgfStream::GetInt16(INT16& value)
-{
- UINT16 val;
- MgStreamReader::m_sHelper->GetUINT16(val);
- value = val;
-}
-
-//////////////////////////////////////////////////////////////////
-// This reads the float from the stream
-//
-void MgAgfStream::GetSingle(float& value)
-{
- MgStreamReader::m_sHelper->GetData(&value, sizeof(float), true, false);
-}
-
-//////////////////////////////////////////////////////////////////
-// This reads the double from the stream
-//
-void MgAgfStream::GetDouble(double& value)
-{
- MgStreamReader::m_sHelper->GetData(&value, sizeof(double), true, false);
-}
-
-//////////////////////////////////////////////////////////////////
-// This reads the boolean from the stream
-//
-void MgAgfStream::GetBoolean(bool& value)
-{
- UINT8 tempValue;
- MgStreamReader::m_sHelper->GetUINT8(tempValue);
- value = (bool)tempValue;
-}
-
-//////////////////////////////////////////////////////////////////
-// This reads the byte from the stream
-//
-void MgAgfStream::GetByte(BYTE& value)
-{
- UINT8 val;
- MgStreamReader::m_sHelper->GetUINT8(val);
- value = val;
-}
-
-//////////////////////////////////////////////////////////////////
-// This writes the int64 argument packet to the stream
-//
-MgStreamHelper::MgStreamStatus MgAgfStream::WriteInt64(INT64 value)
-{
- return MgStreamWriter::m_sHelper->WriteINT64(value);
-}
-
-//////////////////////////////////////////////////////////////////
-// This writes the int32 argument packet to the stream
-//
-MgStreamHelper::MgStreamStatus MgAgfStream::WriteInt32(INT32 value)
-{
- return MgStreamWriter::m_sHelper->WriteUINT32((UINT32)value);
-}
-
-//////////////////////////////////////////////////////////////////
-// This writes the int16 argument packet to the stream
-//
-MgStreamHelper::MgStreamStatus MgAgfStream::WriteInt16(INT16 value)
-{
- return MgStreamWriter::m_sHelper->WriteUINT16(value);
-}
-
-//////////////////////////////////////////////////////////////////
-// This writes the float argument packet to the stream
-//
-MgStreamHelper::MgStreamStatus MgAgfStream::WriteSingle(float value)
-{
- return MgStreamWriter::m_sHelper->WriteBytes((const unsigned char*)&value, (int)sizeof(float));
-}
-
-//////////////////////////////////////////////////////////////////
-// This writes the double argument packet to the stream
-//
-MgStreamHelper::MgStreamStatus MgAgfStream::WriteDouble(double value)
-{
- return MgStreamWriter::m_sHelper->WriteBytes((const unsigned char*)&value, (int)sizeof(double));
-}
-
-//////////////////////////////////////////////////////////////////
-// This writes the boolean argument packet to the stream
-//
-MgStreamHelper::MgStreamStatus MgAgfStream::WriteBoolean(bool value)
-{
- UINT8 intVal = value;
- return MgStreamWriter::m_sHelper->WriteUINT8(intVal);
-}
-
-//////////////////////////////////////////////////////////////////
-// This writes the byte argument packet to the stream
-//
-MgStreamHelper::MgStreamStatus MgAgfStream::WriteByte(BYTE value)
-{
- return MgStreamWriter::m_sHelper->WriteUINT8((UINT8)value);
-}
-
-//////////////////////////////////////////////////////////////////
-
-#endif //WANT_ACE
\ No newline at end of file
Deleted: sandbox/adsk/vik/Common/Geometry/AgfStream.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AgfStream.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/AgfStream.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -1,299 +0,0 @@
-//
-// Copyright (C) 2004-2011 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 _MGAGFSTREAM_H_
-#define _MGAGFSTREAM_H_
-
-#if WANT_ACE
-
-/// \cond INTERNAL
-///////////////////////////////////////////////////////////////////////////
-// The MgAgfStream class provides an interface to read and write data
-// without adding packet information
-//
-class MgAgfStream : public MgStream
-{
- DECLARE_CLASSNAME(MgAgfStream)
-
-INTERNAL_API:
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Default Constructor
- ///
- MgAgfStream();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Constructors
- ///
- /// \param streamHelper
- /// Stream helper object holding ACE_SOCK_STREAM
- ///
- MgAgfStream(MgStreamHelper* streamHelper);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the string from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetString(REFSTRING wcStr);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the int64 from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetInt64(INT64& value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the int32 from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetInt32(INT32& value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the int16 from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetInt16(INT16& value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the float from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetSingle(float& value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the double from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetDouble(double& value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the boolean from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetBoolean(bool& value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the byte from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetByte(BYTE& value);
-
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the stream from the server
- ///
- /// \return
- /// ByteReader
- ///
- virtual MgByteReader* GetStream();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the data from the server
- ///
- /// \param value
- /// Value to be read
- ///
- /// \return
- /// size of data read
- ///
- virtual MgStreamHelper::MgStreamStatus GetData(void* value, INT32 length);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This reads the class id argument packet from the server
- ///
- /// \param value
- /// value to be read.
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetClassId(INT32& value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Reads the end of stream header
- ///
- /// \return
- /// Nothing
- ///
- virtual void GetStreamEnd();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Reads the Object from stream
- ///
- /// \return
- /// MgObject pointer
- ///
- virtual MgObject* GetObject();
-
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the string argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteString(CREFSTRING value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the int64 argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteInt64(INT64 value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the int32 argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteInt32(INT32 value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the int16 argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream Status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteInt16(INT16 value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the float argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteSingle(float value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the double argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteDouble(double value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the boolean argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteBoolean(bool value);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// This writes the byte argument packet to the server
- ///
- /// \param value
- /// value to be written.
- ///
- /// \return
- /// Stream status
- ///
- virtual MgStreamHelper::MgStreamStatus WriteByte(BYTE value);
-
-};
-/// \endcond
-
-#endif //WANT_ACE
-
-#endif // _MGAGFSTREAM_H_
Modified: sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -17,14 +17,6 @@
#include "stdafx.h"
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgAggregateGeometry::GetClassId()
-{
- return m_cls_id;
-}
-
///////////////////////////////////////////////////////////////////////////
///<summary>
/// Gets a geometry collection, copy of the collection held by this aggregate geometry
Modified: sandbox/adsk/vik/Common/Geometry/AggregateGeometry.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AggregateGeometry.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/AggregateGeometry.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -69,15 +69,6 @@
INTERNAL_API:
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the geometry at the specified position
@@ -99,9 +90,6 @@
/// The coordinates of this geometric entity
///
virtual MgCoordinateIterator* GetCoordinates() = 0;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_AggregateGeometry;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -118,36 +118,6 @@
}
//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgArcSegment::GetClassId()
-{
- return m_cls_id;
-}
-
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgArcSegment::Serialize(MgStream* stream)
-{
- //should not be called on geometry components
- //components are serialized by the containing geometries
- throw new MgNotImplementedException(L"MgArcSegment.Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgArcSegment::Deserialize(MgStream* stream)
-{
- //should not be called on geometry components
- //components are deserialized by the containing geometries
- throw new MgNotImplementedException(L"MgArcSegment.Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
-}
-#endif
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgArcSegment::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/ArcSegment.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/ArcSegment.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/ArcSegment.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -196,35 +196,6 @@
///
MgArcSegment();
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Tests whether this geometry component is spatially equal to another geometry component.
@@ -267,9 +238,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_ArcSegment;
-
private:
Ptr<MgCoordinate> m_control;
Ptr<MgCoordinate> m_start;
Modified: sandbox/adsk/vik/Common/Geometry/Coordinate.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Coordinate.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Coordinate.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -19,11 +19,3 @@
double const MgCoordinate::NoM = DoubleNan;
double const MgCoordinate::NoZ = DoubleNan;
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCoordinate::GetClassId()
-{
- return m_cls_id;
-}
Modified: sandbox/adsk/vik/Common/Geometry/Coordinate.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Coordinate.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Coordinate.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -181,36 +181,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- ///
- virtual INT32 GetClassId();
-
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream) = 0;
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream) = 0;
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Returns a copy of this object
///
virtual MgCoordinate* Copy() = 0;
@@ -316,9 +286,6 @@
///
///
virtual void SetM(double m) = 0; /// __get
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Coordinate;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -96,14 +96,6 @@
}
//////////////////////////////////////////////////////////////////
-// Return the class id
-//
-INT32 MgCoordinateIterator::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Dispose this object
//
void MgCoordinateIterator::Dispose()
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateIterator.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateIterator.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateIterator.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -127,15 +127,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Get the number of elements
///
virtual INT32 GetCount();
@@ -154,9 +145,6 @@
///
MgCoordinateIterator();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CoordinateIterator;
-
private:
INT32 m_currPos;
Ptr<MgCoordinateCollection> m_coordinateCollection;
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystem.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystem.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystem.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -325,19 +325,6 @@
/// Nothing.
///
virtual void ConvertToLonLat(double x[], double y[], double lon[], double lat[], int arraySize)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystem;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -78,18 +78,6 @@
///
virtual void PrepareForDispose()=0;
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemCatalog;
};
#endif //_MGCOORDINATESYSTEMCATALOG_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -41,19 +41,6 @@
virtual void Clear()=0;
virtual MgStringCollection* GetCoordinateSystems()=0;
virtual MgCoordinateSystemCatalog* GetCatalog()=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemCategory;
};
#endif //_MGCOORDINATESYSTEMCATEGORY_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -36,18 +36,6 @@
virtual void Rename(CREFSTRING sOldName, CREFSTRING sNewName)=0;
virtual MgCoordinateSystemCategory* GetCategory(CREFSTRING sName)=0;
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemCategoryDictionary;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -67,18 +67,6 @@
virtual UINT8* SerializeTo(UINT8* pStream)=0;
virtual UINT32 GetSizeSerialized()=0;
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemDatum;
};
#endif //_MGCOORDINATESYSTEMDATUM_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -35,18 +35,6 @@
virtual MgCoordinateSystemDatum* NewDatum()=0;
virtual MgCoordinateSystemDatum* GetDatum(CREFSTRING sName)=0;
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemDatumDictionary;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -34,19 +34,6 @@
PUBLISHED_API:
virtual MgCoordinateSystem* NewCoordinateSystem()=0;
virtual MgCoordinateSystem* GetCoordinateSystem(CREFSTRING sName)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemDictionary;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -37,19 +37,6 @@
virtual void CreateDatumDictionary(CREFSTRING sDictPathName)=0;
virtual void CreateCoordsysDictionary(CREFSTRING sDictPathName)=0;
virtual void CreateCategoryDictionary(CREFSTRING sDictPathName)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemDictionaryUtility;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -70,19 +70,6 @@
virtual UINT8* SerializeFrom(UINT8* pStream)=0;
virtual UINT8* SerializeTo(UINT8* pStream)=0;
virtual UINT32 GetSizeSerialized()=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemEllipsoid;
};
#endif //_MGCOORDINATESYSTEMELLIPSOID_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -34,19 +34,6 @@
PUBLISHED_API:
virtual MgCoordinateSystemEllipsoid* NewEllipsoid()=0;
virtual MgCoordinateSystemEllipsoid* GetEllipsoid(CREFSTRING sName)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemEllipsoidDictionary;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -30,19 +30,6 @@
virtual void AddFilter(MgCoordinateSystemFilter *pFilter)=0;
virtual MgStringCollection* NextName(UINT32 ulCount)=0;
virtual MgStringCollection* NextDescription(UINT32 ulCount)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemEnum;
};
#endif //_MGCOORDINATESYSTEMENUM_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -30,19 +30,6 @@
virtual void Reset()=0;
virtual MgCoordinateSystemEnumInteger32* CreateClone()=0;
virtual void AddFilter(MgCoordinateSystemFilterInteger32 *pFilter)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemEnumInteger32;
};
#endif //_MGCOORDINATESYSTEMENUMINTEGER32_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -543,14 +543,6 @@
static void DeleteCatalog();
protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
/// \brief
/// Dispose this object.
@@ -560,10 +552,6 @@
///
virtual void Dispose();
-/// Data Members
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemFactory;
-
private:
static MgCoordinateSystemCatalog* sm_pCatalog;
};
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -24,19 +24,6 @@
PUBLISHED_API:
virtual bool IsFilteredOut(MgGuardDisposable *pDef)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemFilter;
};
#endif //_MGCOORDINATESYSTEMFILTER_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -25,18 +25,6 @@
PUBLISHED_API:
virtual bool IsFilteredOut(INT32 nValue)=0;
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemFilterInteger32;
};
#endif //_MGCOORDINATESYSTEMFILTERINTEGER32_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -36,19 +36,6 @@
virtual MgCoordinateSystem* CodeToDefinition(INT32 nFormatSource, CREFSTRING sCodeSource)=0;
virtual STRING CodeToCode(INT32 nFormatSource, CREFSTRING sCodeSource, INT32 nFormatDestination)=0;
virtual bool IsCodeInDictionary(INT32 nFormat, CREFSTRING sCode)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemFormatConverter;
};
#endif //_MGCOORDINATESYSTEMFORMATCONVERTER_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -67,20 +67,6 @@
virtual INT32 GetTransformationMethod() = 0;
virtual void SetTransformationMethod(INT32 analyticalMethodCode) = 0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticAnalyticalTransformDefParams;
-
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -94,20 +94,6 @@
virtual MgCoordinateSystemGeodeticTransformGridFile* NewGridFile() = 0;
//END: struct csGeodeticXfromParmsFile
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticInterpolationTransformDefParams;
-
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -83,19 +83,6 @@
virtual INT32 GetTransformationMethod() = 0;
virtual void SetTransformationMethod(INT32 mulRegTransformationMethod) = 0;
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticMultipleRegressionTransformDefParams;
-
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -129,19 +129,6 @@
virtual UINT8* SerializeFrom(UINT8* pStream)=0;
virtual UINT8* SerializeTo(UINT8* pStream)=0;
virtual UINT32 GetSizeSerialized()=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticPath;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -57,19 +57,6 @@
/// Return the geodetic path if found. Otherwise NULL.
///
virtual MgCoordinateSystemGeodeticPath* GetGeodeticPath(CREFSTRING pathName)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticPathDictionary;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -35,19 +35,6 @@
virtual bool IsValid() = 0;
virtual bool IsProtected() = 0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticPathElement;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformDefParams.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformDefParams.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformDefParams.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -47,20 +47,6 @@
/// Sets the code of the well-known geodetic transformation method. Can only
/// be one of the constants defined in MgCoordinateSystemGeodeticStandaloneTransformationMethod (except for None).
virtual void SetTransformationMethod(INT32 builtInTransformationMethod) = 0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId() { return m_cls_id; };
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticStandaloneTransformDefParams;
-
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -178,19 +178,6 @@
virtual UINT8* SerializeFrom(UINT8* pStream)=0;
virtual UINT8* SerializeTo(UINT8* pStream)=0;
virtual UINT32 GetSizeSerialized()=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticTransformDef;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -61,19 +61,6 @@
/// Return the geodetic transformation if found. Otherwise NULL.
///
virtual MgCoordinateSystemGeodeticTransformDef* GetGeodeticTransformationDef(CREFSTRING transformationName)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticTransformDefDictionary;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -73,20 +73,6 @@
virtual bool IsProtected() = 0;
virtual bool IsValid() = 0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticTransformGridFile;
-
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -131,19 +131,6 @@
/// Obsolete. Use MgCoordinateSystemGeodeticTransformDef and
/// MgCoordinateSystemGeodeticTransformDefParams (plus derived classes) instead.
virtual bool IsLegalBwScale(double dBwScale)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGeodeticTransformation;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -21,12 +21,6 @@
class MgCoordinateSystemGridGeneric : public MgCoordinateSystemGridBase
{
PUBLISHED_API:
-
-protected:
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridGeneric;
};
#endif //_MGCOORDINATESYSTEMGRIDGENERIC_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -663,11 +663,6 @@
/// what the default value should be.
///
virtual double GetCurvePrecision (MgCoordinateSystem* gridCRS)=0;
-
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridSpecification;
};
/// \}
@@ -704,10 +699,6 @@
virtual void GetBoundaryExtents (double& eastMin,double& eastMax,double& northMin,double& northMax) const = 0;
virtual MgPolygon* GetBoundary (MgCoordinateSystemTransform* transformation,double precision) = 0;
virtual MgLineStringCollection* ClipLineString (MgLineString* lineString) const=0;
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridBoundary;
};
/// \}
@@ -769,8 +760,6 @@
virtual void SetExceptionsOn(bool bOn) = 0;
INTERNAL_API:
protected:
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridBase;
};
/// \}
@@ -795,10 +784,6 @@
virtual MgLineStringCollection* GetSegmentCollection(void)= 0;
virtual void SetSegmentCollection (MgLineStringCollection* segmentCollection) = 0;
INTERNAL_API:
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridLine;
};
/// \}
@@ -836,10 +821,6 @@
virtual MgLineStringCollection* GetWestLine (void) = 0;
INTERNAL_API:
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridRegion;
};
/// \}
@@ -864,10 +845,6 @@
virtual MgCoordinate* GetPosition () = 0;
virtual MgCoordinate* GetDirectionVector () = 0;
INTERNAL_API:
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridTick;
};
/// \}
@@ -892,11 +869,6 @@
virtual void SetItem (INT32 index, MgCoordinateSystemGridLine* value)=0;
virtual void Add (MgCoordinateSystemGridLine* value)=0;
virtual void AddCollection (MgCoordinateSystemGridLineCollection* aGridLineCollection)=0;
-
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridLineCollection;
};
/// \}
@@ -916,11 +888,6 @@
INTERNAL_API:
virtual void SetItem (INT32 index, MgCoordinateSystemGridRegion* value)=0;
virtual void Add (MgCoordinateSystemGridRegion* value)=0;
-
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridRegionCollection;
};
/// \}
@@ -942,11 +909,6 @@
INTERNAL_API:
virtual void SetItem (INT32 index, MgCoordinateSystemGridTick* value)=0;
virtual void Add (MgCoordinateSystemGridTick* value)=0;
-
-protected:
- INT32 GetClassId(){return m_cls_id;};
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridTickCollection;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -46,19 +46,6 @@
/// object. If true (default), this comparator compares geodetic transformation information
/// it might find for a datum object. If false, this comparison step is skipped.
virtual bool GetCompareInternalDatumOldParameters() = 0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemMathComparator;
};
#endif //_MGCOORDINATESYSTEMMATHCOMPARATOR_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -556,20 +556,6 @@
INTERNAL_API:
virtual MgCoordinateSystem* GetCoordSys()=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-/// Data Members
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemMeasure;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -111,12 +111,6 @@
virtual INT32 ConvertFromLonLat(double dLongitude, double dLatitude, INT32 nPrecision, REFSTRING sMgrs)=0;
virtual INT32 ConvertFromLonLat(MgCoordinate* pLonLat, INT32 nPrecision, REFSTRING sMgrs)=0;
virtual INT32 ConvertToLonLat(CREFSTRING sMgrs, MgCoordinate* pLonLat, INT32 grdSqrPosition)=0;
-
-protected:
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemMgrs;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -39,19 +39,6 @@
virtual INT32 GetParameterType(INT32 nProjectionCode, UINT32 ulIndex)=0;
virtual INT32 GetUnitType(INT32 nProjectionCode)=0;
virtual STRING GetTagString(INT32 nProjectionCode)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemProjectionInformation;
};
#endif //_MGCOORDINATESYSTEMPROJECTIONINFORMATION_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -735,20 +735,6 @@
INT32 orientation,
MgCoordinate* fromPnt,
MgCoordinate* toPnt) = 0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return CoordinateSystem_CoordinateSystemTransform;};
-
- /// Data Members
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemTransform;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -30,19 +30,6 @@
virtual INT32 GetUnitType(INT32 nUnitCode)=0;
virtual STRING GetTagString(INT32 nUnitCode)=0;
virtual STRING GetAbbreviation(INT32 nUnitCode)=0;
-
-protected:
- /////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the class Id
- ///
- /// \return
- /// The integer value
- ///
- INT32 GetClassId(){return m_cls_id;};
-
-CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemUnitInformation;
};
#endif //_MGCOORDINATESYSTEMUNITINFORMATION_H_
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -123,27 +123,7 @@
return new MgCoordinateXY(m_x, m_y);
}
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgCoordinateXY::Serialize(MgStream* stream)
-{
- stream->WriteDouble(m_x);
- stream->WriteDouble(m_y);
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgCoordinateXY::Deserialize(MgStream* stream)
-{
- stream->GetDouble(m_x);
- stream->GetDouble(m_y);
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
// Test 2 coordinates for equality
// Note, both coordinates must be XZ
//
@@ -199,11 +179,3 @@
awktStr += MgUtil::MultiByteToWideChar(coordAwkt);
coordDim = L"";
}
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCoordinateXY::GetClassId()
-{
- return m_cls_id;
-}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXY.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXY.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXY.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -126,28 +126,8 @@
///
MgCoordinate* Copy();
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
/// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Test 2 coordinates for equality
///
virtual bool Equals(MgCoordinate* coord);
@@ -164,15 +144,6 @@
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
////////////////////////////////////////
/// \brief
/// Sets the X value of this coordinate.
@@ -268,9 +239,6 @@
private:
double m_x;
double m_y;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CoordinateXY;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -125,29 +125,8 @@
return new MgCoordinateXYM(m_x, m_y, m_m);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgCoordinateXYM::Serialize(MgStream* stream)
-{
- stream->WriteDouble(m_x);
- stream->WriteDouble(m_y);
- stream->WriteDouble(m_m);
-}
//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgCoordinateXYM::Deserialize(MgStream* stream)
-{
- stream->GetDouble(m_x);
- stream->GetDouble(m_y);
- stream->GetDouble(m_m);
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
// Test 2 coordinates for equality
// Note, both coordinates must be XYM
//
@@ -220,11 +199,3 @@
coordDim = L"";
}
}
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCoordinateXYM::GetClassId()
-{
- return m_cls_id;
-}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYM.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYM.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYM.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -129,28 +129,9 @@
///
MgCoordinate* Copy();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
//////////////////////////////////////////////////////////////////
/// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Test 2 coordinates for equality
///
virtual bool Equals(MgCoordinate* coord);
@@ -167,15 +148,6 @@
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
////////////////////////////////////////
/// \brief
/// Sets the X value of this coordinate.
@@ -272,9 +244,6 @@
double m_x;
double m_y;
double m_m;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CoordinateXYM;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -126,29 +126,7 @@
return new MgCoordinateXYZ(m_x, m_y, m_z);
}
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgCoordinateXYZ::Serialize(MgStream* stream)
-{
- stream->WriteDouble(m_x);
- stream->WriteDouble(m_y);
- stream->WriteDouble(m_z);
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgCoordinateXYZ::Deserialize(MgStream* stream)
-{
- stream->GetDouble(m_x);
- stream->GetDouble(m_y);
- stream->GetDouble(m_z);
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
// Test 2 coordinates for equality
// Note, both coordinates must be XYZ
//
@@ -221,11 +199,3 @@
coordDim = L"";
}
}
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCoordinateXYZ::GetClassId()
-{
- return m_cls_id;
-}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -126,28 +126,9 @@
///
MgCoordinate* Copy();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
//////////////////////////////////////////////////////////////////
/// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Test 2 coordinates for equality
///
virtual bool Equals(MgCoordinate* coord);
@@ -164,15 +145,6 @@
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
////////////////////////////////////////
/// \brief
/// Sets the X value of this coordinate.
@@ -269,9 +241,6 @@
double m_x;
double m_y;
double m_z;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CoordinateXYZ;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -127,31 +127,8 @@
return new MgCoordinateXYZM(m_x, m_y, m_z, m_m);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgCoordinateXYZM::Serialize(MgStream* stream)
-{
- stream->WriteDouble(m_x);
- stream->WriteDouble(m_y);
- stream->WriteDouble(m_z);
- stream->WriteDouble(m_m);
-}
//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgCoordinateXYZM::Deserialize(MgStream* stream)
-{
- stream->GetDouble(m_x);
- stream->GetDouble(m_y);
- stream->GetDouble(m_z);
- stream->GetDouble(m_m);
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
// Test 2 coordinates for equality
// Note, both coordinates must be XZYM
//
@@ -234,11 +211,3 @@
coordDim = L"";
}
}
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCoordinateXYZM::GetClassId()
-{
- return m_cls_id;
-}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -129,28 +129,9 @@
///
MgCoordinate* Copy();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
//////////////////////////////////////////////////////////////////
/// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Test 2 coordinates for equality
///
virtual bool Equals(MgCoordinate* coord);
@@ -167,15 +148,6 @@
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
////////////////////////////////////////
/// \brief
/// Sets the X value of this coordinate.
@@ -273,9 +245,6 @@
double m_y;
double m_z;
double m_m;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CoordinateXYZM;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/Curve.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Curve.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Curve.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -17,10 +17,3 @@
#include "stdafx.h"
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurve::GetClassId()
-{
- return m_cls_id;
-}
Modified: sandbox/adsk/vik/Common/Geometry/Curve.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Curve.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Curve.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -75,15 +75,6 @@
INTERNAL_API:
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
/////////////////////////////////////////////////////////////////
/// \brief
/// Returns an iterator over the coordinates included in this
@@ -93,9 +84,6 @@
/// The coordinates of this geometric entity
///
virtual MgCoordinateIterator* GetCoordinates() = 0;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Curve;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -131,14 +131,6 @@
}
//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurvePolygon::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgCurvePolygon::ComputeEnvelope()
@@ -157,80 +149,7 @@
delete this;
}
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgCurvePolygon::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
-
- //Get the coordinate dimension
- Ptr<MgCurveSegment> segment = m_outerRing->GetSegment(0);
- Ptr<MgCoordinate> startCoord = segment->GetStartCoordinate();
- INT32 coordinateDimension = startCoord->GetDimension();
-
- //Type
- stream->WriteInt32(MgGeometryType::CurvePolygon);
-
- //Coordinate dimension
- stream->WriteInt32(coordinateDimension);
-
- //Num rings
- INT32 numInnerRings = GetInteriorRingCount();
- stream->WriteInt32(1 + numInnerRings); //add outer ring
-
- //Outer ring
- MgGeometryUtil::WriteCurveRing(stream, m_outerRing);
-
- //Inner rings
- for (INT32 i=0; i<numInnerRings; ++i)
- {
- Ptr<MgCurveRing> ring = m_innerRings->GetItem(i);
- MgGeometryUtil::WriteCurveRing(stream, ring);
- }
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgCurvePolygon::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
-
- //Type
- INT32 type;
- stream->GetInt32(type);
- assert(type == MgGeometryType::CurvePolygon);
-
- //Coordinate dimension
- INT32 coordinateDimension;
- stream->GetInt32(coordinateDimension);
-
- //Num rings
- INT32 numRings;
- stream->GetInt32(numRings);
- assert(numRings >= 1);
-
- //Outer ring
- m_outerRing = MgGeometryUtil::ReadCurveRing(stream, coordinateDimension);
-
- //Inner rings
- if (numRings > 1)
- {
- m_innerRings = new MgCurveRingCollection();
- for (INT32 i=1; i<numRings; ++i)
- {
- Ptr<MgCurveRing> innerRing = MgGeometryUtil::ReadCurveRing(stream, coordinateDimension);
- m_innerRings->Add(innerRing);
- }
- }
- else
- m_innerRings = NULL;
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
///<summary>
/// Convert to AWKT representation
///</summary>
Modified: sandbox/adsk/vik/Common/Geometry/CurvePolygon.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurvePolygon.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurvePolygon.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -334,37 +334,8 @@
///
MgCurvePolygon();
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
/// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -402,9 +373,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurvePolygon;
-
private:
Ptr<MgCurveRing> m_outerRing;
Ptr<MgCurveRingCollection> m_innerRings;
Modified: sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -149,14 +149,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurvePolygonCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -305,15 +305,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -326,9 +317,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurvePolygonCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
Modified: sandbox/adsk/vik/Common/Geometry/CurveRing.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveRing.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveRing.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -124,14 +124,6 @@
return new MgEnvelope(m_envelope);
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurveRing::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
@@ -140,27 +132,6 @@
delete this;
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to TCP/IP stream
-//
-void MgCurveRing::Serialize(MgStream* stream)
-{
- //should not be called on geometry components
- //components are serialized by the containing geometries
- throw new MgNotImplementedException(L"MgCurveRing.Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
-}
-
-//////////////////////////////////////////////////////////////////
-// Deerialize data from TCP/IP stream
-//
-void MgCurveRing::Deserialize(MgStream* stream)
-{
- //should not be called on geometry components
- //components are deserialized by the containing geometries
- throw new MgNotImplementedException(L"MgCurveRing.Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
-}
-#endif
///////////////////////////////////////////////////////////////////////////
// Tests whether this geometry component is spatially equal to another geometry component.
//
Modified: sandbox/adsk/vik/Common/Geometry/CurveRing.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveRing.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveRing.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -177,35 +177,6 @@
///
MgCurveRing();
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Tests whether this geometry component is spatially equal to another geometry component.
@@ -253,9 +224,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurveRing;
-
private:
Ptr<MgCurveSegmentCollection> m_segments;
};
Modified: sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -149,14 +149,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurveRingCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/CurveRingCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveRingCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveRingCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -306,15 +306,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -327,9 +318,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurveRingCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
Modified: sandbox/adsk/vik/Common/Geometry/CurveSegment.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveSegment.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveSegment.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -80,18 +80,7 @@
virtual MgCoordinate* GetEndCoordinate() = 0; /// __get
INTERNAL_API:
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId()
- {
- return m_cls_id;
- }
-
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Tests whether this geometry component is spatially equal to another geometry component.
@@ -107,9 +96,6 @@
/// The coordinates of this geometric entity
///
virtual MgCoordinateIterator* GetCoordinates() = 0;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurveSegment;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -149,14 +149,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurveSegmentCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -306,15 +306,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -327,9 +318,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurveSegmentCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
Modified: sandbox/adsk/vik/Common/Geometry/CurveString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveString.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveString.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -137,14 +137,6 @@
}
//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurveString::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgCurveString::ComputeEnvelope()
@@ -164,76 +156,6 @@
delete this;
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgCurveString::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
-
- //Get the coordinate dimension
- Ptr<MgCurveSegment> segment = m_segments->GetItem(0);
- Ptr<MgCoordinate> coord1 = segment->GetStartCoordinate();
- INT32 coordinateDimension = coord1->GetDimension();
-
- //Type
- stream->WriteInt32(MgGeometryType::CurveString);
-
- //Coordinate Dimension
- stream->WriteInt32(coordinateDimension);
-
- //Start point
- coord1->Serialize(stream);
-
- //Num segments
- INT32 numElements = m_segments->GetCount();
- stream->WriteInt32(numElements);
-
- //Segments
- for(INT32 i = 0; i < numElements; i++)
- {
- Ptr<MgCurveSegment> segment = m_segments->GetItem(i);
- MgGeometryUtil::WriteCurveSegment(stream, segment);
- }
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgCurveString::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
-
- //Type
- INT32 type;
- ((MgStreamReader*)stream)->GetInt32(type);
- assert(type == MgGeometryType::CurveString);
-
- //Coordinate dimension
- INT32 coordinateDimension;
- ((MgStreamReader*)stream)->GetInt32(coordinateDimension);
-
- //Start point
- Ptr<MgCoordinate> startCoord = MgGeometryUtil::ReadCoordinate(stream, coordinateDimension);
-
- //Num segments
- INT32 numElements;
- ((MgStreamReader*)stream)->GetInt32(numElements);
- assert(numElements >= 1);
-
- //Segments
- m_segments = new MgCurveSegmentCollection();
-
- for(INT32 i = 0; i < numElements; i++)
- {
- Ptr<MgCurveSegment> segment = MgGeometryUtil::ReadCurveSegment(stream, startCoord, coordinateDimension);
- m_segments->Add(segment);
- startCoord = segment->GetEndCoordinate();
- }
-}
-#endif //WANT_ACE
-
STRING MgCurveString::ToAwkt(bool is2dOnly)
{
STRING tempAwkt, coordDim;
Modified: sandbox/adsk/vik/Common/Geometry/CurveString.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveString.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveString.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -359,37 +359,8 @@
///
MgCurveString();
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
/// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -431,9 +402,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurveString;
-
private:
Ptr<MgCurveSegmentCollection> m_segments;
};
Modified: sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -151,14 +151,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgCurveStringCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/CurveStringCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveStringCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/CurveStringCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -306,15 +306,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -327,9 +318,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_CurveStringCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
Modified: sandbox/adsk/vik/Common/Geometry/Envelope.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Envelope.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Envelope.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -299,14 +299,6 @@
return transform->Transform(this);
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgEnvelope::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
@@ -315,48 +307,6 @@
delete this;
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgEnvelope::Serialize(MgStream* stream)
-{
- // coordinate dimension
- stream->WriteInt32(m_lowerLeft->GetDimension());
-
- // coordinates
- m_lowerLeft->Serialize(stream);
- m_upperRight->Serialize(stream);
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgEnvelope::Deserialize(MgStream* stream)
-{
- // coordinate dimension
- INT32 dimension;
- stream->GetInt32(dimension);
-
- // coordinates
- m_lowerLeft = MgGeometryUtil::ReadCoordinate(stream, dimension);
- m_upperRight = MgGeometryUtil::ReadCoordinate(stream, dimension);
-}
-
-MgByteReader* MgEnvelope::ToXml()
-{
- // this XML follows the Envelope-1.0.0.xsd schema
- string str;
- str += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; // NOXLATE
- str += "<Envelope>"; // NOXLATE
- this->ToXml(str);
- str += "</Envelope>"; // NOXLATE
-
- STRING mimeType = MgMimeType::Xml;
- return MgUtil::GetByteReader(str, &mimeType);
-}
-#endif //WANT_ACE
-
void MgEnvelope::ToXml(string& str)
{
str += "<LowerLeftCoordinate>"; // NOXLATE
Modified: sandbox/adsk/vik/Common/Geometry/Envelope.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Envelope.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Envelope.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -419,39 +419,6 @@
///
MgEnvelope* Transform(MgTransform* transform);
-INTERNAL_API:
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-
- MgByteReader* ToXml();
-#endif //WANT_ACE
-
virtual void ToXml(string& str);
void Grow(double offset);
@@ -464,9 +431,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Envelope;
-
protected:
Ptr<MgCoordinate> m_lowerLeft;
Ptr<MgCoordinate> m_upperRight;
Modified: sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -34,14 +34,6 @@
throw new MgException(L"NotImplemented");
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgGeometricEntity::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/GeometricEntity.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometricEntity.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometricEntity.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -315,15 +315,6 @@
///
virtual STRING ToAwkt(bool is2dOnly) = 0;
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
/////////////////////////////////////////////////////////////////
/// \brief
/// Returns an iterator over the coordinates included in this
@@ -348,9 +339,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_GeometricEntity;
-
protected:
Ptr<MgEnvelope> m_envelope;
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -235,15 +235,6 @@
return buffer.CreateBuffer(this, distance, measure);
}
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgGeometry::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -737,15 +737,6 @@
virtual INT32 GetEntityType();
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
/////////////////////////////////////////////////////////////////
/// \brief
/// Returns an iterator over the coordinates included in this
@@ -763,9 +754,6 @@
/// Dispose this object.
///
virtual void Dispose();
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Geometry;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj 2012-03-31 18:20:08 UTC (rev 6564)
@@ -284,8 +284,6 @@
<ClCompile Include="..\CoordinateSystem\MentorUtil.cpp" />
<ClCompile Include="..\CoordinateSystem\namestruct.cpp" />
<ClCompile Include="..\CoordinateSystem\SmartCriticalClass.cpp" />
- <ClCompile Include="AgfReaderWriter.cpp" />
- <ClCompile Include="AgfStream.cpp" />
<ClCompile Include="AggregateGeometry.cpp" />
<ClCompile Include="ArcSegment.cpp" />
<ClCompile Include="Coordinate.cpp" />
@@ -505,8 +503,6 @@
<ClInclude Include="..\CoordinateSystem\MentorUtil.h" />
<ClInclude Include="..\CoordinateSystem\namestruct.h" />
<ClInclude Include="..\CoordinateSystem\SmartCriticalClass.h" />
- <ClInclude Include="AgfReaderWriter.h" />
- <ClInclude Include="AgfStream.h" />
<ClInclude Include="AggregateGeometry.h" />
<ClInclude Include="ArcSegment.h" />
<ClInclude Include="Coordinate.h" />
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters 2012-03-31 18:20:08 UTC (rev 6564)
@@ -291,8 +291,6 @@
<ClCompile Include="..\CoordinateSystem\SmartCriticalClass.cpp">
<Filter>CoordinateSystem_IMP</Filter>
</ClCompile>
- <ClCompile Include="AgfReaderWriter.cpp" />
- <ClCompile Include="AgfStream.cpp" />
<ClCompile Include="..\CoordinateSystem\CoordSysMgrsMajorRegion.cpp" />
<ClCompile Include="..\CoordinateSystem\CoordSysWktFailureCache.cpp" />
<ClCompile Include="Envelope.cpp" />
@@ -909,8 +907,6 @@
<ClInclude Include="..\CoordinateSystem\SmartCriticalClass.h">
<Filter>CoordinateSystem_IMP</Filter>
</ClInclude>
- <ClInclude Include="AgfReaderWriter.h" />
- <ClInclude Include="AgfStream.h" />
<ClInclude Include="..\CoordinateSystem\CoordSysMgrsMajorRegion.h" />
<ClInclude Include="..\CoordinateSystem\CoordSysWktFailureCache.h" />
<ClInclude Include="Envelope.h" />
Modified: sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -26,40 +26,6 @@
bool InitializeStaticData()
{
-#if WANT_ACE
- MgClassFactory* fact = MgClassFactory::GetInstance();
-
- // Put in the map any class that can be serialized
- // Geometry API objects
- fact->Register(Geometry_Point, MgPoint::CreateObject);
- fact->Register(Geometry_Envelope, MgEnvelope::CreateObject);
- fact->Register(Geometry_CurvePolygon, MgCurvePolygon::CreateObject);
- fact->Register(Geometry_CurveString, MgCurveString::CreateObject);
- fact->Register(Geometry_MultiCurvePolygon, MgMultiCurvePolygon::CreateObject);
- fact->Register(Geometry_MultiCurveString, MgMultiCurveString::CreateObject);
- fact->Register(Geometry_MultiGeometry, MgMultiGeometry::CreateObject);
- fact->Register(Geometry_MultiLineString, MgMultiLineString::CreateObject);
- fact->Register(Geometry_MultiPoint, MgMultiPoint::CreateObject);
- fact->Register(Geometry_MultiPolygon, MgMultiPolygon::CreateObject);
- fact->Register(Geometry_Polygon, MgPolygon::CreateObject);
- fact->Register(Geometry_WktReaderWriter, MgWktReaderWriter::CreateObject);
- fact->Register(Geometry_LineString, MgLineString::CreateObject);
- fact->Register(Geometry_CoordinateXY, MgCoordinateXY::CreateObject);
- fact->Register(Geometry_CoordinateXYZ, MgCoordinateXYZ::CreateObject);
- fact->Register(Geometry_CoordinateXYZM, MgCoordinateXYZM::CreateObject);
- fact->Register(Geometry_CoordinateXYM, MgCoordinateXYM::CreateObject);
-
- EXCEPTION_CLASS_CREATOR(MgCoordinateSystemComputationFailedException)
- EXCEPTION_CLASS_CREATOR(MgCoordinateSystemConversionFailedException)
- EXCEPTION_CLASS_CREATOR(MgCoordinateSystemInitializationFailedException)
- EXCEPTION_CLASS_CREATOR(MgCoordinateSystemLoadFailedException)
- EXCEPTION_CLASS_CREATOR(MgCoordinateSystemMeasureFailedException)
- EXCEPTION_CLASS_CREATOR(MgCoordinateSystemTransformFailedException)
- EXCEPTION_CLASS_CREATOR(MgGeometryException)
- EXCEPTION_CLASS_CREATOR(MgInvalidCoordinateSystemException)
- EXCEPTION_CLASS_CREATOR(MgInvalidCoordinateSystemTypeException)
- EXCEPTION_CLASS_CREATOR(MgInvalidCoordinateSystemUnitsException)
-#endif //WANT_ACE
return true;
}
Modified: sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -148,14 +148,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgGeometryCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/GeometryCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -310,15 +310,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -331,9 +322,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_GeometryCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
};
Modified: sandbox/adsk/vik/Common/Geometry/GeometryCommon.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryCommon.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryCommon.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -100,7 +100,6 @@
#include "MultiPoint.h"
#include "MultiPolygon.h"
-#include "AgfReaderWriter.h"
#include "WktReaderWriter.h"
#include "GeometryFactory.h"
Modified: sandbox/adsk/vik/Common/Geometry/GeometryComponent.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryComponent.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryComponent.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -65,18 +65,6 @@
virtual INT32 GetEntityType() { return MgGeometryEntityType::GeometryComponent; }
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId()
- {
- return m_cls_id;
- }
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Tests whether this geometry component is spatially equal to another geometry component.
@@ -92,9 +80,6 @@
/// The coordinates of this geometric entity
///
virtual MgCoordinateIterator* GetCoordinates() = 0;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_GeometryComponent;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -196,13 +196,6 @@
delete this;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgGeometryFactory::GetClassId()
-{
- return m_cls_id;
-}
//////////////////////////////////////////////////////////////////
// Creates an empty geometry from its type identifier
Modified: sandbox/adsk/vik/Common/Geometry/GeometryFactory.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryFactory.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryFactory.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -635,15 +635,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Creates an empty geometry from its type identifier
///
/// \return
@@ -681,9 +672,6 @@
static MgMultiCurvePolygon* CreateEmptyMultiCurvePolygon();
static MgMultiGeometry* CreateEmptyMultiGeometry();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_GeometryFactory;
-
private:
static bool m_factoryInitialized;
};
Modified: sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -17,185 +17,7 @@
#include "stdafx.h"
-#if WANT_ACE
-
-//////////////////////////////////////////////////////////////////
-// Read a coordinate object from a stream
-//
-MgCoordinate* MgGeometryUtil::ReadCoordinate(MgStream* stream, INT32 dimension)
-{
- Ptr<MgCoordinate> coord;
- switch(dimension)
- {
- case MgCoordinateDimension::XY:
- coord = new MgCoordinateXY();
- break;
- case MgCoordinateDimension::XYZ:
- coord = new MgCoordinateXYZ();
- break;
- case MgCoordinateDimension::XY|MgCoordinateDimension::M:
- coord = new MgCoordinateXYM();
- break;
- case MgCoordinateDimension::XYZ|MgCoordinateDimension::M:
- coord = new MgCoordinateXYZM();
- break;
- }
- coord->Deserialize(stream);
- return SAFE_ADDREF((MgCoordinate*)coord);
-}
-
-//////////////////////////////////////////////////////////////////
-// Write an MgCurveSegment object to a stream
-//
-void MgGeometryUtil::WriteCurveSegment(MgStream* stream, MgCurveSegment* segment)
-{
- if(segment->GetComponentType() == MgGeometryComponentType::LinearSegment)
- {
- stream->WriteInt32(MgGeometryComponentType::LinearSegment); // 130 == linear curve string element in AGF format
- MgLinearSegment* linearSeg = (MgLinearSegment*)&*segment;
- Ptr<MgCoordinateIterator> coords = linearSeg->GetCoordinates();
- stream->WriteInt32(coords->GetCount() - 1);
- coords->MoveNext(); //we already wrote the start position as part of the containing object or part of the previous segment
- while(coords->MoveNext())
- {
- Ptr<MgCoordinate> coord = coords->GetCurrent();
- coord->Serialize(stream);
- }
- }
- else if (segment->GetComponentType() == MgGeometryComponentType::ArcSegment)
- {
- stream->WriteInt32(MgGeometryComponentType::ArcSegment); // 131 == circular arc curve string element in AGF format
- MgArcSegment* arcSegment = (MgArcSegment*)&*segment;
- Ptr<MgCoordinate> coord = arcSegment->GetControlCoordinate();
- coord->Serialize(stream);
- coord = arcSegment->GetEndCoordinate();
- coord->Serialize(stream);
- }
-}
-
-//////////////////////////////////////////////////////////////////
-// write an MgCurveRing object to a stream
-//
-void MgGeometryUtil::WriteCurveRing(MgStream* stream, MgCurveRing* ring)
-{
- //Start point
- Ptr<MgCurveSegment> segment = ring->GetSegment(0);
- Ptr<MgCoordinate> startCoord = segment->GetStartCoordinate();
- startCoord->Serialize(stream);
-
- //Num elements
- INT32 numSegments = ring->GetCount();
- stream->WriteInt32(numSegments);
-
- for(INT32 i = 0; i < numSegments; i++)
- {
- segment = ring->GetSegment(i);
- WriteCurveSegment(stream, segment);
- }
-}
-
//////////////////////////////////////////////
-// Write an MgLinearRing object to a stream
-//
-void MgGeometryUtil::WriteLinearRing(MgStream* stream, MgLinearRing* ring)
-{
- Ptr<MgCoordinateCollection> coords = ring->GetCoordinateCollection();
-
- //Num coordinates
- INT32 numPoints = coords->GetCount();
- stream->WriteInt32(numPoints);
-
- //Coorindtaes
- for(INT32 i = 0; i < numPoints; i++)
- {
- Ptr<MgCoordinate> coord = coords->GetItem(i);
- coord->Serialize(stream);
- }
-}
-
-//////////////////////////////////////////////////////////////////
-// Read an MgCurveSegment object from a stream
-//
-MgCurveSegment* MgGeometryUtil::ReadCurveSegment(MgStream* stream, MgCoordinate* startCoord, INT32 dimension)
-{
- Ptr<MgCurveSegment> curveSeg;
-
- INT32 type;
- ((MgStreamReader*)stream)->GetInt32(type);
-
- if(type == MgGeometryComponentType::LinearSegment) // 130 == linear curve string element in AGF format
- {
- INT32 numCoords;
- ((MgStreamReader*)stream)->GetInt32(numCoords);
-
- Ptr<MgCoordinateCollection> coords = new MgCoordinateCollection();
- coords->Add(startCoord);
- for(INT32 i = 0; i < numCoords; i++)
- {
- Ptr<MgCoordinate> coord = MgGeometryUtil::ReadCoordinate(stream, dimension);
- coords->Add(coord);
- }
- curveSeg = new MgLinearSegment(coords);
- }
- else if (type == MgGeometryComponentType::ArcSegment) // 131
- {
- Ptr<MgCoordinate> controlCoord = MgGeometryUtil::ReadCoordinate(stream, dimension);
- Ptr<MgCoordinate> endCoord = MgGeometryUtil::ReadCoordinate(stream, dimension);
-
- curveSeg = new MgArcSegment(startCoord, endCoord, controlCoord);
- }
-
- return SAFE_ADDREF((MgCurveSegment*)curveSeg);
-}
-
-//////////////////////////////////////////////////////////////////
-// Read an ReadCurveRing object from a stream
-//
-MgCurveRing* MgGeometryUtil::ReadCurveRing(MgStream* stream, INT32 dimension)
-{
- //Start point
- Ptr<MgCoordinate> startCoord = ReadCoordinate(stream, dimension);
-
- //Num elements
- INT32 numSegments;
- stream->GetInt32(numSegments);
-
- //segments
- Ptr<MgCurveSegmentCollection> segments = new MgCurveSegmentCollection();
- for(INT32 i = 0; i < numSegments; i++)
- {
- Ptr<MgCurveSegment> segment = ReadCurveSegment(stream, startCoord, dimension);
- segments->Add(segment);
-
- startCoord = segment->GetEndCoordinate();
- }
-
- return new MgCurveRing(segments);
-}
-
-//////////////////////////////////////////////
-// Read an MgCurveSegment object to a stream
-//
-MgLinearRing* MgGeometryUtil::ReadLinearRing(MgStream* stream, INT32 dimension)
-{
- Ptr<MgCoordinateCollection> coordinates = new MgCoordinateCollection;
-
- //NUm coordinates
- INT32 numPoints;
- stream->GetInt32(numPoints);
-
- //Coordinates
- for(INT32 i = 0; i < numPoints; i++)
- {
- Ptr<MgCoordinate> coord = ReadCoordinate(stream, dimension);
- coordinates->Add(coord);
- }
- return new MgLinearRing(coordinates);
-}
-
-#endif //WANT_ACE
-
-//////////////////////////////////////////////
// Compute the envelope enclosing a line string
//
MgEnvelope* MgGeometryUtil::ComputeLineStringEnvelope(MgCoordinateCollection* coordinates)
Modified: sandbox/adsk/vik/Common/Geometry/GeometryUtil.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryUtil.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/GeometryUtil.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -23,45 +23,7 @@
{
INTERNAL_API:
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize a coordinate object from a stream
- ///
- static MgCoordinate* ReadCoordinate(MgStream* stream, INT32 dimension);
-
- //////////////////////////////////////////////////////////////////
- /// Read an MgCurveSegment object from a stream
- ///
- static MgCurveSegment* ReadCurveSegment(MgStream* stream, MgCoordinate* startCoord, INT32 dimension);
-
- //////////////////////////////////////////////////////////////////
- /// Read an ReadCurveRing object from a stream
- ///
- static MgCurveRing* ReadCurveRing(MgStream* stream, INT32 dimension);
-
//////////////////////////////////////////////
- /// Read an MgCurveSegment object to a stream
- ///
- static MgLinearRing* ReadLinearRing(MgStream* stream, INT32 dimension);
-
- //////////////////////////////////////////////////////////////////
- /// Write an MgCurveSegment object to a stream
- ///
- static void WriteCurveSegment(MgStream* stream, MgCurveSegment* segment);
-
- //////////////////////////////////////////////////////////////////
- /// write an MgCurveRing object to a stream
- ///
- static void WriteCurveRing(MgStream* stream, MgCurveRing* ring);
-
- //////////////////////////////////////////////
- /// Write an MgLinearRing object to a stream
- ///
- static void WriteLinearRing(MgStream* stream, MgLinearRing* ring);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////
/// Compute the envelope enclosing a line string
///
static MgEnvelope* ComputeLineStringEnvelope(MgCoordinateCollection* coordinates);
Modified: sandbox/adsk/vik/Common/Geometry/LineString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LineString.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LineString.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -130,13 +130,6 @@
return new MgLineString(lineString);
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgLineString::GetClassId()
-{
- return m_cls_id;
-}
//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
@@ -158,66 +151,7 @@
delete this;
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgLineString::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
-
- //Type
- stream->WriteInt32(MgGeometryType::LineString);
-
- //Coordinate dimension
- Ptr<MgCoordinate> coord1 = m_coordinates->GetItem(0);
- stream->WriteInt32(coord1->GetDimension());
-
- //Num Points
- INT32 numPoints = m_coordinates->GetCount();
- stream->WriteInt32(numPoints);
-
- //Points
- for(INT32 i = 0; i < numPoints; i++)
- {
- Ptr<MgCoordinate> coord = m_coordinates->GetItem(i);
- coord->Serialize(stream);
- }
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from TCP/IP stream
-//
-void MgLineString::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
-
- //Type
- INT32 type;
- stream->GetInt32(type);
- assert(type == MgGeometryType::LineString);
-
- //Coordinate dimension
- INT32 coordinateDimension;
- stream->GetInt32(coordinateDimension);
-
- //Num points
- INT32 numPoints;
- stream->GetInt32(numPoints);
- assert(numPoints >= 2);
-
- //Points
- m_coordinates = new MgCoordinateCollection();
- for(INT32 i = 0; i < numPoints; i++)
- {
- Ptr<MgCoordinate> coord = MgGeometryUtil::ReadCoordinate(stream, coordinateDimension);
- m_coordinates->Add(coord);
- }
-}
-
-#endif //WANT_ACE
-
STRING MgLineString::ToAwkt(bool is2dOnly)
{
STRING tempAwkt, coordDim;
Modified: sandbox/adsk/vik/Common/Geometry/LineString.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LineString.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LineString.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -255,36 +255,9 @@
///
MgLineString();
-#if WANT_ACE
+
//////////////////////////////////////////////////////////////////
/// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -312,9 +285,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_LineString;
-
private:
Ptr<MgCoordinateCollection> m_coordinates;
};
Modified: sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -151,14 +151,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgLineStringCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/LineStringCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LineStringCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LineStringCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -306,15 +306,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -327,9 +318,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_LineStringCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
};
Modified: sandbox/adsk/vik/Common/Geometry/LinearRing.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearRing.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LinearRing.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -124,14 +124,6 @@
return new MgEnvelope(m_envelope);
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgLinearRing::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/LinearRing.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearRing.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LinearRing.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -170,15 +170,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Serialize data to TCP/IP stream
///
/// \param stream
@@ -240,9 +231,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_LinearRing;
-
private:
Ptr<MgCoordinateCollection> m_coordinates;
};
Modified: sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -149,14 +149,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgLinearRingCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/LinearRingCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearRingCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LinearRingCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -306,15 +306,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -327,9 +318,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_LinearRingCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
Modified: sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -137,35 +137,6 @@
}
//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgLinearSegment::GetClassId()
-{
- return m_cls_id;
-}
-
-#if WANT_ACE
-///////////////////////////////////////////////////////////////////
-// Serialize data to TCP/IP stream
-//
-void MgLinearSegment::Serialize(MgStream* stream)
-{
- //should not be called on geometry components
- //components are serialized by the containing geometries
- throw new MgNotImplementedException(L"MgLinearSegment.Serialize", __LINE__, __WFILE__, NULL, L"", NULL);
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from TCP/IP stream
-//
-void MgLinearSegment::Deserialize(MgStream* stream)
-{
- //should not be called on geometry components
- //components are deserialized by the containing geometries
- throw new MgNotImplementedException(L"MgLinearSegment.Deserialize", __LINE__, __WFILE__, NULL, L"", NULL);
-}
-#endif
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgLinearSegment::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/LinearSegment.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearSegment.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/LinearSegment.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -197,34 +197,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -259,9 +231,6 @@
///
virtual bool Equals(MgGeometryComponent* other);
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_LinearSegment;
-
private:
Ptr<MgCoordinateCollection> m_coordinates;
};
Modified: sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -114,56 +114,8 @@
return new MgMultiCurvePolygon(polygons);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgMultiCurvePolygon::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
- stream->WriteInt32(MgGeometryType::MultiCurvePolygon);
- INT32 numPolygons = m_polygons->GetCount();
- stream->WriteInt32(numPolygons);
- for(INT32 i = 0; i < numPolygons; i++)
- {
- Ptr<MgCurvePolygon> polygon = m_polygons->GetItem(i);
- polygon->Serialize(stream);
- }
-}
-
//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgMultiCurvePolygon::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
- INT32 type;
- ((MgStreamReader*)stream)->GetInt32(type);
- assert(type == MgGeometryType::MultiCurvePolygon);
-
- INT32 numPolygons;
- ((MgStreamReader*)stream)->GetInt32(numPolygons);
-
- m_polygons = new MgCurvePolygonCollection();
- for(INT32 i = 0; i < numPolygons; i++)
- {
- Ptr<MgCurvePolygon> polygon = new MgCurvePolygon;
- polygon->Deserialize(stream);
- m_polygons->Add(polygon);
- }
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgMultiCurvePolygon::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgMultiCurvePolygon::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -250,35 +250,7 @@
///
MgMultiCurvePolygon();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the geometry at the specified position
@@ -324,9 +296,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_MultiCurvePolygon;
-
private:
Ptr<MgCurvePolygonCollection> m_polygons;
};
Modified: sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -114,58 +114,8 @@
return new MgMultiCurveString(curveStrings);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgMultiCurveString::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
- stream->WriteInt32(MgGeometryType::MultiCurveString);
- INT32 numCurveStrings = m_curveStrings->GetCount();
- stream->WriteInt32(numCurveStrings);
- for(INT32 i = 0; i < numCurveStrings; i++)
- {
- Ptr<MgCurveString> curveString = m_curveStrings->GetItem(i);
- curveString->Serialize(stream);
- }
-}
-
//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgMultiCurveString::Deserialize(MgStream* stream)
-{
- MgStreamReader* reader = (MgStreamReader*)stream;
-
- //Deserialize from AGF format
- INT32 type;
- reader->GetInt32(type);
- assert(type == MgGeometryType::MultiCurveString);
-
- INT32 numCurveStrings;
- reader->GetInt32(numCurveStrings);
-
- m_curveStrings = new MgCurveStringCollection();
- for(INT32 i = 0; i < numCurveStrings; i++)
- {
- Ptr<MgCurveString> curveString = new MgCurveString;
- curveString->Deserialize(stream);
- m_curveStrings->Add(curveString);
- }
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgMultiCurveString::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgMultiCurveString::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/MultiCurveString.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiCurveString.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiCurveString.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -254,35 +254,6 @@
///
MgMultiCurveString();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the geometry at the specified position
@@ -328,9 +299,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_MultiCurveString;
-
private:
Ptr<MgCurveStringCollection> m_curveStrings;
};
Modified: sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -115,96 +115,8 @@
return new MgMultiGeometry(geometries);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgMultiGeometry::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
- Ptr<MgStreamHelper> streamHelper = stream->GetStreamHelper();
- bool tcpipStream = (typeid(*streamHelper.p) == typeid(MgAceStreamHelper));
-
- //Type
- stream->WriteInt32(MgGeometryType::MultiGeometry);
-
- //Num geometries
- INT32 numGeometries = m_geometries->GetCount();
- stream->WriteInt32(numGeometries);
-
- //Geometries
- for(INT32 i = 0; i < numGeometries; i++)
- {
- Ptr<MgGeometry> geometry = m_geometries->GetItem(i);
- if (tcpipStream)
- {
- //The geometry type is duplicated here, only in case of a TCP/IP stream
- stream->WriteInt32(geometry->GetGeometryType());
- }
- geometry->Serialize(stream);
- }
-}
-
//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgMultiGeometry::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
-
- //Type
- INT32 type;
- stream->GetInt32(type);
- assert(type == MgGeometryType::MultiGeometry);
-
- //Num geometries
- INT32 numGeometries;
- stream->GetInt32(numGeometries);
-
- //Geometries
- Ptr<MgStreamHelper> streamHelper = stream->GetStreamHelper();
- bool tcpipStream = (typeid(*streamHelper.p) == typeid(MgAceStreamHelper));
-
- m_geometries = new MgGeometryCollection();
- for(INT32 i = 0; i < numGeometries; i++)
- {
- INT32 geomType;
- if(tcpipStream)
- stream->GetInt32(geomType);
- else
- {
- // HACK!
- // get the geometry type without removing it from the stream
- // NOTE: to get to the geometry type we have to also read the
- // packet header and argument type
- UINT32 buffer[3];
-// UINT32 packetHeader = buffer[0];
-// UINT32 argumentType = buffer[1];
-// UINT32 data = buffer[2];
- streamHelper->GetData(buffer, 3*sizeof(UINT32), true, true);
- assert(buffer[1] == (UINT32)MgPacketParser::matINT32);
- geomType = (INT32)buffer[2];
- }
-
- //create the adequate geometry based on its type id and deserialize
- Ptr<MgGeometry> geometry = MgGeometryFactory::CreateGeometry(geomType);
- geometry->Deserialize(stream);
- m_geometries->Add(geometry);
- }
-}
-#endif //WANT_ACE
-
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgMultiGeometry::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgMultiGeometry::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/MultiGeometry.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiGeometry.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiGeometry.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -253,35 +253,6 @@
///
MgMultiGeometry();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the geometry at the specified position
@@ -328,9 +299,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_MultiGeometry;
-
private:
Ptr<MgGeometryCollection> m_geometries;
};
Modified: sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -114,58 +114,8 @@
return new MgMultiLineString(lineStrings);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgMultiLineString::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
- stream->WriteInt32(MgGeometryType::MultiLineString);
- INT32 numLineStrings = m_lineStrings->GetCount();
- stream->WriteInt32(numLineStrings);
- for(INT32 i = 0; i < numLineStrings; i++)
- {
- Ptr<MgLineString> lineString = m_lineStrings->GetItem(i);
- lineString->Serialize(stream);
- }
-}
-
//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgMultiLineString::Deserialize(MgStream* stream)
-{
- MgStreamReader* reader = (MgStreamReader*)stream;
-
- //Deserialize from AGF format
- INT32 type;
- reader->GetInt32(type);
- assert(type == MgGeometryType::MultiLineString);
-
- INT32 numLineStrings;
- reader->GetInt32(numLineStrings);
-
- m_lineStrings = new MgLineStringCollection();
- for(INT32 i = 0; i < numLineStrings; i++)
- {
- Ptr<MgLineString> lineString = new MgLineString;
- lineString->Deserialize(stream);
- m_lineStrings->Add(lineString);
- }
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgMultiLineString::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgMultiLineString::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/MultiLineString.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiLineString.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiLineString.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -240,35 +240,6 @@
///
MgMultiLineString();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the geometry at the specified position
@@ -314,9 +285,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_MultiLineString;
-
private:
Ptr<MgLineStringCollection> m_lineStrings;
};
Modified: sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -114,56 +114,8 @@
return new MgMultiPoint(points);
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgMultiPoint::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
- stream->WriteInt32(MgGeometryType::MultiPoint);
- INT32 numPoints = m_points->GetCount();
- stream->WriteInt32(numPoints);
- for(INT32 i = 0; i < numPoints; i++)
- {
- Ptr<MgPoint> point = m_points->GetItem(i);
- point->Serialize(stream);
- }
-}
-
//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgMultiPoint::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
- INT32 type;
- ((MgStreamReader*)stream)->GetInt32(type);
- assert(type == MgGeometryType::MultiPoint);
-
- INT32 numPoints;
- ((MgStreamReader*)stream)->GetInt32(numPoints);
-
- m_points = new MgPointCollection();
- for(INT32 i = 0; i < numPoints; i++)
- {
- Ptr<MgPoint> point = new MgPoint;
- point->Deserialize(stream);
- m_points->Add(point);
- }
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgMultiPoint::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgMultiPoint::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/MultiPoint.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiPoint.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiPoint.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -242,35 +242,7 @@
///
MgMultiPoint();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the geometry at the specified position
@@ -316,9 +288,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_MultiPoint;
-
private:
Ptr<MgPointCollection> m_points;
};
Modified: sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -114,56 +114,7 @@
return new MgMultiPolygon(polygons);
}
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgMultiPolygon::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
- stream->WriteInt32(MgGeometryType::MultiPolygon);
-
- INT32 numPolygons = m_polygons->GetCount();
- stream->WriteInt32(numPolygons);
- for(INT32 i = 0; i < numPolygons; i++)
- {
- Ptr<MgPolygon> polygon = m_polygons->GetItem(i);
- polygon->Serialize(stream);
- }
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgMultiPolygon::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
- INT32 type;
- ((MgStreamReader*)stream)->GetInt32(type);
- assert(type == MgGeometryType::MultiPolygon);
-
- INT32 numPolygons;
- ((MgStreamReader*)stream)->GetInt32(numPolygons);
-
- m_polygons = new MgPolygonCollection();
- for(INT32 i = 0; i < numPolygons; i++)
- {
- Ptr<MgPolygon> polygon = new MgPolygon;
- polygon->Deserialize(stream);
- m_polygons->Add(polygon);
- }
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgMultiPolygon::GetClassId()
-{
- return m_cls_id;
-}
-
-//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
//
MgEnvelope* MgMultiPolygon::ComputeEnvelope()
Modified: sandbox/adsk/vik/Common/Geometry/MultiPolygon.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiPolygon.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/MultiPolygon.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -280,35 +280,7 @@
///
MgMultiPolygon();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the geometry at the specified position
@@ -344,9 +316,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_MultiPolygon;
-
private:
Ptr<MgPolygonCollection> m_polygons;
};
Modified: sandbox/adsk/vik/Common/Geometry/Point.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Point.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Point.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -103,14 +103,6 @@
return new MgEnvelope(m_coord, m_coord);
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgPoint::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
@@ -119,45 +111,7 @@
delete this;
}
-#if WANT_ACE
-//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgPoint::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
- //Type
- stream->WriteInt32(MgGeometryType::Point);
-
- //Coordinate dimension
- stream->WriteInt32(m_coord->GetDimension());
-
- //Position
- m_coord->Serialize(stream);
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgPoint::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
-
- //Type
- INT32 type;
- stream->GetInt32(type);
- assert(type == MgGeometryType::Point);
-
- //Coordinate dimension
- INT32 coordinateDimension;
- stream->GetInt32(coordinateDimension);
-
- //Position
- m_coord = MgGeometryUtil::ReadCoordinate(stream, coordinateDimension);
-}
-#endif //WANT_ACE
-
STRING MgPoint::ToAwkt(bool is2dOnly)
{
STRING tempAwkt, coordDim;
Modified: sandbox/adsk/vik/Common/Geometry/Point.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Point.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Point.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -241,37 +241,9 @@
///
MgPoint();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
//////////////////////////////////////////////////////////////////
/// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -299,9 +271,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Point;
-
private:
Ptr<MgCoordinate> m_coord;
};
Modified: sandbox/adsk/vik/Common/Geometry/PointCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/PointCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/PointCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -151,14 +151,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgPointCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/PointCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/PointCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/PointCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -305,15 +305,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -326,9 +317,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_PointCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
Modified: sandbox/adsk/vik/Common/Geometry/Polygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Polygon.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Polygon.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -130,13 +130,6 @@
return new MgPolygon(newOuterRing, newInnerRings);
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgPolygon::GetClassId()
-{
- return m_cls_id;
-}
//////////////////////////////////////////////////////////////////
// Calculate the envelope for this geometry
@@ -157,80 +150,7 @@
delete this;
}
-#if WANT_ACE
//////////////////////////////////////////////////////////////////
-// Serialize data to a stream
-//
-void MgPolygon::Serialize(MgStream* stream)
-{
- //Serialize to AGF format
-
- //Get the coordinate dimension
- Ptr<MgCoordinateCollection> coordinates = m_outerRing->GetCoordinateCollection();
- Ptr<MgCoordinate> startCoord = coordinates->GetItem(0);
- INT32 coordinateDimension = startCoord->GetDimension();
-
- //Type
- stream->WriteInt32(MgGeometryType::Polygon);
-
- //Coordinate dimension
- stream->WriteInt32(coordinateDimension);
-
- //Num rings
- INT32 numInnerRings = GetInteriorRingCount();
- stream->WriteInt32(1 + numInnerRings); //add outer ring
-
- //Outer ring
- MgGeometryUtil::WriteLinearRing(stream, m_outerRing);
-
- //Inner rings
- for (INT32 i=0; i<numInnerRings; ++i)
- {
- Ptr<MgLinearRing> ring = m_innerRings->GetItem(i);
- MgGeometryUtil::WriteLinearRing(stream, ring);
- }
-}
-
-//////////////////////////////////////////////////////////////////
-// Deserialize data from a stream
-//
-void MgPolygon::Deserialize(MgStream* stream)
-{
- //Deserialize from AGF format
-
- //Type
- INT32 type;
- stream->GetInt32(type);
- assert(type == MgGeometryType::Polygon);
-
- //Coordinate dimension
- INT32 coordinateDimension;
- stream->GetInt32(coordinateDimension);
-
- //Num rings
- INT32 numRings;
- stream->GetInt32(numRings);
- assert(numRings >= 1);
-
- //Outer ring
- m_outerRing = MgGeometryUtil::ReadLinearRing(stream, coordinateDimension);
-
- //Inner rings
- if (numRings > 1)
- {
- m_innerRings = new MgLinearRingCollection();
- for (INT32 i=1; i<numRings; ++i)
- {
- Ptr<MgLinearRing> innerRing = MgGeometryUtil::ReadLinearRing(stream, coordinateDimension);
- m_innerRings->Add(innerRing);
- }
- }
- else
- m_innerRings = NULL;
-}
-#endif //WANT_ACE
-
-//////////////////////////////////////////////////////////////////
void MgPolygon::ToXml(std::string& str)
{
str += "<Polygon>";
Modified: sandbox/adsk/vik/Common/Geometry/Polygon.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Polygon.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Polygon.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -386,26 +386,7 @@
///
MgPolygon();
-#if WANT_ACE
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Serialize data to TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Serialize(MgStream* stream);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Deserialize data from TCP/IP stream
- ///
- /// \param stream
- /// Stream
- ///
- virtual void Deserialize(MgStream* stream);
-#endif //WANT_ACE
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Convert to XML representation of it-self
@@ -424,15 +405,6 @@
///
virtual STRING ToAwkt(bool is2dOnly);
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
protected:
//////////////////////////////////////////////////////////////////
@@ -450,9 +422,6 @@
///
virtual void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Polygon;
-
private:
Ptr<MgLinearRing> m_outerRing;
Ptr<MgLinearRingCollection> m_innerRings;
Modified: sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -151,14 +151,6 @@
return coll;
}
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgPolygonCollection::GetClassId()
-{
- return m_cls_id;
-}
-
//////////////////////////////////////////////
// Dispose this object.
//
Modified: sandbox/adsk/vik/Common/Geometry/PolygonCollection.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/PolygonCollection.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/PolygonCollection.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -306,16 +306,6 @@
//////////////////////////////////////////////////////////////////
/// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- ///
- virtual INT32 GetClassId();
-
- //////////////////////////////////////////////////////////////////
- /// \brief
/// Convert to AWKT representation
///
virtual void ToAwkt(REFSTRING awktStr, REFSTRING coordDim, bool is2dOnly);
@@ -328,9 +318,6 @@
///
void Dispose();
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_PolygonCollection;
-
private:
Ptr<MgDisposableCollection> m_collection;
Modified: sandbox/adsk/vik/Common/Geometry/Region.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Region.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Region.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -18,14 +18,6 @@
#include "stdafx.h"
#include "GeosUtil.h"
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgRegion::GetClassId()
-{
- return m_cls_id;
-}
-
#if WANT_GEOS
///////////////////////////////////////////////////////////////////////////
/// Gets a point guaranteed to be within the region.
Modified: sandbox/adsk/vik/Common/Geometry/Region.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Region.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Region.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -74,19 +74,6 @@
///
virtual MgCoordinateIterator* GetCoordinates() = 0; /// __get
-INTERNAL_API:
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Region;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/Ring.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Ring.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/Ring.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -69,26 +69,11 @@
INTERNAL_API:
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId()
- {
- return m_cls_id;
- }
-
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Tests whether this geometry component is spatially equal to another geometry component.
///
virtual bool Equals(MgGeometryComponent* other) = 0;
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_Ring;
};
/// \}
Modified: sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp 2012-03-31 18:20:08 UTC (rev 6564)
@@ -136,11 +136,3 @@
{
delete this;
}
-
-//////////////////////////////////////////////////////////////////
-// Get the unique identifier for the class
-//
-INT32 MgWktReaderWriter::GetClassId()
-{
- return m_cls_id;
-}
Modified: sandbox/adsk/vik/Common/Geometry/WktReaderWriter.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/WktReaderWriter.h 2012-03-31 17:31:39 UTC (rev 6563)
+++ sandbox/adsk/vik/Common/Geometry/WktReaderWriter.h 2012-03-31 18:20:08 UTC (rev 6564)
@@ -196,17 +196,6 @@
///
virtual STRING Write(MgGeometry* geometry, MgTransform* transform);
-INTERNAL_API:
-
- //////////////////////////////////////////////////////////////////
- /// \brief
- /// Get the unique identifier for the class
- ///
- /// \return
- /// Class Identifider.
- ///
- virtual INT32 GetClassId();
-
protected:
//////////////////////////////////////////////
@@ -214,9 +203,6 @@
/// Dispose this object.
///
virtual void Dispose();
-
-CLASS_ID:
- static const INT32 m_cls_id = Geometry_WktReaderWriter;
};
/// \}
Property changes on: sandbox/adsk/vik/Oem
___________________________________________________________________
Deleted: svn:ignore
- fusion
More information about the mapguide-commits
mailing list