pgRouting · AasheeshT · Aug 13, 2018 · Apr 6, 2019 · Apr 7, 2019 · Apr 7, 2019
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/LICENSE b/LICENSE
diff --git a/functions/AstarBase.py b/functions/AstarBase.py
diff --git a/functions/CostBase.py b/functions/CostBase.py
diff --git a/functions/DijkstraBase.py b/functions/DijkstraBase.py
diff --git a/functions/pgr_KSP.py b/functions/pgr_KSP.py
diff --git a/functions/pgr_aStar.py b/functions/pgr_aStar.py
diff --git a/functions/pgr_aStarCost.py b/functions/pgr_aStarCost.py
diff --git a/functions/pgr_bdAstar.py b/functions/pgr_bdAstar.py
diff --git a/functions/pgr_bdAstarCost.py b/functions/pgr_bdAstarCost.py
diff --git a/functions/pgr_bdDijkstra.py b/functions/pgr_bdDijkstra.py
diff --git a/functions/pgr_bdDijkstraCost.py b/functions/pgr_bdDijkstraCost.py
diff --git a/functions/pgr_dijkstra.py b/functions/pgr_dijkstra.py
diff --git a/functions/pgr_dijkstraCost.py b/functions/pgr_dijkstraCost.py
diff --git a/help/Makefile b/help/Makefile
diff --git a/help/make.bat b/help/make.bat
diff --git a/help/source/conf.py b/help/source/conf.py
diff --git a/help/source/index.rst b/help/source/index.rst
diff --git a/icons/pgr_fn.svg b/icons/pgr_fn.svg
diff --git a/mkdocs.yml b/mkdocs.yml
diff --git a/pb_tool.cfg b/pb_tool.cfg
diff --git a/pgRoutingLayer.py b/pgRoutingLayer.py
@@ -174,6 +174,7 @@ def initGui(self):
         self.action.triggered.connect(self.show)
         self.dock.buttonReloadConnections.clicked.connect(self.reloadConnections)
         self.dock.comboConnections.currentIndexChanged.connect(self.updateConnectionEnabled)
+        self.dock.SchemacomboBox.currentIndexChanged.connect(self.updateEdgeTable)
         self.dock.comboBoxFunction.currentIndexChanged.connect(self.updateFunctionEnabled)
 
         self.dock.buttonSelectIds.clicked.connect(self.selectIds)
@@ -234,13 +235,18 @@ def initGui(self):
         self.dock.lineEditDistance.setValidator(QDoubleValidator())
         self.dock.lineEditAlpha.setValidator(QDoubleValidator())
         self.dock.lineEditPaths.setValidator(QIntValidator())
+
 
         # populate the combo with connections
         self.reloadMessage = False
         self.reloadConnections()
         self.loadSettings()
         Utils.logMessage("startup version " + str(self.version))
         self.reloadMessage = True
+        #experiment
+        layers=QgsProject.instance().layerTreeRoot().children()
+        self.dock.EdgeTablecomboBox.clear()
+        self.dock.EdgeTablecomboBox.addItems([layer.name() for layer in layers])
 
     def show(self):
         self.iface.addDockWidget(Qt.LeftDockWidgetArea, self.dock)
@@ -291,6 +297,48 @@ def reloadConnections(self):
         self.reloadMessage = oldReloadMessage
         self.updateConnectionEnabled()
 
+
+    def updateSchemaTable(self,con):
+        self.dock.SchemacomboBox.clear()
+        cursor=con.cursor()
+        cursor.execute("""select schema_name
+from information_schema.schemata""")
+        for schema in cursor.fetchall():
+            self.dock.SchemacomboBox.addItems(schema)
+
+
+    def updateEdgeTable(self):
+
+        dbname = str(self.dock.comboConnections.currentText())
+        if dbname == '':
+            return
+
+        db = self.actionsDb[dbname].connect()
+        con = db.con
+        cursor = con.cursor()
+        curSchema =str(self.dock.SchemacomboBox.currentText())
+        tab={}
+        tab['temp']= curSchema
+
+        query=sql.SQL("""SELECT table_name FROM information_schema.tables
+WHERE table_schema='public' """)
+
+        cursor.execute(query.as_string(con))
+        for table in cursor.fetchall():
+            self.dock.EdgeTablecomboBox.addItems(table)
+        self.updateGeometryTable(con)
+
+    def updateGeometryTable(self,con):
+        curTable =str(self.dock.EdgeTablecomboBox.currentText())
+        self.dock.GeometrycomboBox.clear()
+        cursor=con.cursor()
+        cursor.execute("""SELECT geometry_columns.f_geometry_column FROM geometry_columns""")
+        for geom in cursor.fetchall():
+            self.dock.GeometrycomboBox.addItems(geom)
+
+
+
+
     def updateConnectionEnabled(self):
         ''' Updates the database connection name and function '''
         dbname = str(self.dock.comboConnections.currentText())
