wolfhece 2.1.52__py3-none-any.whl → 2.1.54__py3-none-any.whl

wolfhece/PyDraw.py

@@ -179,7 +179,7 @@ class DragdropFileTarget(wx.FileDropTarget):
                     id = id + '_1'
 
                 try:
-                    newobj = WolfArray(fname=name)
+                    newobj = WolfArray(fname=name, mapviewer= self.window)
                     self.window.add_object('array', newobj = newobj, id  = id)
                 except:
                     logging.error(_('Error while loading array : ') + name)
@@ -191,7 +191,7 @@ class DragdropFileTarget(wx.FileDropTarget):
                     id = id + '_1'
 
                 try:
-                    newobj = WolfArrayMB(fname=name)
+                    newobj = WolfArrayMB(fname=name, mapviewer= self.window)
                     self.window.add_object('array', newobj = newobj, id  = id)
                 except:
                     logging.error(_('Error while loading array : ') + name)
@@ -203,7 +203,7 @@ class DragdropFileTarget(wx.FileDropTarget):
                     id = id + '_1'
 
                 try:
-                    newobj = Zones(filename=name, parent=self.window)
+                    newobj = Zones(filename=name, parent=self.window, mapviewer=self.window)
                     self.window.add_object('vector', newobj = newobj, id  = id)
                 except:
                     logging.error(_('Error while loading vector : ') + name)
@@ -247,7 +247,7 @@ class WolfMapViewer(wx.Frame):
     context: GLContext  # context OpenGL
     mytooltip: Wolf_Param  # Objet WOLF permettant l'analyse de ce qui est sous la souris
     treelist: TreeListCtrl  # Gestion des éléments sous forme d'arbre
-    lbl_selecteditem: StaticText
+    _lbl_selecteditem: StaticText
     leftbox: BoxSizer
 
     # DEPRECEATED
@@ -611,7 +611,7 @@ class WolfMapViewer(wx.Frame):
 
         # ajout d'une liste en arbre des objets
         self.treelist = TreeListCtrl(self, style= wx.dataview.TL_CHECKBOX | wx.LC_EDIT_LABELS | wx.TR_FULL_ROW_HIGHLIGHT)
-        self.lbl_selecteditem = StaticText(self, style=wx.ALIGN_CENTER_HORIZONTAL)
+        self._lbl_selecteditem = StaticText(self, style=wx.ALIGN_CENTER_HORIZONTAL)
         self.selected_object = None
 
         self.root = self.treelist.GetRootItem()
@@ -641,17 +641,15 @@ class WolfMapViewer(wx.Frame):
         # dimensionnement et positionnement de l'arbre
         self.leftbox = BoxSizer(orient=wx.VERTICAL)
         self.leftbox.Add(self.treelist, 1, wx.LEFT)
-        self.leftbox.Add(self.lbl_selecteditem, 0, wx.LEFT)
+        self.leftbox.Add(self._lbl_selecteditem, 0, wx.LEFT)
         self.treelist.SetSize(self.treewidth, height)
 
 
         self.CreateStatusBar(1)
 
-        # self.lbl_selecteditem.SetSize(self.treewidth,30)
         self.SetSizer(self.leftbox)
 
         # self.treelist.SetPosition((0,0))
-        # self.lbl_selecteditem.SetPosition((0,height-30))
 
         # fenêtre ToolTip
         self.mytooltip = Wolf_Param(self, "Values", to_read=False, withbuttons=False)
@@ -879,6 +877,8 @@ class WolfMapViewer(wx.Frame):
             aroundlaz = self.menulaz.Append(wx.ID_ANY, _('Plot LAZ around active vector'), _('Display a Matplotlib plot with the LAZ values around the active vector/polyline'),)
             pick_aroundlaz = self.menulaz.Append(wx.ID_ANY, _('Plot LAZ around temporary vector'), _('Display a Matplotlib plot with the LAZ values around a temporary vector/polyline -- Right clicks to add points + Enter'),)
             updatecolors_laz = self.menulaz.Append(wx.ID_ANY, _('Change colors - Classification'), _('Change color map associated to the current classification'),)
+            fillarray_laz = self.menulaz.Append(wx.ID_ANY, _('Fill active array from LAZ data'), _('Fill an array from the LAZ data'),)
+            selectarray_laz = self.menulaz.Append(wx.ID_ANY, _('Select cells in array from LAZ data'), _('Select nodes in active array from the LAZ data'),)
 
     def menu_wolf2d(self):
 
