wolfhece 2.0.45__py3-none-any.whl → 2.0.47__py3-none-any.whl

wolfhece/PyVertexvectors.py

@@ -317,27 +317,30 @@ class Triangulation(Element_To_Draw):
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None ):
 
         if self.id_list == -99999:
-            self.id_list = glGenLists(1)
+            try:
+                self.id_list = glGenLists(1)
 
-            glNewList(self.id_list, GL_COMPILE)
+                glNewList(self.id_list, GL_COMPILE)
 
-            glPolygonMode(GL_FRONT_AND_BACK,GL_LINE)
+                glPolygonMode(GL_FRONT_AND_BACK,GL_LINE)
 
-            for curtri in self.tri:
-                glBegin(GL_LINE_STRIP)
+                for curtri in self.tri:
+                    glBegin(GL_LINE_STRIP)
 
-                glColor3ub(int(0),int(0),int(0))
+                    glColor3ub(int(0),int(0),int(0))
 
-                glVertex2d(self.pts[curtri[0]][0], self.pts[curtri[0]][1])
-                glVertex2d(self.pts[curtri[1]][0], self.pts[curtri[1]][1])
-                glVertex2d(self.pts[curtri[2]][0], self.pts[curtri[2]][1])
-                glVertex2d(self.pts[curtri[0]][0], self.pts[curtri[0]][1])
+                    glVertex2d(self.pts[curtri[0]][0], self.pts[curtri[0]][1])
+                    glVertex2d(self.pts[curtri[1]][0], self.pts[curtri[1]][1])
+                    glVertex2d(self.pts[curtri[2]][0], self.pts[curtri[2]][1])
+                    glVertex2d(self.pts[curtri[0]][0], self.pts[curtri[0]][1])
 
-                glEnd()
+                    glEnd()
 
-            glPolygonMode(GL_FRONT_AND_BACK,GL_LINE)
+                glPolygonMode(GL_FRONT_AND_BACK,GL_LINE)
 
-            glEndList()
+                glEndList()
+            except:
+                logging.warning('Problem with OpenGL plot - Triangulation.plot')
         else:
             glCallList(self.id_list)
 
@@ -1539,9 +1542,15 @@ class vector:
             logging.warning(_('No mapviewer available for image plot'))
             return
 
-        if self.myprop.imagevisible and self.myprop.textureimage is not None:
+        if self.myprop.imagevisible:
+            
+            if self.myprop.textureimage is None:
+                self.myprop.load_unload_image()
 
-            self.myprop.textureimage.paint()
+            if self.myprop.textureimage is not None:
+                self.myprop.textureimage.paint()
+            else:
+                logging.warning(_('No image texture available for plot'))
 
     def _get_textfont(self):
         """ Retunr a 'Text_Infos' instance for the legend """
