wolfhece 2.1.127__py3-none-any.whl → 2.1.129__py3-none-any.whl

wolfhece/PyDraw.py

@@ -875,7 +875,7 @@ class Sim_Explorer(wx.Frame):
         right_bar.Add(self._texttime, 1, wx.EXPAND | wx.ALL, 5)
         self._texttime.Bind(wx.EVT_TEXT, self.OnTextTime)
 
-        self._step_time = wx.ListBox(self._panel, choices=['{:.3f} - {}'.format(i, datetime.strftime(self._starting_date + timedelta(seconds=i), '%Y-%m-%d %H:%M:%S')) for i in self._all_times_steps[0]], style=wx.LB_SINGLE)
+        self._step_time = wx.ListBox(self._panel, choices=['{:.3f} - {}'.format(i, datetime.strftime(self._starting_date + timedelta(seconds=float(i)), '%Y-%m-%d %H:%M:%S')) for i in self._all_times_steps[0]], style=wx.LB_SINGLE)
         self._step_time.Bind(wx.EVT_LISTBOX, self.OnSelectNumStep)
         right_bar.Add(self._step_time, 1, wx.EXPAND | wx.ALL, 5)
 
@@ -9709,7 +9709,7 @@ class WolfMapViewer(wx.Frame):
                     if ret == wx.ID_YES:
                         loadhead = True
 
-                    types = None
+                    newobj = cloud_vertices(filename, header=loadhead, mapviewer=self)
 
                 elif filename.endswith('.dxf'):
                     types = ['POLYLINE','LWPOLYLINE','LINE', 'MTEXT', 'INSERT']
@@ -9725,7 +9725,56 @@ class WolfMapViewer(wx.Frame):
                     types = [types[i] for i in dlg.GetSelections()]
                     dlg.Destroy()
 
-                newobj = cloud_vertices(filename, header=loadhead, mapviewer=self, dxf_imported_elts=types)
+                    newobj = cloud_vertices(filename, header=loadhead, mapviewer=self, dxf_imported_elts=types)
+
+                elif filename.endswith('.shp'):
+
+                    types = None
+
+                    if Path(filename).stem == 'Vesdre_Bridges':
+                        # We need to import the bridges from the clogging study/database
+                        data = gpd.read_file(filename)
+
+                        #filter 'Clogging' == Yes
+                        clogged = data[data['Clogging'] == 'Yes']
+                        unclogged = data[data['Clogging'] == 'No']
+                        notsure = data[data['Clogging'] == 'No information']
+
+                        from tempfile import TemporaryDirectory
+                        with TemporaryDirectory() as tmpdirname:
+                            clogged.to_file(tmpdirname + '/clogged.shp')
+                            unclogged.to_file(tmpdirname + '/unclogged.shp')
+                            notsure.to_file(tmpdirname + '/notsure.shp')
+
+                            newobj = cloud_vertices(tmpdirname + '/unclogged.shp', header=loadhead, mapviewer=self, idx='unclogged')
+                            self.myclouds.append(newobj)
+                            newobj.set_mapviewer(self)
+                            newobj.myprop.color = (0,255,0)
+                            newobj.myprop.size = 10
+
+                            myitem = self.treelist.AppendItem(curtree, newobj.idx, data=newobj)
+                            self.treelist.CheckItem(myitem)
+                            self.treelist.CheckItem(self.treelist.GetItemParent(myitem))
+                            newobj.check_plot()
+
+                            newobj = cloud_vertices(tmpdirname + '/notsure.shp', header=loadhead, mapviewer=self, idx='notsure')
+                            self.myclouds.append(newobj)
+                            newobj.set_mapviewer(self)
+                            newobj.myprop.color = (0,0,255)
+                            newobj.myprop.size = 10
+
+                            myitem = self.treelist.AppendItem(curtree, newobj.idx, data=newobj)
+                            self.treelist.CheckItem(myitem)
+                            self.treelist.CheckItem(self.treelist.GetItemParent(myitem))
+                            newobj.check_plot()
+
+                            newobj = cloud_vertices(tmpdirname + '/clogged.shp', header=loadhead, mapviewer=self, idx='clogged')
+                            newobj.myprop.color = (255,0,0)
+                            newobj.myprop.size = 15
+                            id = 'clogged'
+
+                    else:
+                        newobj = cloud_vertices(filename, header=loadhead, mapviewer=self)
 
             self.myclouds.append(newobj)
             self.active_cloud = newobj

