[QGIS Commit] r9470 - trunk/qgis/tools/mapserver_export

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-10-10 15:06:07 -0400 (Fri, 10 Oct 2008)
New Revision: 9470

Modified:
   trunk/qgis/tools/mapserver_export/ms_export.py
   trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp
Log:
Bug fixes: click to select fixes for ticket #1154. Fix for topological editing. API cleanups and updates.

Modified: trunk/qgis/tools/mapserver_export/ms_export.py
===================================================================
--- trunk/qgis/tools/mapserver_export/ms_export.py	2008-10-10 13:26:39 UTC (rev 9469)
+++ trunk/qgis/tools/mapserver_export/ms_export.py	2008-10-10 19:06:07 UTC (rev 9470)
@@ -160,7 +160,7 @@
     # the project file doesn't contain the epsg id or proj4 text for 
     # the map apart from that defined in each layer
 
-    self.outFile.write("  PROJECTION\n")
+    self.outFile.write("  CRS\n")
 
     # Get the proj4 text from the first map layer's destination SRS
     destsrs = self.qgs.getElementsByTagName("destinationsrs")[0] 
@@ -353,7 +353,7 @@
            float(lyr.getElementsByTagName("transparencyLevelInt")[0].childNodes[0].nodeValue.encode('utf-8')) / 255.0 ) 
       self.outFile.write("    TRANSPARENCY " + str(opacity) + "\n")
 
-      self.outFile.write("    PROJECTION\n")
+      self.outFile.write("    CRS\n")
       # Get the destination srs for this layer and use it to create
       # the projection section
       destsrs = self.qgs.getElementsByTagName("destinationsrs")[0] 

Modified: trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp
===================================================================
--- trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp	2008-10-10 13:26:39 UTC (rev 9469)
+++ trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp	2008-10-10 19:06:07 UTC (rev 9470)
@@ -238,7 +238,7 @@
   if (!mapFile.fail())
   {
     // XXX So, what encoding should we use here???
-    mapFile << "# Map file generated by QGIS version " << QGis::qgisVersion << std::endl;
+    mapFile << "# Map file generated by QGIS version " << QGis::QGIS_VERSION << std::endl;
     mapFile << "# Edit this file to customize for your interface" << std::endl;
     mapFile << "# Not all sections are complete. See comments for details." << std::endl;
     if (!chkExpLayersOnly->isChecked())