@@ -2434,18 +2443,21 @@ class zone:
         :param prep: True = préparation des listes OpenGL ; False = affichage direct
         """
         if prep:
-            if self.idgllist==-99999:
-                self.idgllist = glGenLists(1)
+            try:
+                if self.idgllist==-99999:
+                    self.idgllist = glGenLists(1)
 
-            self.has_legend = False
-            self.has_image  = False
+                self.has_legend = False
+                self.has_image  = False
 
-            glNewList(self.idgllist,GL_COMPILE)
-            for curvect in self.myvectors:
-                curvect.plot()
-                self.has_legend |= curvect.myprop.legendvisible
-                self.has_image  |= curvect.myprop.imagevisible
-            glEndList()
+                glNewList(self.idgllist,GL_COMPILE)
+                for curvect in self.myvectors:
+                    curvect.plot()
+                    self.has_legend |= curvect.myprop.legendvisible
+                    self.has_image  |= curvect.myprop.imagevisible
+                glEndList()
+            except:
+                logging.error(_('OpenGL error in zone.plot'))
         else:
             if self.idgllist!=-99999:
                 glCallList(self.idgllist)
@@ -3794,7 +3806,7 @@ class Zones(wx.Frame, Element_To_Draw):
             if find_minmax:
                 self.find_minmax(True)
 
-        if plotted and self.has_OGLContext: 
+        if plotted and self.has_OGLContext:
             self.prep_listogl()
 
     @property

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 0
-        self.patch = 45
+        self.patch = 47
 
     def __str__(self):
 

wolfhece/hydrology/Comparison.py

@@ -66,11 +66,11 @@ class Comparison:
     def compare_now(self):
 
         # Check and run all the functions to use
-        if(int(self.dictToCompar['hydro subbasin']['value']) == 1):
+        if(int(self.dictToCompar['hydro subbasin'][key_Param.VALUE]) == 1):
             self.hydro_subbasin()
-        if(int(self.dictToCompar['hydro junction']['value']) == 1):
+        if(int(self.dictToCompar['hydro junction'][key_Param.VALUE]) == 1):
             self.hydro_junction()
-        if(int(self.dictToCompar['hydro final']['value']) == 1):
+        if(int(self.dictToCompar['hydro final'][key_Param.VALUE]) == 1):
             self.hydro_final()
 
 
@@ -955,8 +955,10 @@ class Comparison:
             beginDateRB = []
             endDateRB = []
             for ii in range(nbCatchment):
-                beginDateRB.append(beginDate[ii] - timeDelay[ii])   # A ameliorer!!!
-                endDateRB.append(endDate[ii] - timeDelay[ii])
+                # beginDateRB.append(beginDate[ii] - timeDelay[ii])   # A ameliorer!!!
+                # endDateRB.append(endDate[ii] - timeDelay[ii])
+                beginDateRB.append(beginDate[ii])   # A ameliorer!!!
+                endDateRB.append(endDate[ii])
 
 
                 if("Station Name" in plotDict[RBNames[id]]):

wolfhece/hydrology/Optimisation.py

@@ -378,35 +378,35 @@ class Optimisation(wx.Frame):
                 print("ERROR : in path of launcherDir")
             newCase.read_param(launcherDir, copyDefault=False, callback=self.update_parameters_launcher)
             # FIXME TO CHANGE when seperation with the GUI
-            # if self.wx_exists:
-            #     newId = wx.Window.NewControlId()
-            #     iMenu = self.MenuBar.FindMenu('Param files')
-            #     paramMenu = self.MenuBar.Menus[iMenu][0]
-            #     curName = 'Case '+str(i+1)
-            #     iItem = self.MenuBar.FindMenuItem('Param files', curName)
-            #     if(iItem==wx.NOT_FOUND):
-            #         caseMenu = wx.Menu()
-            #         paramCaseFile = caseMenu.Append(wx.ID_ANY, 'launcher.param')
-            #         self.Bind(wx.EVT_MENU, newCase.show_launcherParam, paramCaseFile)
-            #         guiHydroCase = caseMenu.Append(wx.ID_ANY, 'GUI Hydro')
-            #         refDir = newCase.launcherParam.get_param("Calculs","Répertoire simulation de référence")
-            #         isOk, refDir = check_path(refDir, prefix=launcherDir, applyCWD=True)
-            #         if isOk<0:
-            #             print("ERROR : in path of launcherDir")
-            #         newCase.mydro = HydrologyModel(dir=refDir)
-            #         newCase.mydro.Hide()
-            #         self.Bind(wx.EVT_MENU, newCase.show_mydro, guiHydroCase)
-            #         curCase = paramMenu.Append(newId, curName, caseMenu)
-            #     else:
-            #         print("WARNING : this scenario was not implemented yet. This might induce an error!")
-            #         # iItem = 
-            #         curCase = paramMenu.Replace(iItem)
-            # else:
-            #     refDir = newCase.launcherParam.get_param("Calculs","Répertoire simulation de référence")
-            #     isOk, refDir = check_path(refDir, prefix=launcherDir, applyCWD=True)
-            #     newCase.mydro = HydrologyModel(dir=refDir)
-            # self.Bind(wx.EVT_MENU, newCase.show_launcherParam, curCase)
-            # newCase.idMenuItem = newId
+            if self.wx_exists:
+                newId = wx.Window.NewControlId()
+                iMenu = self.MenuBar.FindMenu('Param files')
+                paramMenu = self.MenuBar.Menus[iMenu][0]
+                curName = 'Case '+str(i+1)
+                iItem = self.MenuBar.FindMenuItem('Param files', curName)
+                if(iItem==wx.NOT_FOUND):
+                    caseMenu = wx.Menu()
+                    paramCaseFile = caseMenu.Append(wx.ID_ANY, 'launcher.param')
+                    self.Bind(wx.EVT_MENU, newCase.show_launcherParam, paramCaseFile)
+                    guiHydroCase = caseMenu.Append(wx.ID_ANY, 'GUI Hydro')
+                    refDir = newCase.launcherParam.get_param("Calculs","Répertoire simulation de référence")
+                    isOk, refDir = check_path(refDir, prefix=launcherDir, applyCWD=True)
+                    if isOk<0:
+                        print("ERROR : in path of launcherDir")
+                    newCase.mydro = HydrologyModel(dir=refDir)
+                    newCase.mydro.Hide()
+                    self.Bind(wx.EVT_MENU, newCase.show_mydro, guiHydroCase)
+                    curCase = paramMenu.Append(newId, curName, caseMenu)
+                else:
+                    print("WARNING : this scenario was not implemented yet. This might induce an error!")
+                    # iItem = 
+                    curCase = paramMenu.Replace(iItem)
+            else:
+                refDir = newCase.launcherParam.get_param("Calculs","Répertoire simulation de référence")
+                isOk, refDir = check_path(refDir, prefix=launcherDir, applyCWD=True)
+                newCase.mydro = HydrologyModel(dir=refDir)
+            self.Bind(wx.EVT_MENU, newCase.show_launcherParam, curCase)
+            newCase.idMenuItem = newId
             self.myCases.append(newCase)
 
 

wolfhece/hydrology/RetentionBasin.py

@@ -387,10 +387,10 @@ class RetentionBasin():
                 self.inlets += curObj.get_outFlow(typeOutFlow="Net", whichOutFlow=nameOutFlow, lag=deltaTr)
                 self.inletsRaw += curObj.get_outFlow(typeOutFlow="Raw", whichOutFlow=nameOutFlow, lag=deltaTr)
         elif(givenInlet != []):
-            if(len(givenInlet)!=len(self.time)-1):
+            if(len(givenInlet)!=len(self.time)):
                 print("ERROR: the dimension of the time array and the given inlet are not the same!")
                 print("Length optained = ", len(givenInlet))
-                print("Length expected = ", len(self.time)-1)
+                print("Length expected = ", len(self.time))
                 sys.exit()
             self.inlets = givenInlet
             self.inletsRaw = givenInlet
@@ -468,10 +468,10 @@ class RetentionBasin():
 
         elif(givenDirectFluxIn != []):
             # FIXME The following line to potentially change !!!
-            if(len(givenDirectFluxIn)!=len(self.time)-1):
+            if(len(givenDirectFluxIn)!=len(self.time)):
                 print("ERROR: the dimension of the time array and the given inlet are not the same!")
                 print("Length optained = ", len(givenDirectFluxIn))
-                print("Length expected = ", len(self.time)-1)
+                print("Length expected = ", len(self.time))
                 sys.exit()
             self.directFluxInRB = givenDirectFluxIn
             self.directFluxInRB_Raw = givenDirectFluxIn

{wolfhece-2.0.45.dist-info → wolfhece-2.0.47.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.45
-Author-email: Stéphane Champailler <stephane.champailler@uliege.be>, Pierre Archambeau <pierre.archambeau@uliege.be>
+Version: 2.0.47
+Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
+License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: Microsoft :: Windows :: Windows 10
 Classifier: Operating System :: Microsoft :: Windows :: Windows 11
 Classifier: Topic :: Scientific/Engineering :: Physics

{wolfhece-2.0.45.dist-info → wolfhece-2.0.47.dist-info}/RECORD

@@ -15,7 +15,7 @@ wolfhece/PyParams.py,sha256=-0cax_Db6kFTe46BAgT24Ga2Xyp2Dm3gpuI-5uUSMxw,84758
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=OFo8VFxTSViWSTzv2paHeJ9O5BkFUyamXrRPFamlWoU,39630
-wolfhece/PyVertexvectors.py,sha256=D3de7UejUy4GB2cnML06Lsijcr5_gvh5TqVETP4cus4,216885
+wolfhece/PyVertexvectors.py,sha256=T3k8gIZA5Z89hfgJaV90sNeUbc31Shw3ZiOlmcTwl4g,217423
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -66,7 +66,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=HLi1f5dAiipcutPIZt-xMDmEV3Wly3tlHP0xTFqjT94,388
+wolfhece/apps/version.py,sha256=GU02tpPFaQBxJ6d59qXIRFZRbAPKUWA_xhCGwFLwzi0,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -91,13 +91,13 @@ wolfhece/fonts/sanserif.ttf,sha256=Nvv5eMgTl5-bWgV37B7E1-vZpAZPNJwjtJSzMNDrl9A,4
 wolfhece/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,5223
 wolfhece/hydrology/Catchment.py,sha256=1ZrAPyXhy23ENbhSf9e2-D-Y-jNkof--L6R6B-BgHBo,135021
-wolfhece/hydrology/Comparison.py,sha256=TxWTRmJ7qDfdCZ9ciPpANqTYcaoRVezkpByon8_IgiU,82064
+wolfhece/hydrology/Comparison.py,sha256=vO9ogoZA8qzG57pg1AdHNL9HWgCCY8-5wqPyCgj1ucg,82209
 wolfhece/hydrology/Dumping.py,sha256=GKYvkKgCfJQT1XEF1ceh7evdhlpZRPcuf6VlBdH-TaM,2085
-wolfhece/hydrology/Optimisation.py,sha256=RKbHCzzFcLsccIsnHCA7M6i4Ok0TiIYJrMPBIih3Rlk,138794
+wolfhece/hydrology/Optimisation.py,sha256=kpfR-krMRzANU96Mn4H2kroIuEmMWns8quEnLSFGB8E,138736
 wolfhece/hydrology/Outlet.py,sha256=fpetH2ZKnTKIBNuVclxrncc5OAxWUGI5_ed9gXh6fD4,10201
 wolfhece/hydrology/PostProcessHydrology.py,sha256=SiW5FIf8FeQL9ItWG8ODt612k5m59aogSLgpsXinr8I,6944
 wolfhece/hydrology/PyWatershed.py,sha256=K6yz8UquJi51v2nGqWmeo8qs82-QHoa2LYaxwoUBTxM,73914
-wolfhece/hydrology/RetentionBasin.py,sha256=LbIvJxIyRG_r2YLJiBZWtQBWvoUnCLgzh5oCrWz37P4,71513
+wolfhece/hydrology/RetentionBasin.py,sha256=UZiHvygNEMfNdaK49CX3y8jzqwkThwwniS9ob1BTECs,71505
 wolfhece/hydrology/SubBasin.py,sha256=ZXEJwUDAsa6nGtdPVuzjEH3CCZu6V4fZhRCujWr1ACY,169749
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=nRn4IuQ1FZakQtS6z9IpVHeudMfU_7KQ66LCxY6NX4k,1227
@@ -158,8 +158,6 @@ wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqa
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
 wolfhece/libs/WolfDll.dll,sha256=3--r0CVWTsb_st6oMf0AyP6OyTNPj9b4kl0g_-cAwi0,132934144
-wolfhece/libs/WolfDll_CD.dll,sha256=kC1svCwD1qSmppsiVfHwDkIvoJO_1l6TG1GfIxgiqQQ,131415040
-wolfhece/libs/WolfDll_debug.dll,sha256=-vrycGENtxj_GxX1n1vWBoamAfVCicPETKovk1LrIbU,74528256
 wolfhece/libs/WolfOGL.c,sha256=tBWGfpFFe8gfRjImUUlqdxhcRpQ6ytEWU7Z6PC0v9as,1085242
 wolfhece/libs/WolfOGL.pyx,sha256=kc1uxbO2wQx0Qoe7BVQnqTJgUWYx_Vtf1wzXMxzf8bI,65911
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
@@ -258,8 +256,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.0.45.dist-info/METADATA,sha256=e9hmw9J3Mu4IQcCW2FiI2cJwYUAaHGCRCUf2gvSwnro,2262
-wolfhece-2.0.45.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.0.45.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.0.45.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.45.dist-info/RECORD,,
+wolfhece-2.0.47.dist-info/METADATA,sha256=dJFIlRUAXTIyvBqN11Wi44FxC7LY6fILWOjeJjvDfqg,2233
+wolfhece-2.0.47.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.0.47.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.47.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.47.dist-info/RECORD,,