pep8 Model

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -53,7 +53,8 @@ class BoundaryConditionAdisTS(SQLSubModel):
         self._header = []
         self._types = [self.time_convert, float]
 
-        BoundaryConditionAdisTS._id_cnt = max(BoundaryConditionAdisTS._id_cnt + 1, self.id)
+        BoundaryConditionAdisTS._id_cnt = max(
+            BoundaryConditionAdisTS._id_cnt + 1, self.id)
 
     @classmethod
     def _db_create(cls, execute):
@@ -105,10 +106,12 @@ class BoundaryConditionAdisTS(SQLSubModel):
 
                 bc.node = None
                 if row[3] != -1:
-                    bc.node = next(filter(lambda n: n.id == row[3], data["nodes"])).id
+                    bc.node = next(filter(
+                        lambda n: n.id == row[3], data["nodes"])).id
 
                 values = execute(
-                    "SELECT data0, data1 FROM boundary_condition_data_adists " +
+                    "SELECT data0, data1 FROM " +
+                    "boundary_condition_data_adists " +
                     f"WHERE bc = '{bc.id}'"
                 )
 
@@ -126,7 +129,8 @@ class BoundaryConditionAdisTS(SQLSubModel):
     def _db_save(self, execute, data=None):
 
         execute(f"DELETE FROM boundary_condition_adists WHERE id = {self.id}")
-        execute(f"DELETE FROM boundary_condition_data_adists WHERE bc = {self.id}")
+        execute(f"DELETE FROM boundary_condition_data_adists" +
+                f" WHERE bc = {self.id}")
 
         node = -1
         if self._node is not None:
@@ -208,14 +212,3 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @property
     def data(self):
         return self._data.copy()
-
-
-
-
-
-
-
-
-
-
-

src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py

@@ -22,7 +22,9 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Except import NotImplementedMethodeError
 
