wolfhece 1.8.13__py3-none-any.whl → 2.0.0__py3-none-any.whl

wolfhece/RatingCurve.py

@@ -19,6 +19,7 @@ except:
 from .PyTranslate import _
 from .PyVertex import circle,quad,cross,getRGBfromI,getIfromRGB
 from .RatingCurveData import *
+from .drawing_obj import Element_To_Draw
 
 POLYNOMIAL_LAW=0
 POWER_LAW=1
@@ -361,9 +362,9 @@ class SPWGaugings(gaugings):
                 """
         super().__init__(data)
 
-class SPWMIGaugingStations():
+class SPWMIGaugingStations(Element_To_Draw):
 
-    mystations:dict
+    mystations:dict[int:gaugingstation]
     myrivers:dict
     gaugings:SPWGaugings
     hrefs:SPWhrefs
@@ -486,11 +487,23 @@ class SPWMIGaugingStations():
 
         pass
 
-    def plot(self,size:float=10.):
-        for id in self.mystations:
-            self.mystations[id].plot(size)
+    def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size:float=10.):
+        self._plot(size)
+
+    def find_minmax(self,update=False):
+        x = [cur.x for cur in self.mystations.values()]
+        y = [cur.y for cur in self.mystations.values()]
+
+        self.xmin = min(x)
+        self.xmax = max(x)
+        self.ymin = min(y)
+        self.ymax = max(y)
+
+    def _plot(self, size:float=10.):
+        for curstation in self.mystations.values:
+            curstation.plot(size)
 
-class SPWDCENNGaugingStations():
+class SPWDCENNGaugingStations(Element_To_Draw):
 
     mystations:dict
     myrivers:dict

wolfhece/apps/wolf2D.py

@@ -0,0 +1,11 @@
+import wx
+from wolfhece.PyGui import Wolf2DModel
+
+def main():
+    ex = wx.App()
+    mydro=Wolf2DModel()
+    ex.MainLoop()
+
+if __name__=='__main__':
+    main()
+    

wolfhece/apps/wolfcompare2Darrays.py

@@ -2,6 +2,8 @@
 from os import path
 import sys
 import wx
+from pathlib import Path
+from typing import Union
 
 #Import des modules WOLF
 try:
@@ -13,11 +15,25 @@ except:
     from wolfhece.PyDraw import WolfMapViewer
     from wolfhece.wolf_array import WolfArray
 
-def main(strmydir='',ListArrays=None):
+def main(mydir:Path=None, ListArrays:list[WolfArray]=None):
     """Comparaison de 2 cartes WOLF
     args :
-        - strmydir : répertoire contenant 2 matrices WOLF (1.bin et 2.bin) et leurs fichiers accompagant
+        - mydir : répertoire contenant 2 matrices WOLF (ref.bin et comp.bin) et leurs fichiers accompagant
+        - ListArrays : liste de 2 objets WolfArray
     """
+    if mydir is not None:
+        assert isinstance(mydir,Path), _('mydir must be a Path object')
+        assert mydir.exists(), _('mydir must exist')
+        fileref = Path(path.join(mydir,'ref.bin'))
+        filecomp = Path(path.join(mydir,'comp.bin'))
+        assert fileref.exists(), _('ref.bin not found in directory')
+        assert filecomp.exists(), _('comp.bin not found in directory')
+    if ListArrays is not None:
+        assert isinstance(ListArrays,list), _('ListArrays must be a list')
+        assert len(ListArrays)==2, _('ListArrays must contain 2 WolfArray objects')
+        assert isinstance(ListArrays[0],WolfArray), _('ListArrays must contain 2 WolfArray objects')
+        assert isinstance(ListArrays[1],WolfArray), _('ListArrays must contain 2 WolfArray objects') 
+
     #Déclaration de l'App WX
     ex = wx.App()
     #Choix de la langue
@@ -30,32 +46,31 @@ def main(strmydir='',ListArrays=None):
     third = WolfMapViewer(None,'Third',w=600,h=600)
 
     #Création d'une liste contenant les 3 instances d'objet "WolfMapViewer"
-    list=[]
-    list.append(first)
-    list.append(second)
-    list.append(third)
+    mylist:list[WolfMapViewer]=[]
+    mylist.append(first)
+    mylist.append(second)
+    mylist.append(third)
 
     #On indique que les objets sont liés en actiavt le Booléen et en pointant la liste précédente
-    for curlist in list:
+    for curlist in mylist:
         curlist.linked=True
-        curlist.linkedList=list
+        curlist.linkedList=mylist
 
-    if strmydir!='':
+    if mydir is not None:
         #Création des matrices WolfArray sur base des fichiers
-        mnt = WolfArray(path.join(strmydir,'1.bin'))
-        mns = WolfArray(path.join(strmydir,'2.bin'))
+        mnt = WolfArray(path.join(mydir,'ref.bin'))
+        mns = WolfArray(path.join(mydir,'comp.bin'))
     elif ListArrays is not None:
-        if len(ListArrays)==2:
-            mnt = ListArrays[0]
-            mns = ListArrays[1]
+        mnt = ListArrays[0]
+        mns = ListArrays[1]
 
     #Création du différentiel -- Les opérateurs mathématiques sont surchargés
     diff = mns-mnt
 
     #Ajout des matrices dans les fenêtres de visualisation
-    first.add_object('array',newobj=mnt,ToCheck=True,id='MNT')
-    second.add_object('array',newobj=mns,ToCheck=True,id='MNS')
-    third.add_object('array',newobj=diff,ToCheck=True,id='DIFF')
+    first.add_object('array',newobj=mnt,ToCheck=True,id='reference')
+    second.add_object('array',newobj=mns,ToCheck=True,id='comparison')
+    third.add_object('array',newobj=diff,ToCheck=True,id='DIFF = comp-ref')
 
     #boucle infinie pour gérer les événements GUI
     ex.MainLoop()
@@ -64,10 +79,24 @@ if __name__=='__main__':
     """gestion de l'éxécution du module en tant que code principal"""
     # total arguments
     n = len(sys.argv)
+    # arguments
+    print("Total arguments passed:", n)
+    assert n in [2,3], _('Usage : wolfcompare <directory> or wolfcompare <file1> <file2>')
+    
     if n==2:
-        mydir = sys.argv[1]
-        if path.exists(mydir):
+        mydir = Path(sys.argv[1])
+        if mydir.exists():
             main(mydir)
-    else:
-        if path.exists('d:\\compare'):
-            main('d:\\compare')
+        else:
+            print(_('Directory not found'))
+    elif n==3:
+        file1 = Path(sys.argv[1])
+        file2 = Path(sys.argv[2])
+
+        if file1.exists() and file2.exists():
+            main('', [WolfArray(file1), WolfArray(file2)])
+        else:
+            if not file1.exists():
+                print(_('File {} not found'.format(file1)))
+            if not file2.exists():
+                print(_('File {} not found'.format(file2)))