[mapguide-commits] r6093 - in trunk/MgDev/Common: CoordinateSystem Geometry/CoordinateSystem Geometry/GeometryConsoleTest/inc Geometry/GeometryConsoleTest/src

[svn_mapguide at osgeo.org]

Author: NormOlsen
Date: 2011-08-24 10:55:08 -0700 (Wed, 24 Aug 2011)
New Revision: 6093

Modified:
   trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
   trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h
   trunk/MgDev/Common/Geometry/GeometryConsoleTest/inc/GctTestSupport.h
   trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestA.cpp
   trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestSupport.cpp
Log:
RFC 116 Update - Remove extra interface

There were several revisions made to the original RFC 116 prior to its submission for approval.  Due to these revisions, a previously proposed, but then retracted, interface (IsReentrant) was removed.  This interface, which is not specified in the approved RFC, was erroneously included in the RFC 116 submission.  This submission removes this function from the interface to the MgCoordinateSystemTransform object.  

Note that the GctTestA.cpp and GctTestSupport.cpp modules are a part of the GeometryConsoleTest application which is only used internally to test changes to the MgGeometry.dll independently of any of the several vertical applications which use it.


Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2011-08-23 17:10:08 UTC (rev 6092)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp	2011-08-24 17:55:08 UTC (rev 6093)
@@ -2113,20 +2113,7 @@
     m_nDatumCount  = 0;
     m_nTargetCount = 0;
 }
-bool CCoordinateSystemTransform::IsReentrant()
-{
-    bool isReentrant (false);
 
-    //MG_TRY()
-    ////Make sure we're initialized
-    //if (!IsInitialized())
-    //{
-    //    throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.IsValidPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
-    //}
-    //MG_CATCH_AND_THROW(L"MgCoordinateSystemTransform.IsReentrant")
-    return m_bIsReentrant;
-}
-
 // Essentially the inverse of the Transform (double& xx,double& yy) function.
 // This is a private function used to greatly enhance the performance of the
 // PositionOfValue function defined above.

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h	2011-08-23 17:10:08 UTC (rev 6092)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.h	2011-08-24 17:55:08 UTC (rev 6093)
@@ -62,7 +62,6 @@
 
     virtual INT32 GetLastTransformStatus();
     virtual void ResetLastTransformStatus();
-    virtual bool IsReentrant();
 
 INTERNAL_API:
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h	2011-08-23 17:10:08 UTC (rev 6092)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h	2011-08-24 17:55:08 UTC (rev 6093)
@@ -489,7 +489,6 @@
 
     virtual INT32 GetLastTransformStatus()=0;
     virtual void ResetLastTransformStatus()=0;
-    virtual bool IsReentrant()=0;
 
 INTERNAL_API:
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/MgDev/Common/Geometry/GeometryConsoleTest/inc/GctTestSupport.h
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryConsoleTest/inc/GctTestSupport.h	2011-08-23 17:10:08 UTC (rev 6092)
+++ trunk/MgDev/Common/Geometry/GeometryConsoleTest/inc/GctTestSupport.h	2011-08-24 17:55:08 UTC (rev 6093)
@@ -35,7 +35,6 @@
     virtual ~MgCrsThreadTestDataEntry (void);
 
     void Initialize (void);
-    bool IsReentrant (void);
     STRING GetTransformName (void);
 
     MgCoordinateSystemTransform* GetForwardTransform (void);
@@ -45,7 +44,6 @@
 
 private:
     bool m_bThreeD;
-    bool m_bIsReentrant;
     double m_dToleranceXY;
     double m_dToleranceZ;
     STRING m_pSrcCrsCode;

Modified: trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestA.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestA.cpp	2011-08-23 17:10:08 UTC (rev 6092)
+++ trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestA.cpp	2011-08-24 17:55:08 UTC (rev 6093)
@@ -136,19 +136,6 @@
         nextTestPtr = new MgCrsThreadTestDataEntry (L"TOKYO.UTM-51N",L"JGD2000.UTM-51N");
         threadTestVector.push_back (nextTestPtr);
 
-        MgCrsThreadTestDataItr threadTestItr;
-        for (threadTestItr = threadTestVector.begin();threadTestItr != threadTestVector.end();threadTestItr++)
-        {
-            MgCrsThreadTestDataEntry* testPtr = *threadTestItr;
-            if (!testPtr->IsReentrant () && !cmdLineParms.Silent ())
-            {
-                rptStrm << L"\tWARNING: Transform named "
-                        << testPtr->GetTransformName ()
-                        << L" is _NOT_ known to be reentrant."
-                        << std::endl;
-            }
-        }
-
         sThreadParams.m_pTestData = &threadTestVector;
         sThreadParams.m_cmdLineParms = &cmdLineParms;
 

Modified: trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestSupport.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestSupport.cpp	2011-08-23 17:10:08 UTC (rev 6092)
+++ trunk/MgDev/Common/Geometry/GeometryConsoleTest/src/GctTestSupport.cpp	2011-08-24 17:55:08 UTC (rev 6093)
@@ -304,9 +304,7 @@
     m_pTransformInv->IgnoreOutsideDomainWarning (true);
 
     m_sTransformName = m_pSrcCrsCode + L" to " + m_pTrgCrsCode;
-    m_bIsReentrant = (m_pTransformFwd->IsReentrant () &&
-                      m_pTransformInv->IsReentrant ());
-    
+   
     m_dToleranceXY = m_pSrcCRS->ConvertMetersToCoordinateSystemUnits (0.003);
     if (m_pSrcCRS->GetProjectionCode() == MgCoordinateSystemProjectionCode::LL)
     {
@@ -322,10 +320,6 @@
 
     m_pSrcPoints = CreateCoordinateCollection (m_RandomSeed,m_pSrcCRS,m_nPointCount,m_bThreeD);
 }
-bool MgCrsThreadTestDataEntry::IsReentrant (void)
-{
-    return m_bIsReentrant;
-}
 STRING MgCrsThreadTestDataEntry::GetTransformName (void)
 {
     return m_sTransformName;