[mapguide-commits] r5149 - trunk/MgDev/Common/Stylization

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2010-09-17 22:37:36 +0000 (Fri, 17 Sep 2010)
New Revision: 5149

Modified:
   trunk/MgDev/Common/Stylization/StylizationEngine.cpp
Log:
More watermark cleanup - MdfModel

* Numerous member variables were not being initialized in constructors - BAD!!
* In MdfModel, member variables should be initialized to the corresponding default property value specified in the schema!
* Never include files before stdafx.h.  If precompiled headers is enabled then headers included before stdafx.h are ignored.
* Renamed some class properties to be consistent with the schema.  E.g. WatermarkXOffset had a Length property but in the schema it's called Offset.  Now the code also uses Offset.
* Renamed WatermarkResourceID proeprty on WatermarkInstance to just ResourceId.
* New source files should have copyrights that only reference the current year.
* Adjusted formatting to match the rest of the project.

Also cleaned up some documentation in the schema.


Modified: trunk/MgDev/Common/Stylization/StylizationEngine.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/StylizationEngine.cpp	2010-09-17 22:23:54 UTC (rev 5148)
+++ trunk/MgDev/Common/Stylization/StylizationEngine.cpp	2010-09-17 22:37:36 UTC (rev 5149)
@@ -337,10 +337,8 @@
     double su2wu = 0.001 / (mm2suw * m_serenderer->GetMetersPerUnit());
 
     //Prepare the position list
-    XYWatermarkPosition* xyPosition = dynamic_cast<XYWatermarkPosition*>(
-        watermark->GetPosition());
-    TileWatermarkPosition* tilePosition = dynamic_cast<TileWatermarkPosition*>(
-        watermark->GetPosition());
+    XYWatermarkPosition* xyPosition = dynamic_cast<XYWatermarkPosition*>(watermark->GetPosition());
+    TileWatermarkPosition* tilePosition = dynamic_cast<TileWatermarkPosition*>(watermark->GetPosition());
     WatermarkXOffset::HorizontalAlignment hAlignment = WatermarkXOffset::Center;
     WatermarkYOffset::VerticalAlignment vAlignment = WatermarkYOffset::Center;
     WatermarkOffset::WatermarkOffsetUnit hUnit, vUnit;
@@ -351,8 +349,8 @@
         vAlignment = xyPosition->GetYPosition()->GetAlignment();
         hUnit = xyPosition->GetXPosition()->GetUnit();
         vUnit = xyPosition->GetYPosition()->GetUnit();
-        xOffset = xyPosition->GetXPosition()->GetLength();      //In watermark unit
-        yOffset = xyPosition->GetYPosition()->GetLength();      //In watermark unit
+        xOffset = xyPosition->GetXPosition()->GetOffset();      //In watermark unit
+        yOffset = xyPosition->GetYPosition()->GetOffset();      //In watermark unit
     }
     else if(tilePosition)
     {
@@ -360,8 +358,8 @@
         vAlignment = tilePosition->GetVerticalPosition()->GetAlignment();
         hUnit = tilePosition->GetHorizontalPosition()->GetUnit();
         vUnit = tilePosition->GetVerticalPosition()->GetUnit();
-        xOffset = tilePosition->GetHorizontalPosition()->GetLength();      //In watermark unit
-        yOffset = tilePosition->GetVerticalPosition()->GetLength();        //In watermark unit
+        xOffset = tilePosition->GetHorizontalPosition()->GetOffset();      //In watermark unit
+        yOffset = tilePosition->GetVerticalPosition()->GetOffset();        //In watermark unit
     }
     double pixelPerMeterDevice = 1000*mm2sud/px2su;
     suPerhUnit = ((hUnit == WatermarkOffset::Pixels)