-from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import BoundaryConditionAdisTS
+from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS \
+    import BoundaryConditionAdisTS
+
 
 class BoundaryConditionsAdisTSList(PamhyrModelList):
     _sub_classes = [
@@ -63,6 +65,3 @@ class BoundaryConditionsAdisTSList(PamhyrModelList):
     @property
     def BCs_AdisTS_List(self):
         return self.lst
-
-
-

src/Model/D90AdisTS/D90AdisTS.py

@@ -28,6 +28,7 @@ from Model.D90AdisTS.D90AdisTSSpec import D90AdisTSSpec
 
 logger = logging.getLogger()
 
+
 class D90AdisTS(SQLSubModel):
     _sub_classes = [
         D90AdisTSSpec,
@@ -193,9 +194,3 @@ class D90AdisTS(SQLSubModel):
     def insert(self, index, data):
         self._data.insert(index, data)
         self._status.modified()
-
-
-
-
-
-

src/Model/D90AdisTS/D90AdisTSList.py

@@ -22,6 +22,7 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.D90AdisTS.D90AdisTS import D90AdisTS
 
+
 class D90AdisTSList(PamhyrModelList):
     _sub_classes = [
         D90AdisTS,
@@ -60,7 +61,3 @@ class D90AdisTSList(PamhyrModelList):
     @property
     def D90_AdisTS_List(self):
         return self.lst
-
-
-
-

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -25,6 +25,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class D90AdisTSSpec(SQLSubModel):
     _sub_classes = [
     ]
@@ -190,12 +191,3 @@ class D90AdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -28,6 +28,7 @@ from Model.DIFAdisTS.DIFAdisTSSpec import DIFAdisTSSpec
 
 logger = logging.getLogger()
 
+
 class DIFAdisTS(SQLSubModel):
     _sub_classes = [
         DIFAdisTSSpec,
@@ -250,9 +251,3 @@ class DIFAdisTS(SQLSubModel):
     def insert(self, index, data):
         self._data.insert(index, data)
         self._status.modified()
-
-
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTSList.py

@@ -22,6 +22,7 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.DIFAdisTS.DIFAdisTS import DIFAdisTS
 
+
 class DIFAdisTSList(PamhyrModelList):
     _sub_classes = [
         DIFAdisTS,
@@ -60,7 +61,3 @@ class DIFAdisTSList(PamhyrModelList):
     @property
     def DIF_AdisTS_List(self):
         return self.lst
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -25,6 +25,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class DIFAdisTSSpec(SQLSubModel):
     _sub_classes = [
     ]
@@ -218,12 +219,3 @@ class DIFAdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -24,10 +24,12 @@ from tools import trace, timer, old_pamhyr_date_to_timestamp
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTSSpec import ICAdisTSSpec
+from Model.InitialConditionsAdisTS.InitialConditionsAdisTSSpec \
+    import ICAdisTSSpec
 
 logger = logging.getLogger()
 
+
 class InitialConditionsAdisTS(SQLSubModel):
     _sub_classes = [
         ICAdisTSSpec,
@@ -264,9 +266,3 @@ class InitialConditionsAdisTS(SQLSubModel):
     def insert(self, index, data):
         self._data.insert(index, data)
         self._status.modified()
-
-
-
-
-
-

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py

@@ -20,7 +20,9 @@ from copy import copy
 from tools import trace, timer
 
 from Model.Tools.PamhyrList import PamhyrModelList
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTS import InitialConditionsAdisTS
+from Model.InitialConditionsAdisTS.InitialConditionsAdisTS \
+    import InitialConditionsAdisTS
+
 
 class InitialConditionsAdisTSList(PamhyrModelList):
     _sub_classes = [
@@ -60,7 +62,3 @@ class InitialConditionsAdisTSList(PamhyrModelList):
     @property
     def Initial_Conditions_List(self):
         return self.lst
-
-
-
-

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -25,6 +25,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class ICAdisTSSpec(SQLSubModel):
     _sub_classes = [
     ]
@@ -111,7 +112,8 @@ class ICAdisTSSpec(SQLSubModel):
                 rate = row[10]
                 enabled = (row[11] == 1)
 
-                #new_spec = [name, reach, start_rk, end_rk, concentration, eg, em, ed, rate, enabled]
+                # new_spec = [name, reach, start_rk, end_rk,
+                #     concentration, eg, em, ed, rate, enabled]
 
                 new_spec = cls(
                     id=id,
@@ -248,12 +250,3 @@ class ICAdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -30,11 +30,13 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class LateralContributionAdisTS(SQLSubModel):
     _sub_classes = []
     _id_cnt = 0
 
-    def __init__(self, id: int = -1, pollutant: int = -1, name: str = "", status=None):
+    def __init__(self, id: int = -1, pollutant: int = -1,
+                 name: str = "", status=None):
         super(LateralContributionAdisTS, self).__init__()
 
         self._status = status
@@ -107,7 +109,8 @@ class LateralContributionAdisTS(SQLSubModel):
                 lc.end_rk = row[4]
 
                 values = execute(
-                    "SELECT data0, data1 FROM lateral_contribution_data_adists " +
+                    "SELECT data0," +
+                    " data1 FROM lateral_contribution_data_adists " +
                     f"WHERE lc = '{lc.id}'"
                 )
 
@@ -124,12 +127,15 @@ class LateralContributionAdisTS(SQLSubModel):
 
     def _db_save(self, execute, data=None):
 
-        execute(f"DELETE FROM lateral_contribution_adists WHERE id = {self.id}")
+        execute(f"DELETE FROM lateral_contribution_adists" +
-        execute(f"DELETE FROM lateral_contribution_data_adists WHERE lc = {self.id}")
+                f" WHERE id = {self.id}")
+        execute(f"DELETE FROM lateral_contribution_data_adists" +
+                f" WHERE lc = {self.id}")
 
         sql = (
             "INSERT INTO " +
-            "lateral_contribution_adists(id, pollutant, edge, begin_rk, end_rk) " +
+            "lateral_contribution_adists(id, " +
+            "pollutant, edge, begin_rk, end_rk) " +
             "VALUES (" +
             f"{self.id}, {self._pollutant}, {self.edge}, " +
             f"{self._begin_rk}, {self._end_rk}" +
@@ -212,4 +218,3 @@ class LateralContributionAdisTS(SQLSubModel):
     def end_rk(self, end_rk):
         self._end_rk = end_rk
         self._status.modified()
-

src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py

@@ -22,7 +22,9 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Except import NotImplementedMethodeError
 
-from Model.LateralContributionsAdisTS.LateralContributionAdisTS import LateralContributionAdisTS
+from Model.LateralContributionsAdisTS.LateralContributionAdisTS \
+    import LateralContributionAdisTS
+
 
 class LateralContributionsAdisTSList(PamhyrModelList):
     _sub_classes = [

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -30,11 +30,13 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class OutputRKAdists(SQLSubModel):
     _sub_classes = []
     _id_cnt = 0
 
-    def __init__(self, id: int = -1, reach = None, rk = None, title: str = "",  status=None):
+    def __init__(self, id: int = -1, reach=None,
+                 rk=None, title: str = "",  status=None):
         super(OutputRKAdists, self).__init__()
 
         self._status = status
@@ -79,7 +81,6 @@ class OutputRKAdists(SQLSubModel):
         self._title = title
         self._status.modified()
 
-
     @classmethod
     def _db_create(cls, execute):
 
@@ -156,9 +157,3 @@ class OutputRKAdists(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-

src/Model/Pollutants/Pollutants.py

@@ -30,6 +30,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class Pollutants(SQLSubModel):
     _sub_classes = []
     _id_cnt = 0
@@ -138,7 +139,8 @@ class Pollutants(SQLSubModel):
     def _db_save(self, execute, data=None):
 
         execute(f"DELETE FROM Pollutants WHERE id = {self.id}")
-        execute(f"DELETE FROM Pollutants_characteristics WHERE pollutant = {self.id}")
+        execute(f"DELETE FROM Pollutants_characteristics" +
+                f" WHERE pollutant = {self.id}")
 
         sql = (
             "INSERT INTO " +
@@ -177,10 +179,3 @@ class Pollutants(SQLSubModel):
 
     def __len__(self):
         return len(self._data)
-
-
-
-
-
-
-

src/Model/Results/ResultsAdisTS.py

@@ -16,7 +16,8 @@
 
 import logging
 import numpy as np
-import os, glob
+import os
+import glob
 
 from copy import deepcopy
 from datetime import datetime
@@ -41,16 +42,17 @@ class Results(object):
             "creation_date": datetime.now(),
         }
         repertory_results = os.path.join(repertory, "resultats")
-        self._pollutants_list = [el.split("/")[-1][0:-4] for el in glob.glob(repertory_results + "/*.bin")]
+        self._pollutants_list = [
+            el.split("/")[-1][0:-4]
+            for el in glob.glob(repertory_results + "/*.bin")
+            ]
 
         self.type_pol = type_pol
 
         if type_pol == 7:
             self._phys_var_list = ["C", "G", "M", "D", "L", "N", "R"]
         else:
-            self._phys_var_list = ["C"] #, "G", "M", "D"]
+            self._phys_var_list = ["C"]
-
-        print("*********files names resultats from Results Object: ", self._pollutants_list)
 
     @property
     def date(self):

src/Model/River.py

@@ -47,9 +47,12 @@ from Solver.Solvers import solver_type_list
 
 from Model.OutputRKAdists.OutputRKListAdists import OutputRKAdistsList
 from Model.Pollutants.PollutantsList import PollutantsList
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList import InitialConditionsAdisTSList
+from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList \
-from Model.BoundaryConditionsAdisTS.BoundaryConditionsAdisTSList import BoundaryConditionsAdisTSList
+    import InitialConditionsAdisTSList
-from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList import LateralContributionsAdisTSList
+from Model.BoundaryConditionsAdisTS.BoundaryConditionsAdisTSList \
+    import BoundaryConditionsAdisTSList
+from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList \
+    import LateralContributionsAdisTSList
 from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
 from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
 
@@ -268,9 +271,12 @@ class River(Graph, SQLSubModel):
         self._rep_lines = REPLineList(status=self._status)
         self._Output_rk_adists = OutputRKAdistsList(status=self._status)
         self._Pollutants = PollutantsList(status=self._status)
-        self._InitialConditionsAdisTS = InitialConditionsAdisTSList(status=self._status)
+        self._InitialConditionsAdisTS = InitialConditionsAdisTSList(
-        self._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList(status=self._status)
+            status=self._status)
-        self._LateralContributionsAdisTS = LateralContributionsAdisTSList(status=self._status)
+        self._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList(
+            status=self._status)
+        self._LateralContributionsAdisTS = LateralContributionsAdisTSList(
+            status=self._status)
         self._D90AdisTS = D90AdisTSList(status=self._status)
         self._DIFAdisTS = DIFAdisTSList(status=self._status)
 
@@ -353,11 +359,14 @@ class River(Graph, SQLSubModel):
 
         new._Pollutants = PollutantsList._db_load(execute, data)
 
-        new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(execute, data)
+        new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(
+            execute, data)
 
-        new._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList._db_load(execute, data)
+        new._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList._db_load(
+            execute, data)
 
-        new._LateralContributionsAdisTS = LateralContributionsAdisTSList._db_load(execute, data)
+        new._LateralContributionsAdisTS = \
+            LateralContributionsAdisTSList._db_load(execute, data)
 
         new._D90AdisTS = D90AdisTSList._db_load(execute, data)
 

src/View/ui/OutputKpAdisTS.ui

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>450</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Hydraulic structures</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <widget class="QSplitter" name="splitter_2">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <widget class="QWidget" name="verticalLayoutWidget_3">
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QTableView" name="tableView">
-          <property name="minimumSize">
-           <size>
-            <width>300</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="baseSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="leftMargin">
-           <number>5</number>
-          </property>
-          <item>
-           <widget class="QCheckBox" name="checkBox">
-            <property name="text">
-             <string>Enable / Disable Output RK AdisTS</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QSplitter" name="splitter">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <widget class="QWidget" name="verticalLayoutWidget">
-        <layout class="QVBoxLayout" name="verticalLayout"/>
-       </widget>
-       <widget class="QWidget" name="verticalLayoutWidget_2">
-        <layout class="QVBoxLayout" name="verticalLayout_2"/>
-       </widget>
-      </widget>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>800</width>
-     <height>22</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <widget class="QToolBar" name="toolBar">
-   <property name="windowTitle">
-    <string>toolBar</string>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="action_add"/>
-   <addaction name="action_delete"/>
-  </widget>
-  <action name="action_add">
-   <property name="icon">
-    <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Add</string>
-   </property>
-   <property name="toolTip">
-    <string>Add a new point</string>
-   </property>
-  </action>
-  <action name="action_delete">
-   <property name="icon">
-    <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
-   </property>
-   <property name="text">
-    <string>Delete</string>
-   </property>
-   <property name="toolTip">
-    <string>Delete points</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections/>
-</ui>