[mapguide-commits] r5234 - in trunk/MgDev/Common: CoordinateSystem
Foundation/Data Foundation/System Geometry/CoordinateSystem
Geometry/GeometryConsoleTest Geometry/Spatial
MapGuideCommon/MapLayer MapGuideCommon/Services
MapGuideCommon/System MdfModel MdfParser PlatformBase/Data
PlatformBase/MapLayer PlatformBase/Services Renderers Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Oct 2 02:25:43 EDT 2010
Author: waltweltonlair
Date: 2010-10-02 06:25:43 +0000 (Sat, 02 Oct 2010)
New Revision: 5234
Modified:
trunk/MgDev/Common/CoordinateSystem/CoordSysCatalog.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysCategory.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.h
trunk/MgDev/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.h
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
trunk/MgDev/Common/CoordinateSystem/CoordSysMacro.h
trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h
trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp
trunk/MgDev/Common/CoordinateSystem/namestruct.cpp
trunk/MgDev/Common/CoordinateSystem/namestruct.h
trunk/MgDev/Common/Foundation/Data/StringProperty.cpp
trunk/MgDev/Common/Foundation/System/OperationResponsePacket.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h
trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h
trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp
trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp
trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h
trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h
trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionPool.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionStack.cpp
trunk/MgDev/Common/MapGuideCommon/System/ConfigProperties.h
trunk/MgDev/Common/MdfModel/TileWatermarkPosition.cpp
trunk/MgDev/Common/MdfModel/TileWatermarkPosition.h
trunk/MgDev/Common/MdfModel/WatermarkAppearance.cpp
trunk/MgDev/Common/MdfModel/WatermarkDefinition.h
trunk/MgDev/Common/MdfModel/WatermarkInstance.cpp
trunk/MgDev/Common/MdfModel/WatermarkOffsetUnit.h
trunk/MgDev/Common/MdfModel/XYWatermarkPosition.cpp
trunk/MgDev/Common/MdfModel/XYWatermarkPosition.h
trunk/MgDev/Common/MdfParser/IOWatermarkInstance.cpp
trunk/MgDev/Common/MdfParser/IOWatermarkOffsetUnit.cpp
trunk/MgDev/Common/PlatformBase/Data/ByteProperty.cpp
trunk/MgDev/Common/PlatformBase/Data/DoubleProperty.cpp
trunk/MgDev/Common/PlatformBase/Data/Int64Property.cpp
trunk/MgDev/Common/PlatformBase/MapLayer/Watermark.h
trunk/MgDev/Common/PlatformBase/Services/FeatureService.h
trunk/MgDev/Common/PlatformBase/Services/GeometryProperty.cpp
trunk/MgDev/Common/Renderers/RenderUtil.cpp
trunk/MgDev/Common/Stylization/LineBuffer.h
trunk/MgDev/Common/Stylization/Renderer.h
trunk/MgDev/Common/Stylization/StylizationEngine.cpp
Log:
Just run my regular tab/cleanup script...
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysCatalog.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysCatalog.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysCatalog.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -76,7 +76,7 @@
m_pDtDict = new CCoordinateSystemDatumDictionary(this);
m_pElDict = new CCoordinateSystemEllipsoidDictionary(this);
m_pCtDict = new CCoordinateSystemCategoryDictionary(this);
- m_pGpDict = new CCoordinateSystemGeodeticPathDictionary(this);
+ m_pGpDict = new CCoordinateSystemGeodeticPathDictionary(this);
m_pGxDict = new CCoordinateSystemGeodeticTransformDefDictionary(this);
if (!m_pCsDict || !m_pDtDict || !m_pElDict || !m_pCtDict || !m_pGpDict || !m_pGxDict)
@@ -123,7 +123,7 @@
m_pDtDict = NULL;
m_pElDict = NULL;
m_pCtDict = NULL;
- m_pGpDict = NULL;
+ m_pGpDict = NULL;
m_pGxDict = NULL;
//NOTE: the following behavior happens only in DEBUG if we do not reset the countFlag
@@ -157,7 +157,7 @@
m_pDtDict = NULL;
m_pElDict = NULL;
m_pCtDict = NULL;
- m_pGpDict = NULL;
+ m_pGpDict = NULL;
m_pGxDict = NULL;
}
@@ -306,10 +306,10 @@
wchar_t* pNewDir=NULL;
if ((_tcslen(szFname) > 0) || (_tcslen(szExt) > 0))
{
- //ABA: don't understand: if a filename or an extension has been found,
+ //ABA: don't understand: if a filename or an extension has been found,
//we concatenate the filename to the directory + then the extension;
//Then, we call makepath() what will give us a full path information incl.
- //the file name;
+ //the file name;
//
//Nope, not properly terminated, need to fix it.
assert(_tcslen(szDir) + _tcslen(szFname) + _tcslen(szExt) < _MAX_DIR);
@@ -359,7 +359,7 @@
STRING sDt=m_pDtDict->GetFileName();
STRING sEl=m_pElDict->GetFileName();
STRING sCt=m_pCtDict->GetFileName();
- STRING sGp=m_pGpDict->GetFileName();
+ STRING sGp=m_pGpDict->GetFileName();
STRING sGx=m_pGxDict->GetFileName();
//Set the dictionary file names
@@ -368,7 +368,7 @@
m_pDtDict->SetFileName(sDt);
m_pElDict->SetFileName(sEl);
m_pCtDict->SetFileName(sCt);
- m_pGpDict->SetFileName(sGp);
+ m_pGpDict->SetFileName(sGp);
m_pGxDict->SetFileName(sGx);
MG_CATCH_AND_THROW(L"MgCoordinateSystemCatalog.SetDictionaryDir")
@@ -439,8 +439,8 @@
{
return false;
}
-
- sPath=m_pGpDict->GetPath();
+
+ sPath=m_pGpDict->GetPath();
if (!ValidateFile(
sPath.c_str(), //file name
true, //must exist
@@ -482,7 +482,7 @@
STRING sDt=m_pDtDict->GetDefaultFileName();
STRING sEl=m_pElDict->GetDefaultFileName();
STRING sCt=m_pCtDict->GetDefaultFileName();
- STRING sGp=m_pGpDict->GetDefaultFileName();
+ STRING sGp=m_pGpDict->GetDefaultFileName();
STRING sGx=m_pGxDict->GetDefaultFileName();
//sets the path to the dictionaries
@@ -495,7 +495,7 @@
m_pDtDict->SetFileName(sDt);
m_pElDict->SetFileName(sEl);
m_pCtDict->SetFileName(sCt);
- m_pGpDict->SetFileName(sGp);
+ m_pGpDict->SetFileName(sGp);
m_pGxDict->SetFileName(sGx);
m_libraryStatus=lsInitialized;
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysCategory.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysCategory.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysCategory.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -338,7 +338,7 @@
{
throw new MgOutOfMemoryException(L"MgCoordinateSystemCategory.SetName", __LINE__, __WFILE__, NULL, L"", NULL);
}
-
+
//assign the name to our internal [TNameStruct]
m_categoryName = pName;
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -33,7 +33,7 @@
DICTIONARY_BASE_TEMPLATE_METHOD::~CCoordinateSystemDictionaryBase()
{
this->catalog = NULL;
-
+
delete this->dictionaryItems;
this->dictionaryItems = NULL;
}
@@ -91,9 +91,9 @@
STRING DICTIONARY_BASE_TEMPLATE_METHOD::GetPath() /* the full path to the file we're currently using */
{
MG_TRY()
-
+
return (this->catalog->GetDictionaryDir() + this->fileName);
-
+
MG_CATCH_AND_THROW(L"CCoordinateSystemDictionaryBase.GetPath")
_ASSERT(false); //OOM - unable to create the exception object?
@@ -111,7 +111,7 @@
}
SmartCriticalClass critical(true);
-
+
STRING strPath = this->GetPath();
csFILE *pFile = MentorDictionary::Open(this->dictMagicNumber, definitionAccess->magicNumberCallback, strPath.c_str(), Read);
@@ -184,7 +184,7 @@
definitionAccess->deleteDefinition,
sName.c_str());
- MG_CATCH_AND_THROW(L"CCoordinateSystemDictionaryBase.Remove")
+ MG_CATCH_AND_THROW(L"CCoordinateSystemDictionaryBase.Remove")
}
//////////////////////////////////////////////////////////////////////////////////////////////////
@@ -234,7 +234,7 @@
//make sure, we've exclusive access here
SmartCriticalClass critical(true);
-
+
//Look in the dictionary
pDef = definitionAccess->readDefinition(pName);
if (NULL == pDef)
@@ -256,7 +256,7 @@
MG_CATCH(L"CCoordinateSystemDictionaryBase.Get")
/* cleanup - MG_CATCH() catches every exception; i.e. we'll go through here regardless of whether an exception occurred or not */
-
+
CS_free(pDef);
delete [] pName;
@@ -270,7 +270,7 @@
bool DICTIONARY_BASE_TEMPLATE_METHOD::Has(CREFSTRING sName)
{
MG_TRY()
-
+
try
{
Ptr<MgGuardDisposable> definition = this->Get(sName);
@@ -303,7 +303,7 @@
CCoordinateSystemEnum* DICTIONARY_BASE_TEMPLATE_METHOD::GetEnumImp()
{
Ptr<CCoordinateSystemEnum> pNew;
-
+
csFILE *dictionaryFile = NULL;
SmartCriticalClass critical(true);
@@ -317,7 +317,7 @@
//Not read yet - try to build the map from the entries found in the dictionary file
//
STRING strPath = this->GetPath();
-
+
//[Open] throws an exception, if the dictionary file couldn't be opened
dictionaryFile = MentorDictionary::Open(this->dictMagicNumber, definitionAccess->magicNumberCallback, strPath.c_str(), Read);
@@ -326,7 +326,7 @@
definitionAccess->readDefinitionName,
definitionAccess->readDefinitionDescription,
definitionAccess->readAllDefinitions);
-
+
if (NULL == allDictionaryEntries) //whatever happend here - the dictionay file seems to be invalid
throw new MgCoordinateSystemLoadFailedException(L"CCoordinateSystemDictionaryBase.GetEnumImp", __LINE__, __WFILE__, NULL, L"", NULL);
}
@@ -357,7 +357,7 @@
//without proper precautions being taken
_ASSERT(NULL != allDictionaryEntries);
_ASSERT(NULL == this->dictionaryItems || (void*)this->dictionaryItems == (void*)allDictionaryEntries);
-
+
this->dictionaryItems = allDictionaryEntries; //cache the map now
}
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysDictionaryBase.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -25,11 +25,11 @@
#define DECLARE_DICTIONARY_FILE_NAME(x) extern const wchar_t DefaultDictName##x[] //declares(!) the extern variable we need for the template class
#define DEFINE_DICTIONARY_FILE_NAME(x,y) const wchar_t DefaultDictName##x[] = MAP_CS_DEFAULT_FILE_NAME(y) //defines(!) the extern variable we need for the template class
-//typedef of the callback that's being invoked, when a dictionary file is being opened; the invoked method
+//typedef of the callback that's being invoked, when a dictionary file is being opened; the invoked method
//has to specify the open mode the target dictionary file has to be opened with; the [long] parameter is the magic header number
typedef CsDictionaryOpenMode (*MagicNumberCallback)(long);
-template<class T/* Mg API class */, class U /* CS map struct */>
+template<class T/* Mg API class */, class U /* CS map struct */>
struct DefinitionAccess //carries all method pointers needed by this dictionary base implementation so it can interact with the Mg API and the CS Map API
{
public:
@@ -49,7 +49,7 @@
readDefinition(ReadDefinition),
updateDefinition(UpdateDefinition),
deleteDefinition(DeleteDefinition),
-
+
validateDefinition(ValidateDefinition),
setupCsStructFromMgInstance(SetupCsStructFromMgInstance),
@@ -59,7 +59,7 @@
readDefinitionDescription(ReadDefinitionDescription),
readAllDefinitions(ReadAllDefinitions),
-
+
csMapTargetFileName(CsMapTargetFileName),
magicNumberCallback(MagicNumberCallback)
{
@@ -125,7 +125,7 @@
Ptr<MgCoordinateSystemCatalog> catalog;
STRING fileName;
CSystemNameDescriptionMap* dictionaryItems;
- INT32 dictMagicNumber;
+ INT32 dictMagicNumber;
};
} // End of namespace
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -199,7 +199,7 @@
//
//It's an old version. We need to do a special search
//in the file, and then, if found, update it to a current struct.
-
+
/*
UINT32 nStructSize, nNameSize;
GetEllipsoidSizeInfo(m_lMagic, nStructSize, nNameSize);
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -63,7 +63,7 @@
void CCoordinateSystemGeodeticAnalyticalTransformDefParams::CopyTo(void* target) const
{
ENSURE_NOT_NULL(target, L"CCoordinateSystemGeodeticAnalyticalTransformDefParams.CopyTo");
-
+
memcpy(target, this->geocentricTransformParams, sizeof(cs_GeodeticTransform_::csGeodeticXformParameters::csGeodeticXformParmsGeocentric));
}
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -21,7 +21,7 @@
namespace CSLibrary
{
typedef cs_GeodeticTransform_::csGeodeticXformParameters::csGeodeticXformParmsGeocentric csGeocentricXformParams;
-
+
class CCoordinateSystemGeodeticAnalyticalTransformDefParams :
public MgCoordinateSystemGeodeticAnalyticalTransformDefParams,
public CCoordinateSystemGeodeticTransformDefParams
@@ -40,13 +40,13 @@
//MgCoordinateSystemGeodeticAnalyticalTransformDefParams implementation
virtual double GetDeltaX();
virtual void SetDeltaX(double deltaX);
-
+
virtual double GetDeltaY();
virtual void SetDeltaY(double deltaY);
virtual double GetDeltaZ();
virtual void SetDeltaZ(double deltaZ);
-
+
virtual double GetRotateX();
virtual void SetRotateX(double rotateX);
@@ -55,8 +55,8 @@
virtual double GetRotateZ();
virtual void SetRotateZ(double rotateZ);
-
- virtual double GetScale();
+
+ virtual double GetScale();
virtual void SetScale(double scale);
virtual double GetTranslateX();
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -54,7 +54,7 @@
void CCoordinateSystemGeodeticInterpolationTransformDefParams::Reset()
{
this->ReleaseInstance();
-
+
this->gridFileParams = (csGridFileXformParams*) CS_malc(sizeof(csGridFileXformParams));
if (NULL == this->gridFileParams)
throw new MgOutOfMemoryException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.Reset", __LINE__, __WFILE__, NULL, L"", NULL);
@@ -84,7 +84,7 @@
bool emptyFileCollection = (0 == fileNamesCount);
csGeodeticXfromParmsFile_* allFiles = emptyFileCollection ? NULL : new csGeodeticXfromParmsFile_[fileNamesCount];
-
+
MG_TRY()
if (!emptyFileCollection)
@@ -128,7 +128,7 @@
INT32 fileCount = this->gridFileParams->fileReferenceCount;
if (0 == fileCount)
return gridFileNames.Detach();
-
+
for(INT32 i = 0; i < fileCount && i < csGRIDI1_FILEMAX; i++)
{
csGeodeticXfromParmsFile_& singleGridFile = this->gridFileParams->fileNames[i];
@@ -183,6 +183,6 @@
void CCoordinateSystemGeodeticInterpolationTransformDefParams::CopyTo(void* target) const
{
ENSURE_NOT_NULL(target, L"CCoordinateSystemGeodeticInterpolationTransformDefParams.CopyTo");
-
+
memcpy(target, this->gridFileParams, sizeof(csGridFileXformParams));
}
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -30,11 +30,11 @@
public:
CCoordinateSystemGeodeticInterpolationTransformDefParams(const csGridFileXformParams& params, bool isProtected);
~CCoordinateSystemGeodeticInterpolationTransformDefParams();
-
+
// >>> MgCoordinateSystemGeodeticInterpolationTransformDefParams
virtual void SetGridFiles(MgDisposableCollection* gridFiles);
virtual MgDisposableCollection* GetGridFiles();
-
+
virtual STRING GetFallback();
virtual void SetFallback(CREFSTRING);
@@ -49,7 +49,7 @@
private:
void CopyTo(void* target) const;
-
+
void Reset();
void ReleaseInstance();
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -55,7 +55,7 @@
void CCoordinateSystemGeodeticMultipleRegressionTransformDefParams::Reset()
{
this->ReleaseInstance();
-
+
this->mulRegParams = (csMultipleRegressionXformParams*) CS_malc(sizeof(csMultipleRegressionXformParams));
if (NULL == this->mulRegParams)
throw new MgOutOfMemoryException(L"CCoordinateSystemGeodeticMultipleRegressionTransformDefParams.Reset", __LINE__, __WFILE__, NULL, L"", NULL);
@@ -75,7 +75,7 @@
void CCoordinateSystemGeodeticMultipleRegressionTransformDefParams::CopyTo(void* target) const
{
ENSURE_NOT_NULL(target, L"CCoordinateSystemGeodeticMultipleRegressionTransformDefParams.CopyTo");
-
+
memcpy(target, this->mulRegParams, sizeof(csMultipleRegressionXformParams));
}
@@ -127,7 +127,7 @@
DEFINE_GET_SET_NUMERIC(CCoordinateSystemGeodeticMultipleRegressionTransformDefParams,PhiOffset,double,this->mulRegParams->phiOffset)
DEFINE_GET_SET_NUMERIC(CCoordinateSystemGeodeticMultipleRegressionTransformDefParams,LambdaOffset,double,this->mulRegParams->lambdaOffset)
DEFINE_GET_SET_NUMERIC(CCoordinateSystemGeodeticMultipleRegressionTransformDefParams,NormalizationScale,double,this->mulRegParams->normalizationScale)
-
+
DEFINE_GET_SET_NUMERIC_IDX(CCoordinateSystemGeodeticMultipleRegressionTransformDefParams,CoefficientPhi,double,this->mulRegParams->coeffPhi,104)
DEFINE_GET_SET_NUMERIC_IDX(CCoordinateSystemGeodeticMultipleRegressionTransformDefParams,CoefficientLambda,double,this->mulRegParams->coeffLambda,104)
DEFINE_GET_SET_NUMERIC_IDX(CCoordinateSystemGeodeticMultipleRegressionTransformDefParams,CoefficientHeight,double,this->mulRegParams->coeffHeight,104)
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -54,7 +54,7 @@
virtual double GetTestLambda();
virtual void SetTestLambda(double testLambda);
-
+
virtual double GetDeltaPhi();
virtual void SetDeltaPhi(double deltaPhi);
@@ -63,19 +63,19 @@
virtual double GetDeltaHeight();
virtual void SetDeltaHeight(double deltaHeight);
-
+
virtual double GetPhiOffset();
virtual void SetPhiOffset(double phiOffset);
virtual double GetLambdaOffset();
virtual void SetLambdaOffset(double lambdaOffset);
-
+
virtual double GetNormalizationScale();
virtual void SetNormalizationScale(double NormalizationScale);
virtual double GetCoefficientPhi(INT32 index /* range [0..104]*/);
virtual void SetCoefficientPhi(INT32 index, double value);
-
+
virtual double GetCoefficientLambda(INT32 index /* range [0..104]*/);
virtual void SetCoefficientLambda(INT32 index, double value);
@@ -87,10 +87,10 @@
private:
void CopyTo(void* target) const;
-
+
void Reset();
void ReleaseInstance();
-
+
private:
csMultipleRegressionXformParams* mulRegParams;
INT32 transformationMethod;
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -62,7 +62,7 @@
{
this->CleanupInstanceVariables();
this->pathDefinition = (cs_GeodeticPath_*)CS_malc(sizeof(cs_GeodeticPath_));
-
+
if (NULL == this->pathDefinition)
throw new MgOutOfMemoryException(L"CCoordinateSystemGeodeticPath.Initialize", __LINE__, __WFILE__, NULL, L"", NULL);
@@ -72,7 +72,7 @@
void CCoordinateSystemGeodeticPath::Initialize(const cs_GeodeticPath_& pathDef)
{
this->Reset();
-
+
*this->pathDefinition = pathDef;
}
@@ -168,14 +168,14 @@
Ptr<CCoordinateSystemGeodeticPathElement> mgPathElement =
new CCoordinateSystemGeodeticPathElement(&pathElement, this->IsProtected());
-
+
//the elements will be released when the collection is released
pathElements->Add(mgPathElement);
}
return pathElements.Detach();
}
-
+
void CCoordinateSystemGeodeticPath::SetPathElements(MgDisposableCollection* pathElements)
{
VERIFY_INITIALIZED(L"CCoordinateSystemGeodeticPath.SetPathElements");
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPath.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -29,10 +29,10 @@
~CCoordinateSystemGeodeticPath();
virtual void Dispose();
-
+
void Initialize(const cs_GeodeticPath_& pathDef);
void Reset();
-
+
virtual MgCoordinateSystemGeodeticPath* CreateClone();
virtual MgCoordinateSystemGeodeticPathElement* NewPathElement();
@@ -40,22 +40,22 @@
virtual STRING GetPathName();
virtual void SetPathName(CREFSTRING);
- virtual STRING GetDescription();
+ virtual STRING GetDescription();
virtual void SetDescription(CREFSTRING);
- virtual STRING GetGroup();
+ virtual STRING GetGroup();
virtual void SetGroup(CREFSTRING);
- virtual STRING GetSource();
+ virtual STRING GetSource();
virtual void SetSource(CREFSTRING);
- virtual STRING GetTargetDatum();
+ virtual STRING GetTargetDatum();
virtual void SetTargetDatum(CREFSTRING);
- virtual STRING GetSourceDatum();
+ virtual STRING GetSourceDatum();
virtual void SetSourceDatum(CREFSTRING);
- virtual double GetAccuracy();
+ virtual double GetAccuracy();
virtual void SetAccuracy(double accuracy);
virtual bool GetIsReversible();
@@ -72,12 +72,12 @@
//helper - don't delete
virtual bool IsEncrypted();
-
+
virtual bool IsProtected();
virtual bool IsValid();
void CopyTo(cs_GeodeticPath_& pathDef) const;
-
+
private:
void CleanupInstanceVariables();
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -49,9 +49,9 @@
CCoordinateSystemGeodeticPathDictionary::ReadName,
CCoordinateSystemGeodeticPathDictionary::ReadDescription,
CCoordinateSystemGeodeticPathDictionary::ReadAllGeodeticPaths,
-
+
CS_gpfnm,
-
+
CCoordinateSystemGeodeticPathDictionary::GetFileOpenMode);
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@
bool CCoordinateSystemGeodeticPathDictionary::SetupCsGeodeticPathStruct(CCoordinateSystemGeodeticPath* mgGeodeticPath, cs_GeodeticPath_& csPath)
{
_ASSERT(NULL != mgGeodeticPath);
-
+
//copy the values from [mgGeodeticPath] to [csPath]; this will throw an exception in case [mgGeodeticPath] hasn't been initialized yet
mgGeodeticPath->CopyTo(csPath);
@@ -120,8 +120,8 @@
MgCoordinateSystemGeodeticPath* CCoordinateSystemGeodeticPathDictionary::NewGeodeticPath()
{
Ptr<CCoordinateSystemGeodeticPath> newPathItem = this->m_pDictionary->NewItem();
- newPathItem->Reset(); //sets up the [cs_geodeticpath_] struct; it can thus be used by
-
+ newPathItem->Reset(); //sets up the [cs_geodeticpath_] struct; it can thus be used by
+
return newPathItem.Detach();
}
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -51,7 +51,7 @@
virtual STRING GetDefaultFileName();
virtual STRING GetFileName();
virtual void SetFileName(CREFSTRING sFileName);
-
+
//modify the dictionary
virtual void Add(MgGuardDisposable *pDefinition);
virtual void Remove(CREFSTRING sName);
@@ -70,7 +70,7 @@
static const char* ReadName(const cs_GeodeticPath_& definition);
static const char* ReadDescription(const cs_GeodeticPath_& definition);
-
+
static int UpdateGeodeticPath(cs_GeodeticPath_* csPath, int /*unused*/);
static int ReadAllGeodeticPaths(csFILE *file, cs_GeodeticPath_ *gp_def, int* /*unused*/);
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -62,7 +62,7 @@
cs_GeodeticPathElement_* tempPathElement = (cs_GeodeticPathElement_*) CS_malc(sizeof(cs_GeodeticPathElement_));
if (NULL == tempPathElement)
throw new MgOutOfMemoryException(L"CCoordinateSystemGeodeticPathElement.Reset", __LINE__, __WFILE__, NULL, L"", NULL);
-
+
MG_TRY()
this->CleanupInstanceVariables();
@@ -89,7 +89,7 @@
size_t transformNameLength = strlen(this->pathElement->geodeticXformName);
_ASSERT(transformNameLength < sizeof(this->pathElement->geodeticXformName)); //how comes?
-
+
//TODO: put transformNameLength 64 in cs_map.h
if (0 == transformNameLength || transformNameLength >= sizeof(this->pathElement->geodeticXformName))
return false;
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -41,7 +41,7 @@
{
//have we been passed a non-null argument?
if (NULL == this->catalog)
- throw new MgNullArgumentException(L"CCoordinateSystemGeodeticTransformDef.ctor", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"CCoordinateSystemGeodeticTransformDef.ctor", __LINE__, __WFILE__, NULL, L"", NULL);
}
CCoordinateSystemGeodeticTransformDef::~CCoordinateSystemGeodeticTransformDef()
@@ -79,7 +79,7 @@
default:
throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticTransformDef.Reset", __LINE__, __WFILE__, NULL, L"", NULL);
}
-
+
//try creating a new [cs_GeodeticTransform_] instance before we wipe out our own stuff
cs_GeodeticTransform_* newEmptyDef = (cs_GeodeticTransform_*)CS_malc(sizeof(cs_GeodeticTransform_));
if (NULL == newEmptyDef) //uses CS_malc which returns NULL in case allocation fails
@@ -93,7 +93,7 @@
//ok - everything worked out so far; release this instance's information
this->ReleaseInstance();
_ASSERT(NULL == this->transformDefinition);
-
+
this->transformDefinition = newEmptyDef;
newEmptyDef = NULL; //make sure, we don't free that one after we get a hold on the (no longer temp) memory
@@ -112,7 +112,7 @@
INT32 transformationType;
switch(methodCode)
{
- //standalone methods; see information in cs_geodetic.h
+ //standalone methods; see information in cs_geodetic.h
case cs_DTCMTH_NULLX:
case cs_DTCMTH_WGS72:
transformationType = MgCoordinateSystemGeodeticTransformDefType::None;
@@ -145,7 +145,7 @@
case cs_DTCMTH_GFILE:
transformationType = MgCoordinateSystemGeodeticTransformDefType::Interpolation;
break;
-
+
//the next entries are not expected; we're mapping them to the interpolation transformation type
case cs_DTCMTH_CNTv1:
case cs_DTCMTH_CNTv2:
@@ -181,7 +181,7 @@
if (MgCoordinateSystemGeodeticTransformDefType::None == this->GetTransformDefType() || !this->IsValid())
throw new MgInvalidOperationException(L"CCoordinateSystemGeodeticTransformDef.CreateTransformation", __LINE__,__WFILE__, NULL, L"", NULL);
-
+
//we don't take ownership of the transformation being returned but
//will release [sourceDatum] and [targetDatum];
//new [CCoordinateSystemGeodeticTransformation] will have to ADDREF if needed
@@ -202,7 +202,7 @@
void CCoordinateSystemGeodeticTransformDef::CopyTo(cs_GeodeticTransform_& transformDef) const
{
VERIFY_INITIALIZED(L"CCoordinateSystemGeodeticTransformDef.CopyTo");
-
+
//copy our values into the [cs_GeodeticTransform_] we've been passed here
transformDef = *this->transformDefinition;
}
@@ -224,15 +224,15 @@
case MgCoordinateSystemGeodeticTransformDefType::Analytical:
return static_cast<MgCoordinateSystemGeodeticAnalyticalTransformDefParams*>(new CCoordinateSystemGeodeticAnalyticalTransformDefParams(
this->transformDefinition->parameters.geocentricParameters, this->transformDefinition->methodCode, this->IsProtected()));
-
+
case MgCoordinateSystemGeodeticTransformDefType::Interpolation:
return static_cast<MgCoordinateSystemGeodeticInterpolationTransformDefParams*>(
new CCoordinateSystemGeodeticInterpolationTransformDefParams(this->transformDefinition->parameters.fileParameters, this->IsProtected()));
-
+
case MgCoordinateSystemGeodeticTransformDefType::MultipleRegression:
return static_cast<MgCoordinateSystemGeodeticMultipleRegressionTransformDefParams*>(new CCoordinateSystemGeodeticMultipleRegressionTransformDefParams(
this->transformDefinition->parameters.dmaMulRegParameters, this->transformDefinition->methodCode, this->IsProtected()));
-
+
default: //invalid state; why's that?
_ASSERT(false);
throw new MgInvalidOperationException(L"CCoordinateSystemGeodeticTransformDef.GetParameters", __LINE__, __WFILE__, NULL, L"", NULL);
@@ -254,7 +254,7 @@
//otherwise: make sure, we've been passed non null paramaters...
ENSURE_NOT_NULL(parameters, L"CCoordinateSystemGeodeticTransformDef.SetParameters");
-
+
INT32 paramsMethodCode = 0x0;
//...and the parameters are actually of the correct type, i.e. match whatever we've stored in [this->transformationDefType]
@@ -280,7 +280,7 @@
//such a transformation can use multiple grid files where each can have a different format
paramsMethodCode = cs_DTCMTH_GFILE;
break;
-
+
case MgCoordinateSystemGeodeticTransformDefType::MultipleRegression:
mulRegParams = dynamic_cast<CCoordinateSystemGeodeticMultipleRegressionTransformDefParams*>(parameters);
if (NULL != mulRegParams)
@@ -326,7 +326,7 @@
//TODO: pass correct parameters; make sure, CS_gxchk checks all stuff
int nNumErrs = CS_gxchk(this->transformDefinition, 0, NULL, 0);
CriticalClass.Leave();
-
+
return (0 == nNumErrs);
*/
return true;
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDef.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -66,16 +66,16 @@
virtual INT32 GetMaxIterations();
virtual void SetMaxIterations(INT32 maxIterations);
-
+
virtual double GetConvergenceValue();
virtual void SetConvergenceValue(double convergenceValue);
-
+
virtual double GetErrorValue();
virtual void SetErrorValue(double errorValue);
-
+
virtual double GetAccuracy();
virtual void SetAccuracy(double accuracy);
-
+
virtual MgCoordinateSystemGeodeticTransformDefParams* GetParameters();
virtual void SetParameters(MgCoordinateSystemGeodeticTransformDefParams* parameters);
//end properties
@@ -86,7 +86,7 @@
//helper - don't delete
virtual bool IsEncrypted();
-
+
virtual bool IsProtected();
virtual bool IsValid();
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -49,9 +49,9 @@
CCoordinateSystemGeodeticTransformDefDictionary::ReadName,
CCoordinateSystemGeodeticTransformDefDictionary::ReadDescription,
CCoordinateSystemGeodeticTransformDefDictionary::ReadAllGeodeticTransformDefs,
-
+
CS_gxfnm,
-
+
CCoordinateSystemGeodeticTransformDefDictionary::GetFileOpenMode);
CCoordinateSystemGeodeticTransformDefDictionary::CCoordinateSystemGeodeticTransformDefDictionary(MgCoordinateSystemCatalog *pCatalog)
@@ -76,7 +76,7 @@
{
Ptr<CCoordinateSystemGeodeticTransformDef> newTransformDef = this->m_pDictionary->NewItem();
newTransformDef->Reset(transformationDefType); //sets up the [cs_geodeticTransfrom_] struct and initializes it to [transformationDefType]
-
+
return newTransformDef.Detach(); //this instance is not yet initialized
}
@@ -177,7 +177,7 @@
mgGeodeticTransformDef->CopyTo(csTransformDef);
return true;
}
-
+
void CCoordinateSystemGeodeticTransformDefDictionary::FullInitialize(CCoordinateSystemGeodeticTransformDef* mgGeodeticTransformDef,
cs_GeodeticTransform_* csTransformDef,
MgCoordinateSystemCatalog* catalog)
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -47,7 +47,7 @@
virtual STRING GetDefaultFileName();
virtual STRING GetFileName();
virtual void SetFileName(CREFSTRING sFileName);
-
+
//modify the dictionary
virtual void Add(MgGuardDisposable *pDefinition);
virtual void Remove(CREFSTRING sName);
@@ -62,10 +62,10 @@
CCoordinateSystemDictionaryBase<CCoordinateSystemGeodeticTransformDef, cs_GeodeticTransform_, &transformDefinitionAccess, true, cs_GXDEF_MAGIC, DICTIONARY_FILE_NAME(GeodeticTransformation)>* m_pDictionary;
public:
-
+
static int UpdateGeodeticTransformDef(cs_GeodeticTransform_* csTransformDef, int /*unused*/);
static bool SetupCsStructFromMgTransformDef(CCoordinateSystemGeodeticTransformDef* mgGeodeticTransformDef, cs_GeodeticTransform_& csTransformDef);
-
+
static void FullInitialize(CCoordinateSystemGeodeticTransformDef* mgGeodeticTransformDef, cs_GeodeticTransform_* csTransformDef, MgCoordinateSystemCatalog* catalog);
static const char* ReadName(const cs_GeodeticTransform_& definition);
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -20,7 +20,7 @@
namespace CSLibrary
-{
+{
class CCoordinateSystemGeodeticTransformDefParams : public MgCoordinateSystemGeodeticTransformDefParams
{
public:
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -40,7 +40,7 @@
if (NULL == this->gridFileDesc)
throw new MgOutOfMemoryException(L"CCoordinateSystemGeodeticAnalyticalTransformDefParams.ctor", __LINE__, __WFILE__, NULL, L"", NULL);
- ::memset(this->gridFileDesc, 0, sizeof(csGeodeticXfromParmsFile_));
+ ::memset(this->gridFileDesc, 0, sizeof(csGeodeticXfromParmsFile_));
if (NULL != fileFormatParam)
*this->gridFileDesc = *fileFormatParam;
//else: keep the 0'ed memory
@@ -60,7 +60,7 @@
{
if (NULL != this->gridFileDesc)
{
- CS_free(this->gridFileDesc);
+ CS_free(this->gridFileDesc);
this->gridFileDesc = NULL;
}
}
@@ -81,7 +81,7 @@
_ASSERT(NULL != this->gridFileDesc);
size_t fileNameLength = strlen(this->gridFileDesc->fileName);
-
+
_ASSERT(fileNameLength < csGRIDI1_FLNMSZ);
if (0 == fileNameLength || fileNameLength >= csGRIDI1_FLNMSZ)
return false;
@@ -97,7 +97,7 @@
case cs_DTCFRMT_OST97:
case cs_DTCFRMT_OST02:
break;
-
+
case cs_DTCFRMT_NONE:
_ASSERT(false);
break;
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -49,7 +49,7 @@
//this->Uninitialize(); //not needed - this does release the resourced held by this instance; we haven't set anything yet
this->SetCatalog(pCatalog);
-
+
//now - setup ourselves from the [MgCoordinateSystemGeodeticTransformDef] we've been passed
//we'll not pass a source and a target datum to CS Map so it constructs the cs_Dtcprm_ struct
//but we'll do that because we already have a transformation
@@ -361,10 +361,10 @@
void CCoordinateSystemGeodeticTransformation::SetupFromTransformationDef(MgCoordinateSystemGeodeticTransformDef* transformationDef, bool createInversed)
{
char* transformName = Convert_Wide_To_Ascii(transformationDef->GetTransformName().c_str());
-
+
MG_TRY()
-
-
+
+
//protect the call to the lib files; the calls to the [datumDictionary] below
//we also enter the critical section but on the same thread - i.e. no problem;
//putting the check here saves us from [enter, leave, enter leave]
@@ -375,7 +375,7 @@
if (NULL == datumTransform)
throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"", NULL);
-
+
Ptr<MgCoordinateSystemDatumDictionary> datumDictionary = this->m_pCatalog->GetDatumDictionary();
Ptr<MgCoordinateSystemDatum> srcDatum = datumDictionary->GetDatum(transformationDef->GetSourceDatum());
Ptr<MgCoordinateSystemDatum> trgDatum = datumDictionary->GetDatum(transformationDef->GetTargetDatum());
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysMacro.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysMacro.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysMacro.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -19,12 +19,12 @@
#define _MG_COORDSYSMACRO_H_
//make sure to have CS_MAP_DEF_VARIABLE defined before including this header; this is used by VERIFY_INITIALIZED(x)
-
+
#define MAKE_L_STRING(x) L## #x
#define MAKE_QUALIFIED_MEMBER_STRING(className,member) MAKE_L_STRING(className.member)
-#ifdef CS_MAP_DEF_VARIABLE
+#ifdef CS_MAP_DEF_VARIABLE
#define VERIFY_INITIALIZED(x) if (NULL == CS_MAP_DEF_VARIABLE) \
throw new MgInvalidOperationException(x, __LINE__, __WFILE__, NULL, L"", NULL)
#else
Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysTransform.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -467,7 +467,7 @@
// Extract the two defining corners of this envelope.
Ptr<MgCoordinate> lowerLeft = envelope->GetLowerLeftCoordinate();
Ptr<MgCoordinate> upperRight = envelope->GetUpperRightCoordinate();
-
+
// Determine if this is a 3D envelope. Don't know that this is possible,
// but the code I modified handles 3D envelopes, so I will too.
dimension = upperRight->GetDimension();
Modified: trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -148,10 +148,10 @@
//Look in the dictionary
bool bActuallyExists = false;
INT16 sProtect = 0;
-
+
//make sure, we've exclusive access to the file(s)
SmartCriticalClass critical(true);
-
+
T *pDef = CS_Tdef(keyName);
if (NULL != pDef)
{
Modified: trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/MentorUtil.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -1361,7 +1361,7 @@
// Skip datum transformation if we have a null transformation
// We have a null transform if the first transform type is dtcTypNone
-
+
// FIXME
if (NULL != pDtcprm->xforms[0])
//if (dtcTypNone != pDtcprm->xforms[0].xfrmType) <-- doesn't compile
@@ -1416,7 +1416,7 @@
char* szCs = NULL;
bool entered = false;
-
+
MG_TRY()
//Make local variables to hold converted strings
@@ -1440,18 +1440,18 @@
//Okay, everybody opened all right, so update Mentor's global
//variables appropriately.
szCs = Convert_Wide_To_Ascii(fileNameSet.c_str());
-
+
CriticalClass.Enter();
entered = true;
//the target function in CS map that sets the current active dictionary file name
FileNameTarget(szCs);
-
+
MG_CATCH(L"MentorUtil.SetDictionaryFileName")
-
+
if (entered)
CriticalClass.Leave();
-
+
delete[] szCs;
MG_THROW()
@@ -1626,11 +1626,11 @@
wchar_t* pString = NULL;
MG_TRY()
-
+
pString = Convert_Ascii_To_Wide(mentorString);
if (NULL == pString) //ABA: this cannot be null, can it?
throw new MgOutOfMemoryException(L"MentorUtil.ReadString", __LINE__, __WFILE__, NULL, L"", NULL);
-
+
MG_CATCH(L"MentorUtil.ReadString")
readString = pString;
@@ -1644,7 +1644,7 @@
void MentorSetString(CREFSTRING sSrc, char *pDest, UINT32 nMaxSize)
{
//make sure to have checked the Protection level before calling this method
-
+
char *pStr = NULL;
MG_TRY()
Modified: trunk/MgDev/Common/CoordinateSystem/namestruct.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/namestruct.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/namestruct.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -51,20 +51,20 @@
this->Release();
size_t stringLength = (NULL == kpName) ? 0 : strnlen(kpName, MAX_STRING_LENGTH);
-
+
//cannot be null; throws std::bad_alloc in case of failure; (what about replacing the new operator?)
//don't catch it here - if we're not even able to allocate about [MAX_STRING_LENGTH] something very serious is going on here
name = new char[stringLength + 1];
if (stringLength > 0) //copy the string into the buffer if we've been given a valid, non-empty string
strncpy(name, kpName, stringLength);
-
+
name[stringLength] = '\0'; // finally, set the terminating NULL char in any case; the buffer is at least 1 char long
}
//Assignment operator; assign based on other TNameStruct
//
-TNameStruct&
+TNameStruct&
TNameStruct::operator=(const TNameStruct& other)
{
this->Init(other.name);
Modified: trunk/MgDev/Common/CoordinateSystem/namestruct.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/namestruct.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/CoordinateSystem/namestruct.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -76,7 +76,7 @@
//assignment
TNameStruct& operator=(const TNameStruct&);
-
+
//assignment
TNameStruct& operator=(const char* newName);
Modified: trunk/MgDev/Common/Foundation/Data/StringProperty.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/Data/StringProperty.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Foundation/Data/StringProperty.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -130,8 +130,8 @@
if (!this->IsNull())
{
- str += "<Value>";
- str += MgUtil::WideCharToMultiByte(MgUtil::ReplaceEscapeCharInXml(this->GetValue()));
+ str += "<Value>";
+ str += MgUtil::WideCharToMultiByte(MgUtil::ReplaceEscapeCharInXml(this->GetValue()));
str += "</Value>";
}
Modified: trunk/MgDev/Common/Foundation/System/OperationResponsePacket.h
===================================================================
--- trunk/MgDev/Common/Foundation/System/OperationResponsePacket.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Foundation/System/OperationResponsePacket.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -25,7 +25,7 @@
struct MgOperationResponsePacket : public MgBasicPacket
{
MgOperationResponsePacket()
- :
+ :
m_PacketVersion(0),
m_ECode(0),
m_NumReturnValues(0)
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -35,13 +35,13 @@
//BEGIN: struct csGeodeticXformParmsGeocentric
virtual double GetDeltaX() = 0;
virtual void SetDeltaX(double deltaX) = 0;
-
+
virtual double GetDeltaY() = 0;
virtual void SetDeltaY(double deltaY) = 0;
virtual double GetDeltaZ() = 0;
virtual void SetDeltaZ(double deltaZ) = 0;
-
+
virtual double GetRotateX() = 0;
virtual void SetRotateX(double rotateX) = 0;
@@ -50,8 +50,8 @@
virtual double GetRotateZ() = 0;
virtual void SetRotateZ(double rotateZ) = 0;
-
- virtual double GetScale() = 0;
+
+ virtual double GetScale() = 0;
virtual void SetScale(double scale) = 0;
virtual double GetTranslateX() = 0;
@@ -62,12 +62,12 @@
virtual double GetTranslateZ() = 0;
virtual void SetTranslateZ(double translateZ) = 0;
-
+
//END: struct csGeodeticXformParmsGeocentric
virtual INT32 GetTransformationMethod() = 0;
virtual void SetTransformationMethod(INT32 analyticalMethodCode) = 0;
-
+
protected:
/////////////////////////////////////////////////////////////////
/// \brief
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -32,24 +32,24 @@
DECLARE_CLASSNAME(MgCoordinateSystemGeodeticInterpolationTransformDefParams)
PUBLISHED_API:
-
+
//BEGIN: struct csGeodeticXfromParmsFile
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Sets the grid files to be used by this transformation. See the description for
/// gridFiles parameter.
- ///
+ ///
/// \param gridFiles
/// A (possibly empty) ordered(!) collection of MgCoordinateSystemGeodeticTransformGridFile objects.
/// The order of the elements contained in the collection is important, because this
/// instructs the underlying API in which order to use the grid files, e.g. in case of an overlap.
- ///
+ ///
/// \remarks
/// The caller is responsible for disposing the collection of grid files. That is,
/// this parameter object will not take ownership of the collection passed in.
virtual void SetGridFiles(MgDisposableCollection* gridFiles) = 0;
-
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns an ordered, non-live collection MgCoordinateSystemGeodeticTransformGridFile elements
@@ -62,7 +62,7 @@
/// The caller is responsible for disposing the collection of grid files being returned
/// here.
virtual MgDisposableCollection* GetGridFiles() = 0;
-
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the name of the transformation to fallback to in case the transformation using the
@@ -71,7 +71,7 @@
/// \return
/// Returns the name of the fallback transformation. Can be empty if no such fallback transformation
/// is defined.
- ///
+ ///
virtual STRING GetFallback() = 0;
///////////////////////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@
/// \brief
/// Creates a new, empty MgCoordinateSystemGeodeticTransformGridFile object
/// that can be added to the collection set via SetGridFiles.
- ///
+ ///
/// \return
/// Returns a new, unitialized MgCoordinateSystemGeodeticTransformGridFile instance
/// The caller is resonsible for disposing the object if no longer needed.
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -50,7 +50,7 @@
virtual double GetTestLambda() = 0;
virtual void SetTestLambda(double testLambda) = 0;
-
+
virtual double GetDeltaPhi() = 0;
virtual void SetDeltaPhi(double deltaPhi) = 0;
@@ -59,19 +59,19 @@
virtual double GetDeltaHeight() = 0;
virtual void SetDeltaHeight(double deltaHeight) = 0;
-
+
virtual double GetPhiOffset() = 0;
virtual void SetPhiOffset(double phiOffset) = 0;
virtual double GetLambdaOffset() = 0;
virtual void SetLambdaOffset(double lambdaOffset) = 0;
-
+
virtual double GetNormalizationScale() = 0;
virtual void SetNormalizationScale(double NormalizationScale) = 0;
virtual double GetCoefficientPhi(INT32 index) = 0; // range [0..104]
virtual void SetCoefficientPhi(INT32 index, double value) = 0;
-
+
virtual double GetCoefficientLambda(INT32 index) = 0; // range [0..104]
virtual void SetCoefficientLambda(INT32 index, double value) = 0;
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -39,16 +39,16 @@
virtual STRING GetPathName()=0;
virtual void SetPathName(CREFSTRING)=0;
-
+
virtual STRING GetDescription()=0; /// __get
virtual void SetDescription(CREFSTRING)=0;
-
+
virtual STRING GetGroup()=0; /// __get
virtual void SetGroup(CREFSTRING)=0;
-
+
virtual STRING GetSource()=0; /// __get
virtual void SetSource(CREFSTRING)=0;
-
+
virtual STRING GetTargetDatum()=0; /// __get
virtual void SetTargetDatum(CREFSTRING)=0;
@@ -63,7 +63,7 @@
virtual INT32 GetEpsgCode()=0;
virtual void SetEpsgCode(INT32 epsgCode)=0;
-
+
virtual INT32 GetEpsgVariant()=0;
virtual void SetEpsgVariant(INT32 epsgVariant)=0;
@@ -71,7 +71,7 @@
/// \brief
/// Returns an ordered collection of MgCoordinateSystemGeodeticPathElement objects
/// that form this geodetic transformation path. See remarks.
- ///
+ ///
/// \return
/// Returns a (possibly empty) collection of MgCoordinateSystemGeodeticPathElement instances.
/// The caller is responsible for disposing the collection being returned.
@@ -81,17 +81,17 @@
/// path instance. Instead, the collection can be modified and then re-set via
/// SetPathElements.
virtual MgDisposableCollection* GetPathElements() = 0;
-
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Sets the individual transformation steps that form this geodetic transformation
/// path.
- ///
+ ///
/// \remarks
/// The caller is responsible for disposing the collection passed in, i.e.
/// this geodetic path instance will not take ownership of the elements.
virtual void SetPathElements(MgDisposableCollection* pathElements) = 0;
-
+
virtual bool IsProtected() = 0;
virtual bool IsValid() = 0;
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -38,7 +38,7 @@
/// Creates a new, empty geodetic path object that has to be filled by an API client. This
/// method does not create a new entry in the dictionary. The caller is responsible
/// for disposing the object being returned.
- ///
+ ///
/// \return
/// Return a new, in-memory geodetic path object. No content is written to disk
/// when this method executes.
@@ -49,10 +49,10 @@
/// \brief
/// Returns the geodetic path object where the name is equal to the parameter
/// pathName. The caller is responsible for disposing the object.
- ///
+ ///
/// \param pathName
/// The name of the geodetic path to look up in the dictionary. Must not be an empty string.
- ///
+ ///
/// \return
/// Return the geodetic path if found. Otherwise NULL.
///
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -65,32 +65,32 @@
virtual INT32 GetMaxIterations() = 0;
virtual void SetMaxIterations(INT32 maxIterations) = 0;
-
+
virtual double GetConvergenceValue() = 0;
virtual void SetConvergenceValue(double convergenceValue) = 0;
-
+
virtual double GetErrorValue() = 0;
virtual void SetErrorValue(double errorValue) = 0;
-
+
virtual double GetAccuracy() = 0;
virtual void SetAccuracy(double accuracy) = 0;
-
+
//END: struct cs_GeodeticTransform_
virtual bool IsProtected() = 0;
virtual bool IsValid() = 0;
-
+
////////////////////////////////////////////////////////////////
/// \brief
/// Returns the type of this geodetic transformation (as defined by MgCoordinateSystemGeodeticTransformDefType).
/// The type defines the parameters that are being returned by the GetParameters method.
virtual INT32 GetTransformDefType() = 0;
-
+
////////////////////////////////////////////////////////////////
/// \brief
/// Returns the extended parameters object valid for this transformation definition. See remarks.
/// Depending on the type returned by GetTransformDefType(), this method returns one of the following:
- ///
+ ///
/// \li NULL if this is a NULL transformation
/// \li MgCoordinateSystemGeodeticAnalyticalTransformDefParams if this transformation uses an anylitical transformation method
/// \li MgCoordinateSystemGeodeticInterpolationTransformDefParams if this transformation uses grid files
@@ -99,23 +99,23 @@
/// \return
/// Returns the extended parameters (or NULL) object for this transformation object. The
/// caller is responsible for disposing the object being returned. See remarks.
- ///
+ ///
/// \remarks
/// If a caller needs to change the parameters of a transformation, the values
/// have to be changed on the object being returned here and then written
- /// back via SetParameters. Setting the values on the parameters object
+ /// back via SetParameters. Setting the values on the parameters object
/// has no affect on this transformation definition.
virtual MgCoordinateSystemGeodeticTransformDefParams* GetParameters() = 0;
-
+
////////////////////////////////////////////////////////////////
/// \brief
/// Sets the extended parameters for this transformation.
- ///
+ ///
/// \param parameters
/// The parameters to set for this transformation. The object passed in,
/// has to be of the same type as it has been returned by GetParameters. Otherwise,
/// an exception will be thrown. This parameter can only be NULL, if this is a NONE transformation.
- ///
+ ///
/// \remarks
/// The instance passed in has to be disposed by the caller, i.e. this transformation
/// object will not take ownership of it.
@@ -137,7 +137,7 @@
/// have to change such values before trying to write the cloned instance into
/// the dictionary file.
virtual MgCoordinateSystemGeodeticTransformDef* CreateClone() = 0;
-
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Creates a new MgCoordinateSystemGeodeticTransformation object that
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -32,13 +32,13 @@
DECLARE_CLASSNAME(MgCoordinateSystemGeodeticTransformDefDictionary)
PUBLISHED_API:
-
+
///////////////////////////////////////////////////////////////////////////
/// \brief
/// Creates a new, empty geodetic transformation definition object that has to be filled by an API client. This
/// method does not create a new entry in the dictionary. The caller is responsible
/// for disposing the object being returned.
- ///
+ ///
/// \return
/// Return a new, in-memory geodetic transformation definition object. No content is written to disk
/// when this method executes.
@@ -49,10 +49,10 @@
/// \brief
/// Returns the geodetic transformation definition object where the name is equal to the parameter
/// pathName. The caller is responsible for disposing the object.
- ///
+ ///
/// \param transformationName
/// The name of the geodetic transformation to look up in the dictionary. Must not be an empty string.
- ///
+ ///
/// \return
/// Return the geodetic transformation if found. Otherwise NULL.
///
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -40,7 +40,7 @@
/// \return
/// Returns true, if this parameter object is considered valid. Otherwise false.
virtual bool IsValid() = 0;
-
+
////////////////////////////////////////////////////////////////
/// \brief
/// Checks, whether this transformation object is protected, i.e. any attempts to change its
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -25,7 +25,7 @@
///////////////////////////////////////////////////////////////
/// \brief
/// This class contains the constants for all current transformation definition types.
-///
+///
class MG_GEOMETRY_API MgCoordinateSystemGeodeticTransformDefType
{
@@ -36,21 +36,21 @@
/// The transformation definition describes the NONE transformation. That is, that
/// transformation doesn't actually perform a datum shift but is basically a NOOP.
static const INT32 None = 0;
-
+
///////////////////////////////////////////////////////////////
/// \brief
/// The transformation definition describes an analytical transformation where
/// the transformation between the source and the target datum is defined
/// through a formular that's fed with up to 10 parameters.
static const INT32 Analytical = 1;
-
+
///////////////////////////////////////////////////////////////
/// \brief
/// The transformation definition describes a transformation that
/// uses grid files to calculate the actual datum shift for a given
/// coordinate by interpolating between given grid points.
static const INT32 Interpolation = 2;
-
+
///////////////////////////////////////////////////////////////
/// \brief
/// The transformation definition describes a transformation that
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -42,7 +42,7 @@
/// \return
/// Returns the file format as an INT32 value.
virtual INT32 GetFileFormat() = 0;
-
+
////////////////////////////////////////////////////////////////
/// \brief
/// Sets this file's format. Has to be constant
@@ -54,13 +54,13 @@
/// When used within a geodetic transformation that defines a source and a target
/// datum, this flag instructs the API whether to consider the grid file's content
/// to be the inverse of the actual conversion direction.
- ///
+ ///
/// \return
/// Returns true, if the grid file provides information to transform between
/// 2 datums in the inversed direction to what's actually specified in
/// the parent transformation definition.
virtual bool GetIsInverseDirection() = 0;
-
+
////////////////////////////////////////////////////////////////
/// \brief
/// Sets the flag, whether this grid file carries the information
Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -25,9 +25,9 @@
////////////////////////////////////////////////////////////////
/// \brief
/// An instance of this class allow a caller do perform a geodetic transformation (datum shift).
-/// That is, this class does not operate on coordinate system level, but rather on
+/// That is, this class does not operate on coordinate system level, but rather on
/// datum level.
-///
+///
class MgCoordinateSystemGeodeticTransformation : public MgGuardDisposable
{
DECLARE_CLASSNAME(MgCoordinateSystemGeodeticTransformation)
Modified: trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/GeometryConsoleTest/GeometryConsoleTest.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -21,8 +21,8 @@
INT32 gridLineCount;
INT32 lineSegmentCount;
- clock_t startTime;
- clock_t endTime;
+ clock_t startTime;
+ clock_t endTime;
double xx;
double yy;
@@ -32,12 +32,12 @@
MgCoordinateSystemFactory factory;
MgCoordinateSystemCatalog* catalog;
- MgCoordinateSystemCategoryDictionary* categoryDict;
- MgCoordinateSystemEnum* categoryEnum;
- MgCoordinateSystemDictionary* coordsysDict;
- MgCoordinateSystemEnum* coordsysEnum;
- MgDisposableCollection* coordsysCollection;
- MgStringCollection* stringCollection;
+ MgCoordinateSystemCategoryDictionary* categoryDict;
+ MgCoordinateSystemEnum* categoryEnum;
+ MgCoordinateSystemDictionary* coordsysDict;
+ MgCoordinateSystemEnum* coordsysEnum;
+ MgDisposableCollection* coordsysCollection;
+ MgStringCollection* stringCollection;
MgCoordinate* pCoordinate;
MgCoordinateIterator* coordItr;
@@ -61,12 +61,12 @@
coordsysEnum = coordsysDict->GetEnum ();
do
{
- stringCollection = coordsysEnum->NextName (1);
- if (stringCollection->GetCount () > 0)
- {
- STRING code = stringCollection->GetItem (0);
- Ptr<MgCoordinateSystem> coordSysPtr = factory.CreateFromCode (code);
- }
+ stringCollection = coordsysEnum->NextName (1);
+ if (stringCollection->GetCount () > 0)
+ {
+ STRING code = stringCollection->GetItem (0);
+ Ptr<MgCoordinateSystem> coordSysPtr = factory.CreateFromCode (code);
+ }
} while (stringCollection->GetCount () > 0);
endTime = clock ();
printf ("Dictionary enumeration time = %ld milliseconds.\n",endTime - startTime);
Modified: trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/Spatial/MathUtility.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -260,7 +260,7 @@
bool MgMathUtility::DblCmp (double first,double second,double tolerance)
{
bool equal;
-
+
equal = (fabs (first - second) < tolerance);
return equal;
}
Modified: trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -575,7 +575,7 @@
// Until we know different.
status = 0;
-
+
// Compute the denominator which also tells us if the lines are collinear.
delX1 = seg1To->GetX () - seg1From->GetX ();
delY1 = seg1To->GetY () - seg1From->GetY ();
@@ -1073,7 +1073,7 @@
// It will tell us if we are on the polygon or not.
lastIntersection = dynamic_cast<MgCoordinateXYM*>(intersectionCollection->GetItem (count-1));
INT32 status = static_cast<INT32>(lastIntersection->GetM ());
-
+
// If the point is on the polygon, the status of the last intersection will
// have the IntersectIsSeg2End bit set.
if ((status & MgSpatialUtilityStatus::IntersectIsSeg2End) != 0)
@@ -1130,7 +1130,7 @@
static const INT32 StringPointOutside = 1;
static const INT32 StringPointOnBoundary = 2;
static const INT32 StringPointInside = 3;
-//
+//
// Values which are stored in the Z member of the internally used point
// collection; i.e. the status of each segment relative to the clip
// ploygon. The value stored refers to the segment which starts at
@@ -1150,7 +1150,7 @@
Ptr<MgCoordinateCollection> pointCollection;
Ptr<MgCoordinateIterator> pointIterator;
Ptr<MgLineStringCollection> lineCollection;
-
+
// Phase One: Expand the line string with all implied transition points,
// i.e. intersection with the polygon.
pointCollection = StringClipPhaseOne (lineItr,polyItr);
@@ -1270,7 +1270,7 @@
while (itrPolygon->MoveNext ())
{
// We need a place for SegementIntersection to place the
- // calculated intersection. We can't add the transition
+ // calculated intersection. We can't add the transition
// points directly to the xyzmCollection object as in the
// case of more than one transition point for a segment,
// there is no guarantee that this algorithm will find them
@@ -1294,11 +1294,11 @@
// Determine the end points of the polygon segment.
plyFromPoint = plyToPoint;
plyToPoint = itrPolygon->GetCurrent ();
-
+
// Determine the relationship of the current line string segment
// with the current polygon segment.
status = SegmentIntersection (intersection,plyFromPoint,plyToPoint,segFromPoint,segToPoint,magnitude);
-
+
// Disect the large amount of information embedded in the
// status return.
segmentStatus = status & MgSpatialUtilityStatus::SegmentStatusMask;
@@ -1355,7 +1355,7 @@
// We need to do something with collinear lines, sometimes. The rather
// verbose comments were necessary for the author to keep track of what
// can/might/could happen and what to do about each possible situation.
-
+
// The sixteen cases are:
// 0000 -> DO NOTHING!! There is no overlap, the segments are disjoint.
// 0001 -> DO NOTHING!! Not possible.
@@ -1367,7 +1367,7 @@
// 0111 -> Insert segment 1 end point, overlap ends at segment 1 end point.
// 1000 -> DO NOTHING!! Not possible.
// 1001 -> Insert segment 1 start point, overlap beginns in the middle of segment 2.
- // 1010 -> DO NOTHING!! Segment 2 is the overlap segment.
+ // 1010 -> DO NOTHING!! Segment 2 is the overlap segment.
// 1011 -> DO NOTHING!! Segment 2 is the overlap segment.
// 1100 -> DO NOTHING!! End to end continuous, but no overlap.
// 1101 -> Insert segment 1 start point, overlap begins in the middle of segment 2.
@@ -1424,7 +1424,7 @@
rStringPointNotDetermined,
rStringSegNotDetermined);
xyzmCollection->Add (xyzmPoint);
-
+
// The xyzmTemporary collection should go out of scope and be deleted
// here.
}
@@ -1443,19 +1443,19 @@
MgCoordinateIterator* itrPolygon)
{
INT32 pointStatus;
-
+
double rPointStatus;
Ptr<MgCoordinate> outPoint;
Ptr<MgCoordinate> xyzmPoint;
-
+
MgGeometryFactory mgFactory;
-
+
Ptr<MgCoordinateXY> xyPoint = new MgCoordinateXY ();
-
+
// Compute an outpoint.
- outPoint = MgSpatialUtility::PointOutsidePolygon (itrPolygon);
-
+ outPoint = MgSpatialUtility::PointOutsidePolygon (itrPolygon);
+
lineString->Reset ();
while (lineString->MoveNext ())
{
@@ -1512,7 +1512,7 @@
Ptr<MgCoordinate> nextPoint;
xyPoint = new MgCoordinateXY ();
-
+
lineString->Reset ();
lineString->MoveNext ();
nextPoint = lineString->GetCurrent ();
@@ -1520,7 +1520,7 @@
{
currentPoint = nextPoint;
nextPoint = lineString->GetCurrent ();
-
+
currentStatus = static_cast<INT32>(currentPoint->GetM());
nextStatus = static_cast<INT32>(nextPoint->GetM());
@@ -1575,7 +1575,7 @@
}
}
rSegStatus = static_cast<double>(segStatus) + 0.01;
- currentPoint->SetZ (rSegStatus);
+ currentPoint->SetZ (rSegStatus);
}
}
@@ -1603,7 +1603,7 @@
Ptr<MgCoordinate> nextPoint;
Ptr<MgCoordinateCollection> curCollection;
Ptr<MgLineStringCollection> lineCollection;
-
+
MgGeometryFactory mgFactory;
curCollection = new MgCoordinateCollection ();
Modified: trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h
===================================================================
--- trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Geometry/Spatial/SpatialUtility.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -355,7 +355,7 @@
static const INT32 StringPointIsOutside = 1;
static const INT32 StringPointIsOnBoundary = 2;
static const INT32 StringPointIsInside = 3;
-
+
// Values which are stored in the Z member of the internally used point
// collection; i.e. the status of each segment relative to the clip
// ploygon. The value stored refers to the segment which starts at
Modified: trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -398,8 +398,8 @@
}
// Now that we've added all the layers (dynamic and base map) to the m_layers collection,
- // bulk load the identity properties for all layers
- Ptr<MgSiteConnection> siteConn;
+ // bulk load the identity properties for all layers
+ Ptr<MgSiteConnection> siteConn;
if (m_siteConnection.p != NULL)
{
siteConn = SAFE_ADDREF((MgSiteConnection*)m_siteConnection);
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -1052,11 +1052,11 @@
/// retrieve schema information. If this collection is null or empty, information
/// is returned for all feature classes.
/// \param outputFormat (String/string)
- /// A string identifying the output format of
+ /// A string identifying the output format of
/// the retrieved schema information.
/// The supported values of output format are specified in OpenGIS Web Feature Service (WFS) Implementation Specification - section 8.2
/// http://portal.opengeospatial.org/files/?artifact_id=8339
- ///
+ ///
/// \return
/// Returns an MgByteReader containing the XML schema.
///
@@ -1134,7 +1134,7 @@
/// \param wfsVersion (String/string)
/// A string identifying the wfs version
/// \param outputFormat (String/string)
- /// A string identifying the output format of
+ /// A string identifying the output format of
/// the retrieved feature information.
/// The supported values of output format are specified in OpenGIS Web Feature Service (WFS) Implementation Specification - section 9.2
/// http://portal.opengeospatial.org/files/?artifact_id=8339
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionPool.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionPool.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionPool.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -19,7 +19,7 @@
#include "ServerConnectionPool.h"
#include "ServerConnectionStack.h"
#include "ServerConnectionEventHandler.h"
-
+
MgServerConnectionPool* MgServerConnectionPool::sm_pool = NULL;
/// <summary>
@@ -89,10 +89,10 @@
// To avoid overheads and maintain thread safety,
// do not assign this returned static singleton to a Ptr object.
- return MgServerConnectionPool::sm_pool;
+ return MgServerConnectionPool::sm_pool;
}
-void MgServerConnectionPool::CloseStaleConnections(ACE_Time_Value* timeValue)
+void MgServerConnectionPool::CloseStaleConnections(ACE_Time_Value* timeValue)
{
ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance ()));
MG_TRY()
@@ -118,5 +118,5 @@
delete MgServerConnectionPool::sm_pool;
MgServerConnectionPool::sm_pool = NULL;
- MG_CATCH_AND_RELEASE()
+ MG_CATCH_AND_RELEASE()
}
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionStack.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionStack.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionStack.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -43,7 +43,7 @@
MgConfigProperties::DefaultSiteConnectionPropertyPort);
// Note: The comment below only applies if using the ACE WFMO reactor on Windows.
- // The ACE config.h file has been updated to use the ACE SELECT reactor on
+ // The ACE config.h file has been updated to use the ACE SELECT reactor on
// Windows which is the default reactor used on Linux.
// ie: #define ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL
//
@@ -202,7 +202,7 @@
m_inUse->push_back(connection);
}
-void MgServerConnectionStack::CloseStaleConnections(ACE_Time_Value* timeValue)
+void MgServerConnectionStack::CloseStaleConnections(ACE_Time_Value* timeValue)
{
ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, m_mutex));
Modified: trunk/MgDev/Common/MapGuideCommon/System/ConfigProperties.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/System/ConfigProperties.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MapGuideCommon/System/ConfigProperties.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -868,8 +868,8 @@
/// Password for Wms requests
static const STRING WmsPassword; /// value("WmsPassword")
- /// Enable OGC CITE Test for WFS
- static const STRING CITEWfsEnabled; /// value("CITEWfsEnabled")
+ /// Enable OGC CITE Test for WFS
+ static const STRING CITEWfsEnabled; /// value("CITEWfsEnabled")
static const bool DefaultCITEWfsEnabled; /// value(false)
/// WEB APPLICATION PROPERTIES SECTION -------------------------------------------------------------------------------------------
Modified: trunk/MgDev/Common/MdfModel/TileWatermarkPosition.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/TileWatermarkPosition.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/TileWatermarkPosition.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -18,7 +18,7 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
// The TileWatermarkPosition class implementation.
-// TileWatermarkPosition class is one implementation of WatermarkPosition to
+// TileWatermarkPosition class is one implementation of WatermarkPosition to
// define the position of watermark.
//-------------------------------------------------------------------------
@@ -51,7 +51,7 @@
}
//-------------------------------------------------------------------------
-// Get the tile width
+// Get the tile width
//-------------------------------------------------------------------------
double TileWatermarkPosition::GetTileWidth() const
{
@@ -59,7 +59,7 @@
}
//-------------------------------------------------------------------------
-// Set the tile width
+// Set the tile width
//-------------------------------------------------------------------------
void TileWatermarkPosition::SetTileWidth(const double& dTileWidth)
{
@@ -67,7 +67,7 @@
}
//-------------------------------------------------------------------------
-// Get the tile height
+// Get the tile height
//-------------------------------------------------------------------------
double TileWatermarkPosition::GetTileHeight() const
{
@@ -75,7 +75,7 @@
}
//-------------------------------------------------------------------------
-// Set the tile height
+// Set the tile height
//-------------------------------------------------------------------------
void TileWatermarkPosition::SetTileHeight(const double& dTileHeight)
{
@@ -194,7 +194,7 @@
return false;
if (fabs(this->m_tileHeight - anotherPosition->m_tileHeight) > doubleTolerance)
return false;
-
+
// check horizontal position
if (!this->m_horizontalPosition)
{
Modified: trunk/MgDev/Common/MdfModel/TileWatermarkPosition.h
===================================================================
--- trunk/MgDev/Common/MdfModel/TileWatermarkPosition.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/TileWatermarkPosition.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -47,13 +47,13 @@
// Property: TileHeight
double GetTileHeight() const;
void SetTileHeight(const double& dTileHeight);
-
+
// Property: HorizontalPosition
const WatermarkXOffset* GetHorizontalPosition() const;
WatermarkXOffset* GetHorizontalPosition();
void AdoptHorizontalPosition(WatermarkXOffset* pHorizontalPosition);
WatermarkXOffset* OrphanHorizontalPosition();
-
+
// Property: VerticalPosition
const WatermarkYOffset* GetVerticalPosition() const;
WatermarkYOffset* GetVerticalPosition();
Modified: trunk/MgDev/Common/MdfModel/WatermarkAppearance.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/WatermarkAppearance.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/WatermarkAppearance.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -47,7 +47,7 @@
//-------------------------------------------------------------------------
// Returns the transparency (0 - 100). Zero means fully opaque, and 100
-// means fully transparent.
+// means fully transparent.
//-------------------------------------------------------------------------
double WatermarkAppearance::GetTransparency() const
{
Modified: trunk/MgDev/Common/MdfModel/WatermarkDefinition.h
===================================================================
--- trunk/MgDev/Common/MdfModel/WatermarkDefinition.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/WatermarkDefinition.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -39,19 +39,19 @@
virtual ~WatermarkDefinition();
// Operations
-
+
// Property: Content
const SymbolDefinition* GetContent() const;
SymbolDefinition* GetContent();
void AdoptContent(SymbolDefinition* pContent);
SymbolDefinition* OrphanContent();
-
+
// Property: Appearance
const WatermarkAppearance* GetAppearance() const;
WatermarkAppearance* GetAppearance();
void AdoptAppearance(WatermarkAppearance* pAppearance);
WatermarkAppearance* OrphanAppearance();
-
+
// Property: Position
const WatermarkPosition* GetPosition() const;
WatermarkPosition* GetPosition();
Modified: trunk/MgDev/Common/MdfModel/WatermarkInstance.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/WatermarkInstance.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/WatermarkInstance.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -266,7 +266,7 @@
return false;
// check resource ID
- if (::wcscmp(this->m_strResourceId.c_str(), another->m_strResourceId.c_str()))
+ if (::wcscmp(this->m_strResourceId.c_str(), another->m_strResourceId.c_str()))
return false;
// check appearance
Modified: trunk/MgDev/Common/MdfModel/WatermarkOffsetUnit.h
===================================================================
--- trunk/MgDev/Common/MdfModel/WatermarkOffsetUnit.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/WatermarkOffsetUnit.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -16,7 +16,7 @@
//
#ifndef WATERMARKOFFSETUNIT_H_
-#define WATERMARKOFFSETUNIT_H_
+#define WATERMARKOFFSETUNIT_H_
#include "MdfModel.h"
Modified: trunk/MgDev/Common/MdfModel/XYWatermarkPosition.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/XYWatermarkPosition.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/XYWatermarkPosition.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -18,7 +18,7 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
// The XYWatermarkPosition class implementation.
-// XYWatermarkPosition class is one implementation of WatermarkPosition to
+// XYWatermarkPosition class is one implementation of WatermarkPosition to
// define the position of watermark.
//-------------------------------------------------------------------------
@@ -151,7 +151,7 @@
XYWatermarkPosition* anotherPosition = dynamic_cast<XYWatermarkPosition*>(another);
if (!anotherPosition)
return false;
-
+
// check X position
if (!this->m_XPosition)
{
Modified: trunk/MgDev/Common/MdfModel/XYWatermarkPosition.h
===================================================================
--- trunk/MgDev/Common/MdfModel/XYWatermarkPosition.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfModel/XYWatermarkPosition.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -38,13 +38,13 @@
virtual ~XYWatermarkPosition();
// Operations
-
+
// Property: XPosition
const WatermarkXOffset* GetXPosition() const;
WatermarkXOffset* GetXPosition();
void AdoptXPosition(WatermarkXOffset* pXPosition);
WatermarkXOffset* OrphanXPosition();
-
+
// Property: YPosition
const WatermarkYOffset* GetYPosition() const;
WatermarkYOffset* GetYPosition();
Modified: trunk/MgDev/Common/MdfParser/IOWatermarkInstance.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOWatermarkInstance.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfParser/IOWatermarkInstance.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -180,7 +180,7 @@
WatermarkAppearance* appearanceOverride = watermark->GetAppearanceOverride();
if (appearanceOverride)
IOWatermarkAppearance::Write(fd, appearanceOverride, version, sAppearanceOverride);
-
+
// Property: PositionOverride (optional)
WatermarkPosition* positionOverride = watermark->GetPositionOverride();
if (positionOverride)
Modified: trunk/MgDev/Common/MdfParser/IOWatermarkOffsetUnit.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOWatermarkOffsetUnit.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/MdfParser/IOWatermarkOffsetUnit.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -34,7 +34,7 @@
else if (::wcscmp(ch, L"Points") == 0) // NOXLATE
return WatermarkOffset::Points;
else // treat as "Pixels" if string is incorrect
- return WatermarkOffset::Pixels;
+ return WatermarkOffset::Pixels;
}
Modified: trunk/MgDev/Common/PlatformBase/Data/ByteProperty.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Data/ByteProperty.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/PlatformBase/Data/ByteProperty.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -124,7 +124,7 @@
{
str += "<Type>byte</Type>";
}
-
+
if (!this->IsNull())
{
str += "<Value>";
Modified: trunk/MgDev/Common/PlatformBase/Data/DoubleProperty.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Data/DoubleProperty.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/PlatformBase/Data/DoubleProperty.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -130,10 +130,10 @@
string doubleStr = "";
MgUtil::DoubleToString(m_value, doubleStr);
- if (!this->IsNull())
+ if (!this->IsNull())
{
str += "<Value>";
- str += doubleStr;
+ str += doubleStr;
str += "</Value>";
}
Modified: trunk/MgDev/Common/PlatformBase/Data/Int64Property.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Data/Int64Property.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/PlatformBase/Data/Int64Property.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -118,7 +118,7 @@
std::string tmp = "";
MgUtil::Int64ToString(this->GetValue(), tmp);
- str += tmp;
+ str += tmp;
str += "</Value>";
}
Modified: trunk/MgDev/Common/PlatformBase/MapLayer/Watermark.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/MapLayer/Watermark.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/PlatformBase/MapLayer/Watermark.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -22,7 +22,7 @@
class WatermarkDefinition;
END_NAMESPACE_MDFMODEL
-//Currently the only reason MgWatermark exists is that
+//Currently the only reason MgWatermark exists is that
//the rendering service can get the WatermarkDefinition.
//So it's only an internal API.
Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureService.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureService.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureService.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -1552,7 +1552,7 @@
/// retrieve schema information. If this collection is null or empty, information
/// is returned for all feature classes.
/// \param outputFormat (String/string)
- /// A string identifying the output format of
+ /// A string identifying the output format of
/// the retrieved schema information.
/// The supported values of output format are specified in OpenGIS Web Feature Service (WFS) Implementation Specification - section 8.2
/// http://portal.opengeospatial.org/files/?artifact_id=8339
@@ -1638,7 +1638,7 @@
/// \param wfsVersion (String/string)
/// A string identifying the wfs version
/// \param outputFormat (String/string)
- /// A string identifying the output format of
+ /// A string identifying the output format of
/// the retrieved feature information.
/// The supported values of output format are specified in OpenGIS Web Feature Service (WFS) Implementation Specification - section 9.2
/// http://portal.opengeospatial.org/files/?artifact_id=8339
Modified: trunk/MgDev/Common/PlatformBase/Services/GeometryProperty.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/GeometryProperty.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/PlatformBase/Services/GeometryProperty.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -125,7 +125,7 @@
if (!this->IsNull())
{
string valueXml = "";
- try
+ try
{
valueXml += "<Value>";
Ptr<MgByteReader> byteReader = this->GetValue();
Modified: trunk/MgDev/Common/Renderers/RenderUtil.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/RenderUtil.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Renderers/RenderUtil.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -44,14 +44,14 @@
unsigned int* decoded = AGGImageIO::DecodePNG(data, length, native_width, native_height);
if (decoded)
{
- DrawScreenRaster(render,
- (unsigned char*)decoded,
- native_width * native_height * 4,
- RS_ImageFormat_ARGB,
- native_width,
- native_height,
- x, y,
- w, h,
+ DrawScreenRaster(render,
+ (unsigned char*)decoded,
+ native_width * native_height * 4,
+ RS_ImageFormat_ARGB,
+ native_width,
+ native_height,
+ x, y,
+ w, h,
angledeg, alpha);
}
Modified: trunk/MgDev/Common/Stylization/LineBuffer.h
===================================================================
--- trunk/MgDev/Common/Stylization/LineBuffer.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Stylization/LineBuffer.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -247,8 +247,8 @@
void MultiPointCentroid(double* cx, double* cy) const;
void MultiPolygonCentroid(double* cx, double* cy) const;
void MultiPolylineCentroid(double* cx, double* cy, double* slope) const;
-
+
void ResizePoints(int n); // new size of array # of points
void ResizeContours(int n);
void ResizeArcsSpArray(int n);
Modified: trunk/MgDev/Common/Stylization/Renderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/Renderer.h 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Stylization/Renderer.h 2010-10-02 06:25:43 UTC (rev 5234)
@@ -219,11 +219,11 @@
virtual double GetRasterGridSizeOverrideRatio() = 0;
virtual void SetRasterGridSizeOverrideRatio(double ratio) = 0;
- // gets/sets the max width for raster image
+ // gets/sets the max width for raster image
virtual double GetMaxRasterImageWidth() = 0;
virtual void SetMaxRasterImageWidth(int width) = 0;
- // gets/sets the max height for raster image
+ // gets/sets the max height for raster image
virtual double GetMaxRasterImageHeight() = 0;
virtual void SetMaxRasterImageHeight(int height) = 0;
Modified: trunk/MgDev/Common/Stylization/StylizationEngine.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/StylizationEngine.cpp 2010-10-02 06:18:55 UTC (rev 5233)
+++ trunk/MgDev/Common/Stylization/StylizationEngine.cpp 2010-10-02 06:25:43 UTC (rev 5234)
@@ -206,7 +206,7 @@
inline unsigned int TransparentColor(unsigned int argb, double opaque)
{
//unsigned int alpha = (unsigned int)(((argb >> 24) & 0xFF) * opaque);
- return argb & 0xFFFFFF
+ return argb & 0xFFFFFF
| (((unsigned int)(((argb >> 24) & 0xFF)* opaque)) << 24);
}
@@ -253,7 +253,7 @@
m_visitor->ParseStringExpression(L"", seTip, L"");
if (se_renderer->SupportsHyperlinks())
m_visitor->ParseStringExpression(L"", seUrl, L"");
-
+
SE_Rule rule;
// Translate watermark source into SE_SymbolInstance list.
@@ -268,7 +268,7 @@
m_visitor->Convert(rule.symbolInstances, &symbols);
_ASSERT(rule.symbolInstances.size() == 1u);
-
+
// translate appearance (transparency / rotation) into symbol instance
double transparency = watermark->GetAppearance()->GetTransparency();
transparency = (transparency < 0.0)? 0.0 : ((transparency > 100.0)? 100.0 : transparency);
@@ -284,7 +284,7 @@
style->angleDeg.value = style->angleDeg.defValue = style->angleDeg.defValue + rotation;
if (style->symbol.size() == 0)
continue;
-
+
if (opacity > 0.9999) // opaque is 1
continue;
@@ -316,7 +316,7 @@
}
}
}
-
+
// prepare some rendering context variable
double mm2sud = m_serenderer->GetScreenUnitsPerMillimeterDevice();
double mm2suw = m_serenderer->GetScreenUnitsPerMillimeterWorld();
@@ -469,7 +469,7 @@
lb->SetDrawingScale(drawingScale);
//Render line buffer
-
+
// -------------------------------------------------------------------------
//
// Here's a description of how the transforms work for point symbols.
@@ -735,7 +735,7 @@
}
// Detach symbol definition from the created composite symbol so that
- // it will not be finalized when composite symbol is finalized.
+ // it will not be finalized when composite symbol is finalized.
// The code is sure there is only one symbol instance.
_ASSERT(symbols.GetSymbolCollection()->GetCount() == 1);
symbols.GetSymbolCollection()->GetAt(0)->OrphanSymbolDefinition();
More information about the mapguide-commits
mailing list