Remove 'go2epa_express'

actions/go2epa.py

@@ -47,7 +47,7 @@ def go2epa(self):
         # Create dialog
         self.dlg_go2epa = FileManager()
         self.load_settings(self.dlg_go2epa)
-        # self.dlg.setWindowTitle("Options Table")
+        self.dlg_go2epa.setFixedSize(620, 300)        
 
         # Set widgets
         self.dlg_go2epa.txt_file_inp.setText(self.file_inp)
@@ -637,15 +637,6 @@ def save_file_parameters(self):
         self.gsw_settings.setValue('PROJECT_NAME', self.project_name)
 
 
-    def go2epa_express(self):
-        """ Button 24: Open giswater in silent mode
-            Executes all options of File Manager: Export INP, Execute EPA software and Import results
-        """
-
-        self.get_last_gsw_file(False)   
-        self.execute_giswater("mg_go2epa_express")
-
-
     def go2epa_result_selector(self):
         """ Button 29: Epa result selector """
 

config/giswater.config

@@ -63,7 +63,6 @@ table_man_gully=v_edit_man_gully
 
 ; epa
 23_function=go2epa
-; 24_function=go2epa_express
 25_function=go2epa_result_manager
 29_function=go2epa_result_selector
 

giswater.py

@@ -128,7 +128,7 @@ def manage_action(self, index_action, function_name):
                 callback_function = getattr(self.edit, function_name)
                 action.triggered.connect(callback_function)
             # Go2epa toolbar actions
-            elif int(index_action) in (23, 24, 25, 29):
+            elif int(index_action) in (23, 25, 29):
                 callback_function = getattr(self.go2epa, function_name)
                 action.triggered.connect(callback_function)
             # Master toolbar actions
@@ -229,7 +229,7 @@ def add_action(self, index_action, toolbar, action_group):
             return None
 
         # Buttons NOT checkable (normally because they open a form)
-        if int(index_action) in (19, 23, 24, 25, 26, 27, 29, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49,
+        if int(index_action) in (19, 23, 25, 26, 27, 29, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49,
                                  50, 86, 61, 64, 65, 66, 67, 68, 81, 82, 83, 84, 99):
             action = self.create_action(index_action, text_action, toolbar, False, function_name, action_group)
         # Buttons checkable (normally related with 'map_tools')                
@@ -303,7 +303,7 @@ def manage_toolbars(self):
         self.manage_toolbar(toolbar_id, list_actions)   
 
         toolbar_id = "epa"
-        list_actions = ['23', '24', '25', '29']               
+        list_actions = ['23', '25', '29']               
         self.manage_toolbar(toolbar_id, list_actions)    
 
         toolbar_id = "master"
@@ -936,7 +936,6 @@ def manage_actions_linux(self):
         # Linux: Disable actions related with go2epa and giswater.jar
         if 'nt' not in sys.builtin_module_names:
             self.enable_action(False, 23)
-            self.enable_action(False, 24) 
             self.enable_action(False, 25)                          
 
 

metadata.txt

@@ -6,7 +6,7 @@ name=giswater
 qgisMinimumVersion=2.18
 description=Plugin to enable additional features and capabilities of Giswater working together with QGIS and PostgreSQL
 about=Giswater is a open source tool with the goal to move from acquired knowledge to shared knowledge in the areas of water management, such as supply, sewerage, urban drainage or flood risk assessment with to communicate any water simulation software through any Spatial database with any Geographic Information System (GIS) in order to give everybody a real way of open solution of water management.
-version=3.0.117
+version=3.1.100
 author=David Erill, Luigi Pirelli, Natasa Cica, Nestor Ibañez, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Xavier Torret
 
 # End of mandatory metadata