Python bindings. Part 3

qgis · Jun 3, 2011 · 38aa771 · 38aa771
1 parent 032937f
commit 38aa771
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/python/analysis/network/networkanalysis.sip b/python/analysis/network/networkanalysis.sip
@@ -10,3 +10,4 @@
 %Include qgsgraphbuilder.sip
 %Include qgsgraphdirector.sip
 %Include qgslinevectorlayerdirector.sip
+%Include qgsgraphanalyzer.sip
diff --git a/python/analysis/network/qgsgraphanalyzer.sip b/python/analysis/network/qgsgraphanalyzer.sip
@@ -0,0 +1,27 @@
+class QgsGraphAnalyzer
+{
+%TypeHeaderCode
+#include <qgsgraphanalyzer.h>
+%End
+
+  public:
+    /**
+     * solve shortest path problem using dijkstra algorithm
+     * @param source The source graph
+     * @param startVertexIdx index of start vertex
+     * @param criterionNum index of edge property as optimization criterion
+     * @param destPointCost array of vertex indexes. Function calculating shortest path costs for vertices with these indexes
+     * @param cost array of cost paths
+     * @param treeResult return shortest path tree
+     */
+//    static void shortestpath( const QgsGraph* source, int startVertexIdx, int criterionNum, const QVector<int>& destPointCost, QVector<double>& cost, QgsGraph* treeResult );
+
+    /**
+     * return shortest path tree with root-node in startVertexIdx
+     * @param source The source graph
+     * @param startVertexIdx index of start vertex
+     * @param criterionNum index of edge property as optimization criterion
+     */
+    static QgsGraph* shortestTree( const QgsGraph* source, int startVertexIdx, int criterionNum );
+};
+
diff --git a/src/analysis/network/qgsgraphanalyzer.cpp b/src/analysis/network/qgsgraphanalyzer.cpp
@@ -102,3 +102,13 @@ void QgsGraphAnalyzer::shortestpath( const QgsGraph* source, int startPointIdx,
     cost[i] = result[ destPointCost[i] ].first;
   }
 }
+
+QgsGraph* QgsGraphAnalyzer::shortestTree( const QgsGraph* source, int startVertexIdx, int criterionNum)
+{
+  QgsGraph *g = new QgsGraph;
+  QVector<int> v;
+  QVector<double> vv;
+  QgsGraphAnalyzer::shortestpath( source, startVertexIdx, criterionNum, v, vv, g );
+
+  return g;
+}
diff --git a/src/analysis/network/qgsgraphanalyzer.h b/src/analysis/network/qgsgraphanalyzer.h
@@ -28,7 +28,7 @@ class QgsGraph;
  * The QGis class provides graph analysis functions
  */
 
-class QgsGraphAnalyzer
+class ANALYSIS_EXPORT QgsGraphAnalyzer
 {
   public:
     /**
@@ -41,6 +41,13 @@ class QgsGraphAnalyzer
      * @param treeResult return shortest path tree
      */
     static void shortestpath( const QgsGraph* source, int startVertexIdx, int criterionNum, const QVector<int>& destPointCost, QVector<double>& cost, QgsGraph* treeResult );
-
+
+    /**
+     * return shortest path tree with root-node in startVertexIdx
+     * @param source The source graph
+     * @param startVertexIdx index of start vertex
+     * @param criterionNum index of edge property as optimization criterion
+     */
+    static QgsGraph* shortestTree( const QgsGraph* source, int startVertexIdx, int criterionNum );
 };
 #endif //QGSGRAPHANALYZERH