Save / restore geometry check configuration

m-kuhn · m-kuhn · commit abda86562219 · 2018-10-15T14:27:58.000+02:00
diff --git a/src/core/qgsgeometryoptions.cpp b/src/core/qgsgeometryoptions.cpp
@@ -75,16 +75,32 @@ void QgsGeometryOptions::setCheckConfiguration( const QString &checkId, const QV
 
 void QgsGeometryOptions::writeXml( QDomNode &node ) const
 {
-  QDomElement geometryOptionsElement = node.ownerDocument().createElement( QStringLiteral( "geometryOptions" ) );
+  QDomDocument doc = node.ownerDocument();
+  QDomElement geometryOptionsElement = doc.createElement( QStringLiteral( "geometryOptions" ) );
   node.appendChild( geometryOptionsElement );
 
   geometryOptionsElement.setAttribute( QStringLiteral( "removeDuplicateNodes" ), mRemoveDuplicateNodes ? 1 : 0 );
   geometryOptionsElement.setAttribute( QStringLiteral( "geometryPrecision" ), mGeometryPrecision );
+
+  QDomElement activeCheckListElement = QgsXmlUtils::writeVariant( mGeometryChecks, doc );
+  activeCheckListElement.setTagName( QStringLiteral( "activeChecks" ) );
+  geometryOptionsElement.appendChild( activeCheckListElement );
+  QDomElement checkConfigurationElement = QgsXmlUtils::writeVariant( mCheckConfiguration, doc );
+  checkConfigurationElement.setTagName( QStringLiteral( "checkConfiguration" ) );
+  geometryOptionsElement.appendChild( checkConfigurationElement );
 }
 
 void QgsGeometryOptions::readXml( const QDomNode &node )
 {
   QDomElement geometryOptionsElement = node.toElement();
   setGeometryPrecision( geometryOptionsElement.attribute( QStringLiteral( "geometryPrecision" ),  QStringLiteral( "0.0" ) ).toDouble() );
   setRemoveDuplicateNodes( geometryOptionsElement.attribute( QStringLiteral( "removeDuplicateNodes" ),  QStringLiteral( "0" ) ).toInt() == 1 );
+
+  QDomElement activeChecksElem = node.namedItem( QStringLiteral( "activeChecks" ) ).toElement();
+  const QVariant activeChecks = QgsXmlUtils::readVariant( activeChecksElem );
+  setGeometryChecks( activeChecks.toStringList() );
+
+  QDomElement checkConfigurationElem = node.namedItem( QStringLiteral( "checkConfiguration" ) ).toElement();
+  const QVariant checkConfiguration = QgsXmlUtils::readVariant( checkConfigurationElem );
+  mCheckConfiguration = checkConfiguration.toMap();
 }