@@ -3885,6 +3885,220 @@ class WolfMapViewer(wx.Frame):
 
         logging.info(_('Clip LAZ grid on current zoom {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
 
+    def select_active_array_from_laz(self, array:WolfArray = None, used_codes:list = None, chunk_size:float = 500.):
+        """ select some nodes from laz data
+
+        :param array: array to fill
+        :param used_codes: codes to use
+        """
+        if self.mylazgrid is None:
+            return
+
+        if array is None:
+            logging.error(_('No array'))
+            return
+
+        if used_codes is None:
+            keycode = [key for key,val in self.mylazgrid.colors.classification.items()]
+            names = [val[0] for key,val in self.mylazgrid.colors.classification.items()]
+
+            with wx.MultiChoiceDialog(None, _('Choose the codes to use'), _('Codes'), names) as dlg:
+                if dlg.ShowModal() == wx.ID_OK:
+                    used_codes = dlg.GetSelections()
+                    used_codes = [float(keycode[cur]) for cur in used_codes]
+                else:
+                    return
+
+        curbounds = array.get_bounds()
+
+        # align bounds on chunk_size
+        curbounds[0][0] = curbounds[0][0] - curbounds[0][0] % chunk_size
+        curbounds[0][1] = curbounds[0][1] + chunk_size - curbounds[0][1] % chunk_size
+        curbounds[1][0] = curbounds[1][0] - curbounds[1][0] % chunk_size
+        curbounds[1][1] = curbounds[1][1] + chunk_size - curbounds[1][1] % chunk_size
+
+        chunck_x = np.arange(curbounds[0][0], curbounds[0][1], chunk_size)
+        chunck_y = np.arange(curbounds[1][0], curbounds[1][1], chunk_size)
+
+        for curx in tqdm(chunck_x, 'Chunks'):
+            for cury in chunck_y:
+                curbounds = [[curx, curx + chunk_size], [cury, cury + chunk_size]]
+
+                logging.info(_('Scan {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
+                self.mylazdata = self.mylazgrid.scan(curbounds)
+                # logging.info(_('Scan done'))
+
+                data = {}
+                for curcode in used_codes:
+                    data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
+
+                for curdata in data.values():
+
+                    if curdata.shape[0] == 0:
+                        continue
+
+                    i,j = array.get_ij_from_xy(curdata[:, 0], curdata[:, 1]) #= np.float32(self.mylazdata[:, 2])
+
+                    keys = np.vstack((i,j)).T
+
+                    # unique keys
+                    keys = np.unique(keys, axis=0)
+
+                    array.SelectionData._add_nodes_to_selectionij(keys, verif = False)
+
+        array.SelectionData.update_nb_nodes_selection()
+        self.Paint()
+
+        logging.info(_('Selection done'))
+
+    def fill_active_array_from_laz(self, array:WolfArray = None, used_codes:list = [], operator:int = -1, chunk_size:float = 500.):
+        """ Fill active array with laz data
+
+        :param array: array to fill
+        :param used_codes: codes to use
+        :param operator: operator to use
+        """
+
+        if self.mylazgrid is None:
+            return
+
+        if array is None:
+            logging.error(_('No array'))
+            return
+
+        if len(used_codes) == 0 :
+            keycode = [key for key,val in self.mylazgrid.colors.classification.items()]
+            names = [val[0] for key,val in self.mylazgrid.colors.classification.items()]
+
+            with wx.MultiChoiceDialog(None, _('Choose the codes to use'), _('Codes'), names) as dlg:
+                if dlg.ShowModal() == wx.ID_OK:
+                    data = {}
+                    used_codes = dlg.GetSelections()
+                    used_codes = [float(keycode[cur]) for cur in used_codes]
+                else:
+                    return
+
+        if operator == -1:
+            with wx.SingleChoiceDialog(None, _('Choose the operator'), _('Operator'), ['max', 'percentile 95', 'percentile 5', 'min', 'mean', 'median', 'sum']) as dlg:
+                if dlg.ShowModal() == wx.ID_OK:
+                    if dlg.GetStringSelection() == 'max':
+                        operator = np.max
+                    elif dlg.GetStringSelection() == 'min':
+                        operator = np.min
+                    elif dlg.GetStringSelection() == 'mean':
+                        operator = np.mean
+                    elif dlg.GetStringSelection() == 'median':
+                        operator = np.median
+                    elif dlg.GetStringSelection() == 'sum':
+                        operator = np.sum
+                    elif dlg.GetStringSelection() == 'percentile 95':
+                        operator = lambda x: np.percentile(x, 95)
+                    elif dlg.GetStringSelection() == 'percentile 5':
+                        operator = lambda x: np.percentile(x, 5)
+                else:
+                    return
+
+        with wx.NumberEntryDialog(None, _('Minimum number of points to operate'), _('Minimum'), _('Minimum points'), 1, 1, 20) as dlg:
+            if dlg.ShowModal() == wx.ID_OK:
+                minpoints = dlg.GetValue()
+            else:
+                return
+
+        bounds = array.get_bounds()
+
+        # align bounds on chunk_size
+        bounds[0][0] = bounds[0][0] - bounds[0][0] % chunk_size
+        bounds[0][1] = bounds[0][1] + chunk_size - bounds[0][1] % chunk_size
+        bounds[1][0] = bounds[1][0] - bounds[1][0] % chunk_size
+        bounds[1][1] = bounds[1][1] + chunk_size - bounds[1][1] % chunk_size
+
+        chunks_x = np.arange(bounds[0][0], bounds[0][1], chunk_size)
+        chunks_y = np.arange(bounds[1][0], bounds[1][1], chunk_size)
+
+        for curx in tqdm(chunks_x, 'Chunks'):
+            for cury in chunks_y:
+
+                curbounds = [[curx, curx + chunk_size], [cury, cury + chunk_size]]
+
+                logging.info(_('Scan {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
+                self.mylazdata = self.mylazgrid.scan(curbounds)
+                # logging.info(_('Scan done'))
+
+                if len(self.mylazdata) == 0:
+                    continue
+
+                # Test codes
+                data = {}
+                for curcode in used_codes:
+                    data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
+
+                # Treat data for each code
+                for curdata in data.values():
+
+                    if curdata.shape[0] == 0:
+                        continue
+                    else:
+                        logging.info(_('Code {} : {} points'.format(curdata[0,3], curdata.shape[0])))
+
+                    # get i,j from x,y
+                    i,j = array.get_ij_from_xy(curdata[:, 0], curdata[:, 1]) #= np.float32(self.mylazdata[:, 2])
+
+                    # keep only valid points -- inside the array
+                    used = np.where((i >=0) & (i < array.nbx) & (j >=0) & (j < array.nby))[0]
+
+                    if len(used) == 0:
+                        continue
+
+                    i = i[used]
+                    j = j[used]
+                    z = curdata[used, 2]
+
+                    # create a key array
+                    keys = np.vstack((i,j)).T
+                    # find unique keys
+                    keys = np.unique(keys, axis=0)
+
+                    # create a ijz array
+                    ijz = np.vstack((i, j, z)).T
+
+                    # sort ijz array according to keys
+                    #
+                    # the most important indice is the last one enumerated in lexsort
+                    # see : https://numpy.org/doc/stable/reference/generated/numpy.lexsort.html
+                    ijz = ijz[np.lexsort((ijz[:,1], ijz[:,0]))]
+
+                    # find first element of each key
+                    idx = np.where(np.abs(np.diff(ijz[:,0])) + np.abs(np.diff(ijz[:,1])) != 0)[0]
+
+                    # add last element
+                    idx = np.concatenate((idx, [ijz.shape[0]]))
+
+                    assert len(idx) == keys.shape[0], 'Error in filling'
+
+                    logging.info(_('Cells to fill : {}'.format(len(idx))))
+
+                    # apply operator
+                    vals = {}
+                    start_ii = 0
+                    for ii, key in enumerate(keys):
+                        end_ii = idx[ii]+1
+
+                        if end_ii - start_ii >= minpoints:
+                            vals[(key[0], key[1])] = operator(ijz[start_ii:end_ii,2])
+
+                        start_ii = end_ii
+
+                    if len(vals) > 0:
+                        # create a new ijz array
+                        newijz = np.asarray([[key[0], key[1], val] for key, val in vals.items()], dtype = np.float32)
+
+                        array.fillin_from_ijz(newijz)
+
+        array.reset_plot()
+        self.Paint()
+
+        logging.info(_('Filling done'))
+
     def init_laz_from_numpy(self, fn=None):
         """ Read LAZ data stored in numpy array"""
 
@@ -3918,7 +4132,7 @@ class WolfMapViewer(wx.Frame):
 
         self.mylazgrid = xyz_laz_grids(dirlaz)
 
-        dlg = wx.SingleChoiceDialog(None, _('Choose the classification'), _('Classification'), ['SPW 2013-2014', 'SPW-Geofit 2023'], wx.CHOICEDLG_STYLE)
+        dlg = wx.SingleChoiceDialog(None, _('Choose the classification'), _('Classification'), ['SPW-Geofit 2023', 'SPW 2013-2014'], wx.CHOICEDLG_STYLE)
         ret = dlg.ShowModal()
         if ret != wx.ID_OK:
             dlg.Destroy()
@@ -4119,7 +4333,7 @@ class WolfMapViewer(wx.Frame):
         item = self.menubar.FindItemById(event.GetId())
 
         if item is not None:
-            self.StatusBar.SetStatusText(item.GetHelp())
+            self.set_statusbar_text(item.GetHelp())
 
     def _select_laz_source(self):
         """ Select laz source """
@@ -4840,6 +5054,28 @@ class WolfMapViewer(wx.Frame):
             autoscale=False
             self.clip_laz_gridded()
 
+        elif itemlabel == _('Fill active array from LAZ data'):
+            if self.mylazgrid is None:
+                logging.warning('')
+                return
+            if self.active_array is None:
+                logging.warning(_('No active array -- select an array first and retry!'))
+                return
+
+            autoscale = False
+            self.fill_active_array_from_laz(self.active_array)
+
+        elif itemlabel == _('Select cells in array from LAZ data'):
+            if self.mylazgrid is None:
+                logging.warning('')
+                return
+            if self.active_array is None:
+                logging.warning(_('No active array -- select an array first and retry!'))
+                return
+
+            autoscale = False
+            self.select_active_array_from_laz(self.active_array)
+
         elif itemlabel == _('Plot LAZ around active vector'):
 
             self.plot_laz_around_active_vec()
@@ -7447,6 +7683,14 @@ class WolfMapViewer(wx.Frame):
                 self.active_bc.Show()
                 return
 
+    def set_statusbar_text(self, txt:str):
+        """ Set the status bar text """
+        self.StatusBar.SetStatusText(txt)
+
+    def set_label_selecteditem(self, nameitem:str):
+        """ Set the label of the selected item in the tree list """
+        self._lbl_selecteditem.SetLabel(nameitem)
+
     def OnActivateTreeElem(self, e): #:dataview.TreeListEvent ):
         """ Activate the selected item in the tree list """
         curzones: Zones
@@ -7466,7 +7710,7 @@ class WolfMapViewer(wx.Frame):
 
         myobj = self.treelist.GetItemData(myitem)
         self.selected_object = myobj
-        self.lbl_selecteditem.SetLabel(nameitem)
+        self.set_label_selecteditem(nameitem)
 
         #FIXME : To generalize using draw_type
         if type(myobj) == Zones:
@@ -7512,7 +7756,7 @@ class WolfMapViewer(wx.Frame):
 
             txt += ' ; Type : ' + self.active_array.dtype_str
 
-            self.StatusBar.SetStatusText(txt)
+            self.set_statusbar_text(txt)
 
 
         elif type(myobj) in [WolfViews]:
@@ -8136,6 +8380,9 @@ class WolfMapViewer(wx.Frame):
         #     i : interpolation2D sur base de la sélection sur la matrice courante\n \
         #     +,- (numpad) : augmente ou diminue la taille des flèches de resultats 2D\n \
         #     \n \
+        #     o, O : Gestion de la transparence de la matrice courante\n \
+        #     CTRL+o, CTRL+O : Gestion de la transparence du résultat courant\n \
+        #     \n \
         #     !! ACTIONs !!\n \
         #     N : sélection noeud par noeud de la matrice courante\n \
         #     B : sélection par vecteur temporaire de la matrice courante\n \
@@ -8179,6 +8426,11 @@ class WolfMapViewer(wx.Frame):
                      'c or C': _('Drawing : copy canvas to Clipboard wo axes'),
                      'CTRL+C': _('Drawing : copy canvas to Clipboard as Matplotlib image'),
 
+                     'CTRL+o': _('Results : increase transparency of the current result'),
+                     'CTRL+O': _('Results : decrease transparency of the current result'),
+                     'o': _('Arrays : increase transparency of the current array'),
+                     'O': _('Arrays : decrease transparency of the current array'),
+
                      'F9': _('Arrays : select all cells'),
                      'F11': _('Arrays : select by criteria'),
                      'F12': _('Arrays : operations'),
@@ -8245,9 +8497,9 @@ class WolfMapViewer(wx.Frame):
         """ Message to end action """
 
         if which == 0:
-            self.StatusBar.SetStatusText(_('Action in progress... -- To quit, press "RETURN" or "double clicks RIGHT" or press "ESC"'))
+            self.set_statusbar_text(_('Action in progress... -- To quit, press "RETURN" or "double clicks RIGHT" or press "ESC"'))
         else:
-            self.StatusBar.SetStatusText('')
+            self.set_statusbar_text('')
 
     def start_action(self, action:str, message:str=''):
         """ Message to start action """
@@ -8571,7 +8823,8 @@ class WolfMapViewer(wx.Frame):
                 self.active_vertex = None
                 self.active_cloud = None
 
-                self.StatusBar.SetStatusText(_('Esc pressed - No more action in progress'))
+                self.set_statusbar_text(_('Esc pressed - No more action in progress - No more active object'))
+                self.set_label_selecteditem('')
 
             elif key == ord('C'):
 
@@ -8701,6 +8954,29 @@ class WolfMapViewer(wx.Frame):
                     self.active_array.myops.reset_selection()
                     self.Refresh()
 
+            elif key == ord('O'):
+                # Active Opacity for the active array
+
+                if ctrldown:
+                    if self.active_res2d is None:
+                        logging.warning(_('No active result 2D to change the opacity !'))
+                        return
+
+                    if shiftdown:
+                        self.active_res2d.set_opacity(self.active_res2d.alpha + 0.25)
+                    else:
+                        self.active_res2d.set_opacity(self.active_res2d.alpha - 0.25)
+
+                else:
+                    if self.active_array is None:
+                        logging.warning(_('No active array to change the opacity !'))
+                        return
+
+                    if shiftdown:
+                        self.active_array.set_opacity(self.active_array.alpha + 0.25)
+                    else:
+                        self.active_array.set_opacity(self.active_array.alpha - 0.25)
+
             elif key == wx.WXK_UP:
                 self.mousey = self.mousey + self.height / 10.
                 self.setbounds()

wolfhece/PyVertexvectors.py

@@ -886,6 +886,18 @@ if :\n \
         self.myprops.Show()
 
         self.myprops.SetTitle(_('Vector properties - {}'.format(self.parent.myname)))
+
+        if self.parent.get_mapviewer() is not None:
+            self.myprops.SetIcon(self.parent.get_mapviewer().GetIcon())
+        else:
+            try:
+                icon = wx.Icon()
+                icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
+                icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+                self.myprops.SetIcon(icon)
+            except Exception as e:
+                logging.warning('Problem with icon for properties window : {}'.format(e))
+
         self.myprops.Center()
         self.myprops.Raise()
 
@@ -1017,6 +1029,15 @@ class vector:
         if fromshapely is not None:
             self.import_shapelyobj(fromshapely)
 
+    def get_mapviewer(self):
+        """
+        Retourne l'instance de la mapviewer
+        """
+        if self.parentzone is not None:
+            return self.parentzone.get_mapviewer()
+        else:
+            return None
+
     def show_properties(self):
         """ Show the properties """
 
@@ -1029,11 +1050,6 @@ class vector:
         if self.myprop is not None:
             self.myprop.hide_properties()
 
-    def get_mapviewer(self):
-        """ Return the mapviewer """
-
-        return self.parentzone.get_mapviewer()
-
     def get_normal_segments(self) -> np.ndarray:
         """
         Return the normals of each segment
@@ -4866,6 +4882,18 @@ class Zones(wx.Frame, Element_To_Draw):
 
             self.SetSizer(box)
 
+            if self.get_mapviewer() is not None:
+                self.SetIcon(self.get_mapviewer().GetIcon())
+
+            if self.idx == '':
+                if self.parent is not None:
+                    try:
+                        self.SetTitle(_('Zones associated to : {}'.format(self.parent.idx)))
+                    except:
+                        logging.warning(_('No parent idx found'))
+            else:
+                self.SetTitle(_('Zones : {}'.format(self.idx)))
+
             self.init_struct=False
 
 

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 52
+        self.patch = 54
 
     def __str__(self):
 

wolfhece/lazviewer/laz_viewer.py

@@ -261,13 +261,23 @@ class xyz_laz():
                 y=np.frombuffer(f.read(blocsize),dtype_file)
                 z=np.frombuffer(f.read(nbloc*4),np.float32)
                 classi=np.frombuffer(f.read(nbloc),np.int8)
+
                 count+=4+(2*blocsize+nbloc*(4+1))
 
-                if len(myret)==0:
-                    # dt=[('x',np.float32),('y',np.float32),('z',np.float32),('classification',np.int8)]
-                    myret=np.array([x,y,z,classi]).transpose()
+                if classi.shape[0] != nbloc:
+                    logging.warning(_('Bad classification size - file {}'.format(fn)))
                 else:
-                    myret=np.concatenate((myret,np.array([x,y,z,classi]).transpose()))
+                    if len(myret)==0:
+                        # dt=[('x',np.float32),('y',np.float32),('z',np.float32),('classification',np.int8)]
+                        myret=np.array([x,y,z,classi]).transpose()
+                    else:
+                        if len(x)>1:
+                            added = np.array([x,y,z,classi]).transpose()
+
+                            if myret.shape[1] == added.shape[1]:
+                                myret=np.concatenate((myret,added))
+                            else:
+                                logging.warning(_('Incompatible shapes'))
 
         # Format Numpy
         self.data = myret
@@ -485,16 +495,17 @@ class xyz_laz_grids():
         """
         Scan all LAZ to find used data
 
-        Args:
-            bounds (Union[tuple[tuple[float,float],tuple[float,float]], list[list[float, float],list[float, float]]]): [[xmin,xmax], [ymin,ymax]]
-
-        Returns:
-            _type_: np.ndarray
+        :param bounds: [[xmin,xmax], [ymin,ymax]]
+        :type bounds: Union[tuple[tuple[float,float],tuple[float,float]], list[list[float, float],list[float, float]]]
+        :return: np.ndarray
         """
         ret = [cur.scan(bounds) for cur in self.grids]
         ret = [cur for cur in ret if len(cur)>0]
 
-        return np.concatenate(ret)
+        if len(ret)==0:
+            return np.asarray([])
+        else:
+            return np.concatenate(ret)
 
     def read_dir(self, dir_grids):
         dirs = listdir(dir_grids)
@@ -637,8 +648,8 @@ def find_pointsXYZ(xyz:np.ndarray, bounds:Union[tuple[tuple[float,float],tuple[f
     xb=bounds[0]
     yb=bounds[1]
     # Get arrays which indicate invalid X, Y, or Z values.
-    X_valid = (xb[0] <= xyz[:,0]) & (xb[1] >= xyz[:,0])
-    Y_valid = (yb[0] <= xyz[:,1]) & (yb[1] >= xyz[:,1])
+    X_valid = np.logical_and((xb[0] <= xyz[:,0]), (xb[1] >= xyz[:,0]))
+    Y_valid = np.logical_and((yb[0] <= xyz[:,1]), (yb[1] >= xyz[:,1]))
     good_indices = np.where(X_valid & Y_valid)[0]
 
     return xyz[good_indices]

wolfhece/wolf_array.py

@@ -1412,6 +1412,11 @@ class Ops_Array(wx.Frame):
         if self.wx_exists:
             self.set_GUI()
 
+    @property
+    def idx(self):
+        """ Return the idx of the parentarray """
+        return self.parentarray.idx
+
     def get_mapviewer(self):
         """ Retourne l'instance WolfMapViewer """
         return self.mapviewer
@@ -2732,9 +2737,13 @@ class Ops_Array(wx.Frame):
                 curarray.shading = True
 
             alpha = float(self.palalphahillshade.GetValue()) / 100.
-            if curarray.shaded.alpha != alpha:
-                curarray.shaded.alpha = alpha
-                curarray.shading = True
+
+            if curarray.shaded is None:
+                logging.error('No shaded array')
+            else:
+                if curarray.shaded.alpha != alpha:
+                    curarray.shaded.alpha = alpha
+                    curarray.shading = True
 
         if dellists:
             self.refresh_array()
@@ -4444,6 +4453,25 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.add_ops_sel() # Ajout d'un gestionnaire de sélection et d'opérations
 
+    def set_opacity(self, alpha:float):
+        """ Set the transparency of the array """
+
+        if alpha <0.:
+            alpha = 0.
+
+        if alpha > 1.:
+            alpha = 1.
+
+        self.alpha = alpha
+
+        if self.myops is not None:
+            self.myops.palalpha.SetValue(0)
+            self.myops.palalphaslider.SetValue(int(alpha*100))
+
+        self.reset_plot()
+
+        return self.alpha
+
     @property
     def memory_usage(self):
         """
@@ -4586,6 +4614,10 @@ class WolfArray(Element_To_Draw, header_wolf):
         """ Affichage des propriétés de la matrice dans une fenêtre wxPython """
         if self.wx_exists and self.myops is not None:
             self.myops.SetTitle(_('Operations on array: ') + self.idx)
+
+            if self.mapviewer is not None:
+                self.myops.SetIcon(self.mapviewer.GetIcon())
+
             self.myops.Show()
 
             self.myops.Center()
@@ -5802,6 +5834,10 @@ class WolfArray(Element_To_Draw, header_wolf):
     def hillshade(self, azimuth:float, angle_altitude:float):
         """ Create a hillshade array  -- see "hillshade" function accelerated by JIT"""
 
+        if self.shaded is None:
+            logging.error(_('No shaded array'))
+            return
+
         self.shaded.set_header(self.get_header())
         self.shaded.array = hillshade(self.array.data, azimuth, angle_altitude)
         self.shaded.delete_lists()
@@ -7215,6 +7251,29 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             logging.warning(_('Type not supported : ')+str(self.dtype))
 
+    def fillin_from_ijz(self, ijz:np.ndarray):
+        """ Remplissage du tableau à partir d'un tableau ijz """
+
+        try:
+            i = ijz[:, 0].astype(int)
+            j = ijz[:, 1].astype(int)
+        except Exception as e:
+            logging.error(_('Error in conversion of ijz to int : ')+str(e))
+            return
+
+        if self.dtype == np.float32:
+            self.array.data[i, j] = np.float32(ijz[:, 2])
+        elif self.dtype == np.float64:
+            self.array.data[i, j] = np.float64(ijz[:, 2])
+        elif self.dtype == np.int32:
+            self.array.data[i, j] = np.int32(ijz[:, 2])
+        elif self.dtype == np.int16:
+            self.array.data[i, j] = np.int16(ijz[:, 2])
+        elif self.dtype == np.int8:
+            self.array.data[i, j] = np.int8(ijz[:, 2])
+        else:
+            logging.warning(_('Type not supported : ')+str(self.dtype))
+
     def mask_force_null(self):
         """
         Force to unmask all and mask null value

wolfhece/wolfresults_2D.py

@@ -1769,6 +1769,18 @@ class OneWolfResult:
 
         self.mngselection = SelectionData(self._current)
 
+    def set_opacity(self, alpha:float):
+        """ Set the transparency of the array """
+
+        if alpha <0.:
+            alpha = 0.
+
+        if alpha > 1.:
+            alpha = 1.
+
+        self.alpha = alpha
+
+        return self.alpha
 
     @property
     def min_field_size(self):
@@ -2232,6 +2244,16 @@ class Wolfresults_2D(Element_To_Draw):
         self.myops = None
         self._active_blocks = 0
 
+
+    def set_opacity(self, alpha:float):
+        """ Set the transparency of the array """
+
+        self.alpha = alpha
+
+        self.reset_plot()
+
+        return self.alpha
+
     @property
     def SelectionData(self) -> SelectionDataMB:
         """ Return the data of the selection """
@@ -2399,6 +2421,13 @@ class Wolfresults_2D(Element_To_Draw):
 
     @alpha.setter
     def alpha(self, value:float):
+
+        if value <0.:
+            value = 0.
+
+        if value > 1.:
+            value = 1.
+
         for i in range(self.nb_blocks):
             self[i].alpha = value
 
@@ -4184,6 +4213,7 @@ class Wolfresults_2D(Element_To_Draw):
 
     def reset_plot(self,whichpal=0):
         """Reset du dessin"""
+
         self.delete_lists()
         self.get_working_array()
         self.updatepalette(whichpal)

{wolfhece-2.1.52.dist-info → wolfhece-2.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.52
+Version: 2.1.54
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.52.dist-info → wolfhece-2.1.54.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=_Rfx59LMopR0Cx00d1RRF5Gb-WNxfA2v2RjkOfm84Yo,390847
+wolfhece/PyDraw.py,sha256=Ib7Rix3QAjR9X0o1E-80_91QsKhWtxmnR2QA89WIPQU,402676
 wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -16,7 +16,7 @@ wolfhece/PyParams.py,sha256=wwgmP-_7wiiPLTcyX8a5jR6FyC1D2c4oBPc1VWQqtSA,97383
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=MtZVjIWIi62QX_oqNosb56xPgjhOGVeGz-XsD82tsNg,40614
-wolfhece/PyVertexvectors.py,sha256=KMXJB_zFi54I73jk_fGtSTxqTQhnCwngeEjJyLdgGDo,235914
+wolfhece/PyVertexvectors.py,sha256=mZlu2IeCQH-VdDQrw_fYbns3NQ_qdfbb3ndqzfjC_nI,237049
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -48,13 +48,13 @@ wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=4B0rihTY4yu0t8mrt99aV_3VCf0PP_K72SAFFkycclc,370660
+wolfhece/wolf_array.py,sha256=VRy6F5ChUfqB8ziDAI8XrE54XWrtAicYVQyMieLaIXU,372460
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
 wolfhece/wolf_vrt.py,sha256=89XoDhCJMHiwPQUuOduxtTRKuIa8RDxgNqX65S4xp9M,10569
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=J6GBaLlwtRQKRsFnZzvxc-5m9QVSzN0xCiMJA-yXIHs,167541
+wolfhece/wolfresults_2D.py,sha256=1rzkcZtS6Y8bn8izX-kTePpstrPi9TiOkw9XBueG1fk,168078
 wolfhece/xyz_file.py,sha256=Se4nCPwYAYLSA5i0zsbnZUKoAMAD0mK1FJea5WSZUkk,5755
 wolfhece/acceptability/Parallels.py,sha256=h4tu3SpC_hR5Hqa68aruxhtAyhs8u666YuZ40_fR5zg,3979
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YH
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=9OZ-YcusCh_gbdccX8m4dCLa-9wqi_9uiTxPepfbdRA,388
+wolfhece/apps/version.py,sha256=CMpY0e6nzRUMGj9Dheyh-mTZLDI1l4fvptoARGgcN9I,388
 wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
 wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -143,7 +143,7 @@ wolfhece/lagrangian/particles.py,sha256=S52_-3rzgVhift6l4Gznvsf_RTggzvNaD1dPvQUr
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=0SNDEKGad6e2AwxjalcPqb2bdW6crmXQFxWUY13PiVU,223
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/lazviewer/laz_viewer.py,sha256=EHg-7MGRASevT3tmOwIGWdZZqo8cvEbTt8J2Ei9v1X8,42205
+wolfhece/lazviewer/laz_viewer.py,sha256=zuXMSh50HZGcduD5dWsrxrNu9qcxg-NfQr6Rg5sKxO8,42746
 wolfhece/lazviewer/libs/Qt5Core.dll,sha256=sTJ_ctYFY9KHMNytF-lzH_078zIvnKTjN-71FDkOWPw,4924928
 wolfhece/lazviewer/libs/Qt5Gui.dll,sha256=07BeaOeYByraGkKYeDiSDYLawHM8tyd55pVJlKbZ4Y0,5436416
 wolfhece/lazviewer/libs/Qt5Network.dll,sha256=U-9FiLE9LUKru8r8EQxTnwwlMpwS8JzUtenhkKTCox0,1038336
@@ -280,8 +280,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.52.dist-info/METADATA,sha256=dUwuLJdHXEFQCK3QEjlpob02jeFO6Ix1VENGT7JnBSk,2541
-wolfhece-2.1.52.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.52.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.52.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.52.dist-info/RECORD,,
+wolfhece-2.1.54.dist-info/METADATA,sha256=7QrfsLJM8f7GK2x3Gg8xH6vJfGWupV1EmqcST4rlVw8,2541
+wolfhece-2.1.54.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.54.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.54.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.54.dist-info/RECORD,,