wolfhece 2.1.51__py3-none-any.whl → 2.1.53__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)
@@ -879,6 +879,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 +3887,159 @@ 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):
+        """ 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
+
+        curbounds = array.get_bounds()
+
+        logging.info(_('Scan Laz grid on current zoom {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
+        self.mylazdata = self.mylazgrid.scan(curbounds)
+        logging.info(_('Scan done'))
+
+        if used_codes is not None:
+            self.mylazdata = self.mylazdata[self.mylazdata[:, 3] in np.asarray(used_codes, dtype=np.float32)]
+        else:
+            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]
+
+                    for curcode in used_codes:
+                        data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
+                else:
+                    return
+
+        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 = None, operator:int = None):
+        """ 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
+
+        curbounds = array.get_bounds()
+
+        logging.info(_('Scan Laz grid on current zoom {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
+        self.mylazdata = self.mylazgrid.scan(curbounds)
+        logging.info(_('Scan done'))
+
+        if used_codes is not None:
+            self.mylazdata = self.mylazdata[self.mylazdata[:, 3] in np.asarray(used_codes, dtype=np.float32)]
+        else:
+            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]
+
+                    for curcode in used_codes:
+                        data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
+                else:
+                    return
+
+        if operator is None:
+            with wx.SingleChoiceDialog(None, _('Choose the operator'), _('Operator'), ['max', '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
+                else:
+                    return
+
+        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])
+
+            # sort i, j and z
+            i = np.asarray(i, dtype=np.int32)
+            j = np.asarray(j, dtype=np.int32)
+            z = np.asarray(curdata[:, 2], dtype=np.float32)
+
+            keys = np.vstack((i,j)).T
+
+            ijz = np.hstack((keys,z.reshape(-1,1)))
+
+            # unique keys
+            keys = np.unique(keys, axis=0)
+
+            ijz = ijz[np.lexsort((ijz[:,1], ijz[:,0]))]
+
+            # find first element of each key
+            idx = np.where(np.diff(ijz[:,0]) + np.diff(ijz[:,1]) != 0)[0]
+            idx = np.concatenate((idx, [ijz.shape[0]]))
+
+            # apply operator
+            vals = {}
+            start_ii = 0
+            for ii, key in enumerate(keys):
+
+                end_ii = idx[ii]+1
+                if key[0] >=0 and key[0] < array.nbx and key[1] >=0 and key[1] < array.nby:
+                    vals[(key[0], key[1])] = operator(ijz[start_ii:end_ii,2])
+                start_ii = end_ii
+
+            # 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"""
 
@@ -4840,6 +4995,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()
@@ -8136,6 +8313,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 +8359,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'),
@@ -8701,6 +8886,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/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 51
+        self.patch = 53
 
     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,11 +495,9 @@ 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]
@@ -637,8 +645,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/models/blues.pal

@@ -0,0 +1,65 @@
+16
+0.0
+247
+251
+255
+0.06666666666666667
+233
+242
+250
+0.13333333333333333
+220
+233
+246
+0.2
+207
+225
+242
+0.26666666666666666
+192
+216
+237
+0.3333333333333333
+171
+207
+229
+0.39999999999999997
+147
+196
+222
+0.4666666666666666
+120
+181
+216
+0.5333333333333333
+96
+166
+209
+0.6
+74
+151
+201
+0.6666666666666666
+55
+135
+192
+0.7333333333333333
+37
+117
+183
+0.7999999999999999
+23
+100
+171
+0.8666666666666666
+9
+83
+157
+0.9333333333333332
+8
+65
+133
+0.9999999999999999
+8
+48
+107