Skip to content

Commit 31cd113

Browse files
alexbruy3nids
authored andcommitted
update SIP files
1 parent b295fcc commit 31cd113

File tree

2 files changed

+25
-29
lines changed

2 files changed

+25
-29
lines changed

python/analysis/network/qgsgraphanalyzer.sip

+24-24
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,32 @@ class QgsGraphAnalyzer
3333
%End
3434

3535
%MethodCode
36-
QVector< int > treeResult;
37-
QVector< double > costResult;
38-
QgsGraphAnalyzer::dijkstra( a0, a1, a2, &treeResult, &costResult );
36+
QVector< int > treeResult;
37+
QVector< double > costResult;
38+
QgsGraphAnalyzer::dijkstra( a0, a1, a2, &treeResult, &costResult );
3939

40-
PyObject *l1 = PyList_New( treeResult.size() );
41-
if ( l1 == NULL )
42-
{
43-
return NULL;
44-
}
45-
PyObject *l2 = PyList_New( costResult.size() );
46-
if ( l2 == NULL )
47-
{
48-
return NULL;
49-
}
50-
int i;
51-
for ( i = 0; i < costResult.size(); ++i )
52-
{
53-
PyObject *Int = PyLong_FromLong( treeResult[i] );
54-
PyList_SET_ITEM( l1, i, Int );
55-
PyObject *Float = PyFloat_FromDouble( costResult[i] );
56-
PyList_SET_ITEM( l2, i, Float );
57-
}
40+
PyObject *l1 = PyList_New( treeResult.size() );
41+
if ( l1 == NULL )
42+
{
43+
return NULL;
44+
}
45+
PyObject *l2 = PyList_New( costResult.size() );
46+
if ( l2 == NULL )
47+
{
48+
return NULL;
49+
}
50+
int i;
51+
for ( i = 0; i < costResult.size(); ++i )
52+
{
53+
PyObject *Int = PyLong_FromLong( treeResult[i] );
54+
PyList_SET_ITEM( l1, i, Int );
55+
PyObject *Float = PyFloat_FromDouble( costResult[i] );
56+
PyList_SET_ITEM( l2, i, Float );
57+
}
5858

59-
sipRes = PyTuple_New( 2 );
60-
PyTuple_SET_ITEM( sipRes, 0, l1 );
61-
PyTuple_SET_ITEM( sipRes, 1, l2 );
59+
sipRes = PyTuple_New( 2 );
60+
PyTuple_SET_ITEM( sipRes, 0, l1 );
61+
PyTuple_SET_ITEM( sipRes, 1, l2 );
6262
%End
6363

6464
static QgsGraph *shortestTree( const QgsGraph *source, int startVertexIdx, int criterionNum );

python/analysis/network/qgsgraphbuilderinterface.sip

+1-5
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,14 @@ class QgsGraphBuilderInterface
3232
%End
3333
public:
3434

35-
QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem &crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" )
35+
QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem &crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" );
3636
%Docstring
3737
Default constructor
3838
\param crs Coordinate reference system for new graph vertex
3939
\param ctfEnabled enable coordinate transform from source graph CRS to CRS graph
4040
\param topologyTolerance sqrt distance between source point as one graph vertex
4141
\param ellipsoidID ellipsoid for edge measurement
4242
%End
43-
: mCrs( crs );
44-
%Docstring
45-
:rtype: :
46-
%End
4743

4844
virtual ~QgsGraphBuilderInterface();
4945

0 commit comments

Comments
 (0)