fix 'on the fly' transform problem

stopa85milk · stopa85milk · commit dd01e40a300e · 2011-05-26T14:22:38.000+06:00
diff --git a/src/analysis/network/qgsgraphbuilderintr.h b/src/analysis/network/qgsgraphbuilderintr.h
@@ -72,9 +72,9 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
     }
     
     //! get measurement tool
-    QgsDistanceArea& distanceArea()
+    QgsDistanceArea* distanceArea()
     {
-      return mDa;
+      return &mDa;
     }
 
     //! add vertex
diff --git a/src/analysis/network/qgslinevectorlayerdirector.cpp b/src/analysis/network/qgslinevectorlayerdirector.cpp
@@ -69,19 +69,23 @@ void QgsLineVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, c
   int featureCount = ( int ) vl->featureCount() * 2;
   int step = 0;
 
-  QgsCoordinateTransform ct( vl->crs(), builder->destinationCrs() );
-
-  QgsDistanceArea da;
-  da.setSourceCrs( builder->destinationCrs().srsid() );
-  da.setProjectionsEnabled( true );
-
+  QgsCoordinateTransform ct;
+  ct.setSourceCrs( vl->crs() );
+  if ( builder->coordinateTransformationEnabled() )
+  {
+    ct.setDestCRS( builder->destinationCrs() );
+  }else
+  {
+    ct.setDestCRS( vl->crs() );
+  }
+ 
   tiedPoint = QVector< QgsPoint >( additionalPoints.size(), QgsPoint( 0.0, 0.0 ) );
   TiePointInfo tmpInfo;
   tmpInfo.mLength = std::numeric_limits<double>::infinity();
 
   QVector< TiePointInfo > pointLengthMap( additionalPoints.size(), tmpInfo );
   QVector< TiePointInfo >::iterator pointLengthIt;
-
+  
   // begin: tie points to the graph
   QgsAttributeList la;
   vl->select( la );
@@ -229,7 +233,7 @@ void QgsLineVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, c
           pt2 = pointsIt->second;
           if ( !isFirstPoint )
           {
-            double distance = da.measureLine( pt1, pt2 );
+            double distance = builder->distanceArea()->measureLine( pt1, pt2 );
             QVector< QVariant > prop;
             QList< QgsEdgeProperter* >::const_iterator it;
             for ( it = mProperterList.begin(); it != mProperterList.end(); ++it )

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`//! get measurement tool`
`75`		`- QgsDistanceArea& distanceArea()`
	`75`	`+ QgsDistanceArea* distanceArea()`
`76`	`76`	`{`
`77`		`- return mDa;`
	`77`	`+ return &mDa;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`//! add vertex`