wolfhece/PyPalette.py

@@ -109,6 +109,34 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
         else:
             return self(xloc, bytes=True)
 
+    def get_rgba_oneval(self, x: float):
+        """Récupération de la couleur en fonction de la valeur x"""
+
+        dval = self.values[-1]-self.values[0]
+        if dval == 0.:
+            dval = 1.
+        xloc = (x-self.values[0])/dval
+
+        if self.interval_cst:
+            rgba = np.ones((4), dtype=np.uint8)
+
+            if xloc < 0.:
+                rgba = self.colormin_uint8
+            elif xloc >= 1.:
+                rgba = self.colormax_uint8
+            else:
+                for i in range(self.nb-1):
+                    val1 = (self.values[i]-self.values[0])/dval
+                    val2 = (self.values[i+1]-self.values[0])/dval
+                    if (xloc >= val1) & (xloc < val2):
+                        c1 = self.colorsuint8[i]
+                        rgba = c1
+                        break
+
+            return rgba
+        else:
+            return self(xloc, bytes=True)
+
     def export_palette_matplotlib(self, name):
         cmaps = OrderedDict()
         cmaps['Perceptually Uniform Sequential'] = ['viridis', 'plasma', 'inferno', 'magma', 'cividis']
@@ -213,6 +241,14 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
 
         self.fill_segmentdata()
 
+    def get_ScalarMappable_mpl(self):
+        """ Récupération de l'objet ScalarMappable via Matplotlib """
+        if self.interval_cst:
+            discrete_cmap = ListedColormap(self.colorsflt[:, :3])
+            colorbar = ScalarMappable(BoundaryNorm(self.values, ncolors=self.nb-1), cmap=discrete_cmap)
+        else:
+            return ScalarMappable(Normalize(self.values[0], self.values[-1]), cmap=self)
+
     def export_image(self, fn='', h_or_v: typing.Literal['h', 'v', ''] = '', figax=None):
         """
         Export image from colormap

wolfhece/PyParams.py

@@ -753,7 +753,7 @@ class Wolf_Param(wx.Frame):
     def SavetoFile(self, event:wx.MouseEvent):
         """ sauvegarde dans le fichier texte """
 
-        self.save()
+        self.Save()
 
     def Save(self, filename:str = ''):
         """ Save the parameters in a file """
@@ -1308,7 +1308,7 @@ class Wolf_Param(wx.Frame):
             posSep2 = positions[-1] #nameStr[posSep1+1:].find("$")
 
             # select the string between the two '$'
-            iterCode = nameStr[posSep1:posSep1+posSep2+1]
+            iterCode = nameStr[posSep1:posSep2+1]
 
             positions_left = [i for i, char in enumerate(iterCode) if char == "("]
             positions_right = [i for i, char in enumerate(iterCode) if char == ")"]
@@ -1973,10 +1973,14 @@ class Wolf_Param(wx.Frame):
         elif not self.is_in_active(group, name) and self.is_in_default(group, name):
             # le paramètre est dans les paramètres par défaut mais pas dans les paramètres actifs --> on l'ajoute
             default_value = self.myparams_default[group][name]
+            if key_Param.ADDED_JSON in default_value.keys():
+                json = default_value[key_Param.ADDED_JSON]
+            else:
+                json = None
             self.add_param(group, name, value,
                            default_value[key_Param.TYPE],
                            comment=default_value[key_Param.COMMENT],
-                           jsonstr=default_value[key_Param.ADDED_JSON],
+                           jsonstr=json,
                            whichdict='Active')
         elif self.is_in_active(group, name):
             param = self.myparams[group][name]