#2781 Relative paths to SvgMarker doesn't work in new symbology

rldhont · rldhont · commit 149b24c07f05 · 2012-11-14T11:51:19.000+01:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -894,18 +894,23 @@ QString QgsSvgMarkerSymbolLayerV2::symbolPathToName( QString path )
 
   QStringList svgPaths = QgsApplication::svgPaths();
 
+  bool isInSvgPathes = false;
   for ( int i = 0; i < svgPaths.size(); i++ )
   {
     QString dir = QFileInfo( svgPaths[i] ).canonicalFilePath();
 
     if ( !dir.isEmpty() && path.startsWith( dir ) )
     {
       path = path.mid( dir.size() );
+      isInSvgPathes = true;
       break;
     }
   }
 
-  return path;
+  if ( isInSvgPathes )
+    return path;
+
+  return QgsProject::instance()->writePath( path );
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -894,18 +894,23 @@ QString QgsSvgMarkerSymbolLayerV2::symbolPathToName( QString path )`
`894`	`894`
`895`	`895`	`QStringList svgPaths = QgsApplication::svgPaths();`
`896`	`896`
	`897`	`+ bool isInSvgPathes = false;`
`897`	`898`	`for ( int i = 0; i < svgPaths.size(); i++ )`
`898`	`899`	`{`
`899`	`900`	`QString dir = QFileInfo( svgPaths[i] ).canonicalFilePath();`
`900`	`901`
`901`	`902`	`if ( !dir.isEmpty() && path.startsWith( dir ) )`
`902`	`903`	`{`
`903`	`904`	`path = path.mid( dir.size() );`
	`905`	`+ isInSvgPathes = true;`
`904`	`906`	`break;`
`905`	`907`	`}`
`906`	`908`	`}`
`907`	`909`
`908`		`- return path;`
	`910`	`+ if ( isInSvgPathes )`
	`911`	`+ return path;`
	`912`	`+`
	`913`	`+ return QgsProject::instance()->writePath( path );`
`909`	`914`	`}`
`910`	`915`
`911`	`916`