@@ -309,6 +357,7 @@ def updateConnectionEnabled(self):
             return
 
         self.loadFunctionsForVersion()
+        self.updateSchemaTable(con)
         self.updateFunctionEnabled(currentFunction)
 
     def loadFunctionsForVersion(self):
@@ -941,9 +990,9 @@ def toggleSelectButton(self, button):
     def get_innerQueryArguments(self, controls):
         args = {}
 
-        args['edge_schema'] = sql.Identifier(str(self.dock.lineEditSchema.text()))
-        args['edge_table'] = sql.Identifier(str(self.dock.lineEditTable.text()))
-        args['geometry'] = sql.Identifier(str(self.dock.lineEditGeometry.text()))
+        args['edge_schema'] = sql.Identifier(str(self.dock.SchemacomboBox.currentText()))
+        args['edge_table'] = sql.Identifier(str(self.dock.EdgeTablecomboBox.currentText()))
+        args['geometry'] = sql.Identifier(str(self.dock.GeometrycomboBox.currentText()))
         args['id'] = sql.Identifier(str(self.dock.lineEditId.text()))
         args['source'] = sql.Identifier(str(self.dock.lineEditSource.text()))
         args['target'] = sql.Identifier(str(self.dock.lineEditTarget.text()))
@@ -1161,9 +1210,9 @@ def loadSettings(self):
         if idx >= 0:
             self.dock.comboBoxFunction.setCurrentIndex(idx)
 
-        self.dock.lineEditSchema.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/edge_schema', 'public'))
-        self.dock.lineEditTable.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/edge_table', 'edge_table'))
-        self.dock.lineEditGeometry.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/geometry', 'the_geom'))
+        self.dock.SchemacomboBox.findText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/edge_schema', 'public'))
+        self.dock.EdgeTablecomboBox.findText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/edge_table', 'edge_table'))
+        self.dock.GeometrycomboBox.findText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/geometry', 'the_geom'))
 
         self.dock.lineEditId.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/id', 'id'))
         self.dock.lineEditSource.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/source', 'source'))

diff --git a/requirements.txt b/requirements.txt
diff --git a/resources.qrc b/resources.qrc
diff --git a/ui_pgRoutingLayer.ui b/ui_pgRoutingLayer.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>333</width>
+    <width>339</width>
     <height>640</height>
    </rect>
   </property>
@@ -258,7 +258,7 @@
                  <x>0</x>
                  <y>0</y>
                  <width>241</width>
-                 <height>355</height>
+                 <height>362</height>
                 </rect>
                </property>
                <layout class="QGridLayout" name="gridLayout_5">
@@ -515,17 +515,7 @@
                <locale language="English" country="UnitedStates"/>
               </property>
               <property name="text">
-               <string>Edge table</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="lineEditTable">
-              <property name="toolTip">
-               <string>Name of the table containing the routable network</string>
-              </property>
-              <property name="locale">
-               <locale language="English" country="UnitedStates"/>
+               <string>Schema</string>
               </property>
              </widget>
             </item>
@@ -535,17 +525,7 @@
                <locale language="English" country="UnitedStates"/>
               </property>
               <property name="text">
-               <string>Schema</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QLineEdit" name="lineEditSchema">
-              <property name="toolTip">
-               <string>Name of the table containing the routable network</string>
-              </property>
-              <property name="locale">
-               <locale language="English" country="UnitedStates"/>
+               <string>Edge Table</string>
               </property>
              </widget>
             </item>
@@ -559,20 +539,22 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QLineEdit" name="lineEditGeometry">
-              <property name="toolTip">
-               <string>Name of the geometry column in network table</string>
-              </property>
-             </widget>
-            </item>
             <item row="3" column="1">
              <widget class="QCheckBox" name="checkBoxUseBBOX">
               <property name="text">
                <string>BBOX</string>
               </property>
              </widget>
             </item>
+            <item row="0" column="1">
+             <widget class="QComboBox" name="SchemacomboBox"/>
+            </item>
+            <item row="1" column="1">
+             <widget class="QComboBox" name="EdgeTablecomboBox"/>
+            </item>
+            <item row="2" column="1">
+             <widget class="QComboBox" name="GeometrycomboBox"/>
+            </item>
            </layout>
           </widget>
          </widget>
@@ -642,8 +624,8 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>235</width>
-                 <height>599</height>
+                 <width>213</width>
+                 <height>450</height>
                 </rect>
                </property>
                <layout class="QGridLayout" name="gridLayout_3">
@@ -1272,10 +1254,6 @@ _sql</string>
    </layout>
   </widget>
  </widget>
- <tabstops>
-  <tabstop>lineEditTable</tabstop>
-  <tabstop>lineEditGeometry</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/utilities/pgr_queries.py b/utilities/pgr_queries.py