wolfhece 2.1.50__py3-none-any.whl → 2.1.56__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/PyGui.py

@@ -150,7 +150,7 @@ class MapManager(GenMapManager):
 
         icon = wx.Icon()
 
-        icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
+        icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
 
         icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
 

wolfhece/PyPalette.py

@@ -515,9 +515,9 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
     def defaultgray(self):
         """Palette grise par défaut dans WOLF"""
 
-        self.nb = 2
-        self.values = np.asarray([0., 1.], dtype=np.float64)
-        self.colors = np.asarray([[0, 0, 0, 255], [255, 255, 255, 255]], dtype=np.int32)
+        self.nb = 3
+        self.values = np.asarray([0., 0.5, 1.], dtype=np.float64)
+        self.colors = np.asarray([[0, 0, 0, 255], [128, 128, 128, 255], [255, 255, 255, 255]], dtype=np.int32)
 
         # self.nb = 11
         # self.values = np.asarray([0., 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.], dtype=np.float64)

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/ManageParams.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 import wx
 
 from ..PyTranslate import _

wolfhece/apps/Optimisation_hydro.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 import wx
 
 from ..PyTranslate import _

wolfhece/apps/curvedigitizer.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 from ..PyTranslate import _
 
 import wx

wolfhece/apps/isocurrent.py

@@ -9,6 +9,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 from ..PyTranslate import _
 
 

wolfhece/apps/version.py

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

wolfhece/apps/wolf.py

@@ -11,6 +11,10 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 import wx
 from ..PyTranslate import _
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 def main():
     ex = wx.App()
 

wolfhece/apps/wolf2D.py

@@ -10,6 +10,10 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 
 import wx
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 def main():
     ex = wx.App()
 

wolfhece/apps/wolfcompare2Darrays.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 #import des modules
 from os import path
 import sys

wolfhece/apps/wolfhydro.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 import wx
 
 from ..PyTranslate import _