fix crash when viewing project properties of 1.1 project files

jef · jef · commit 2cd587c4bf8e · 2009-05-27T17:17:03.000Z
(missing LayerSnappingToleranceUnitList) git-svn-id: http://svn.osgeo.org/qgis/trunk@10853 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgssnappingdialog.h b/src/app/qgssnappingdialog.h
@@ -28,7 +28,7 @@ struct LayerEntry
   int snapTo; //0 = to vertex, 1 = to segment, 2 = to vertex and to segment
   QString layerName;
   double tolerance;
-  int toleranceUnit;
+  int toleranceUnit; // 0 = map units, 1 = pixels
 };
 
 /**A dialog to enter advanced editing properties, e.g. topological editing, snapping settings
diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp
@@ -26,6 +26,7 @@
 #include <QDomDocument>
 #include <QPrinter> //to find out screen resolution
 #include <cstdlib>
+#include "qgsprojectproperty.h"
 
 typedef QgsProjectVersion PFV;
 
@@ -38,7 +39,8 @@ QgsProjectFileTransform::transform QgsProjectFileTransform::transformers[] =
   {PFV( 0, 9, 1 ), PFV( 0, 10, 0 ), &QgsProjectFileTransform::transform091to0100},
   {PFV( 0, 9, 2 ), PFV( 0, 10, 0 ), &QgsProjectFileTransform::transformNull},
   {PFV( 0, 10, 0 ), PFV( 0, 11, 0 ), &QgsProjectFileTransform::transform0100to0110},
-  {PFV( 0, 11, 0 ), PFV( 1, 0, 0 ), &QgsProjectFileTransform::transform0110to1000}
+  {PFV( 0, 11, 0 ), PFV( 1, 0, 0 ), &QgsProjectFileTransform::transform0110to1000},
+  {PFV( 1, 1, 0 ), PFV( 1, 2, 0 ), &QgsProjectFileTransform::transform1100to1200},
 };
 
 bool QgsProjectFileTransform::updateRevision( QgsProjectVersion newVersion )
@@ -346,3 +348,37 @@ void QgsProjectFileTransform::transform0110to1000()
     }
   }
 }
+
+void QgsProjectFileTransform::transform1100to1200()
+{
+  QgsDebugMsg( "Entering..." );
+  if ( mDom.isNull() )
+    return;
+
+  QDomNode qgis = mDom.firstChildElement( "qgis" );
+  if ( qgis.isNull() )
+    return;
+
+  QDomElement properties = qgis.firstChildElement( "properties" );
+  if ( properties.isNull() )
+    return;
+
+  QDomElement digitizing = properties.firstChildElement( "Digitizing" );
+  if ( digitizing.isNull() )
+    return;
+
+  QDomElement tolList = digitizing.firstChildElement( "LayerSnappingToleranceList" );
+  if ( tolList.isNull() )
+    return;
+
+  QDomElement tolUnitList = digitizing.firstChildElement( "LayerSnappingToleranceUnitList" );
+  if ( !tolUnitList.isNull() )
+    return;
+
+  QStringList units;
+  for ( int i = 0; i < tolList.childNodes().count(); i++ )
+    units << "0";
+
+  QgsPropertyValue value( units );
+  value.writeXML( "LayerSnappingToleranceUnitList", digitizing, mDom );
+}
diff --git a/src/core/qgsprojectfiletransform.h b/src/core/qgsprojectfiletransform.h
@@ -80,6 +80,7 @@ class QgsProjectFileTransform
     void transform091to0100();
     void transform0100to0110();
     void transform0110to1000();
+    void transform1100to1200();
 };
 
 
