wolfhece 1.8.13__py3-none-any.whl → 2.0.0__py3-none-any.whl

wolfhece/PyVertex.py

@@ -16,7 +16,7 @@ import re
 import logging
 from scipy.spatial import KDTree
 
-from .PyParams import Wolf_Param
+from .PyParams import Wolf_Param, key_Param, Type_Param
 from .PyTranslate import _
 from .drawing_obj import Element_To_Draw
 
@@ -208,89 +208,89 @@ class cloudproperties:
         if 'Draw' in curdict.keys():
             keysactive = curdict['Draw'].keys()
             if 'Color' in keysactive:
-                self.color = getIfromRGB(curdict['Draw']['Color']['value'])
+                self.color = getIfromRGB(curdict['Draw']['Color'][key_Param.VALUE])
             if 'Width' in keysactive:
-                self.width = int(curdict['Draw']['Width']['value'])
+                self.width = int(curdict['Draw']['Width'][key_Param.VALUE])
             if 'Style' in keysactive:
-                self.style = int(curdict['Draw']['Style']['value'])
+                self.style = int(curdict['Draw']['Style'][key_Param.VALUE])
             if 'Filled' in keysactive:
-                self.filled = bool(curdict['Draw']['Filled']['value'])
+                self.filled = bool(curdict['Draw']['Filled'][key_Param.VALUE])
             if 'Transparent' in keysactive:
-                self.transparent = bool(curdict['Draw']['Transparent']['value'])
+                self.transparent = bool(curdict['Draw']['Transparent'][key_Param.VALUE])
             if 'Alpha' in keysactive:
-                self.alpha = int(curdict['Draw']['Alpha']['value'])
+                self.alpha = int(curdict['Draw']['Alpha'][key_Param.VALUE])
             if 'Flash' in keysactive:
-                self.flash = bool(curdict['Draw']['Flash']['value'])
+                self.flash = bool(curdict['Draw']['Flash'][key_Param.VALUE])
 
         if 'Legend' in curdict.keys():
             keysactive = curdict['Legend'].keys()
             if 'Underlined' in keysactive:
-                self.legendunderlined = bool(curdict['Legend']['Underlined']['value'])
+                self.legendunderlined = bool(curdict['Legend']['Underlined'][key_Param.VALUE])
             if 'Bold' in keysactive:
-                self.legendbold = bool(curdict['Legend']['Bold']['value'])
+                self.legendbold = bool(curdict['Legend']['Bold'][key_Param.VALUE])
             if 'Font name' in keysactive:
-                self.legendfontname = str(curdict['Legend']['Font name']['value'])
+                self.legendfontname = str(curdict['Legend']['Font name'][key_Param.VALUE])
             if 'Font size' in keysactive:
-                self.legendfontsize = int(curdict['Legend']['Font size']['value'])
+                self.legendfontsize = int(curdict['Legend']['Font size'][key_Param.VALUE])
             if 'Color' in keysactive:
-                self.legendcolor = getIfromRGB(curdict['Legend']['Color']['value'])
+                self.legendcolor = getIfromRGB(curdict['Legend']['Color'][key_Param.VALUE])
             if 'Italic' in keysactive:
-                self.legenditalic = bool(curdict['Legend']['Italic']['value'])
+                self.legenditalic = bool(curdict['Legend']['Italic'][key_Param.VALUE])
             if 'relative Position' in keysactive:
-                self.legendrelpos = int(curdict['Legend']['relative Position']['value'])
+                self.legendrelpos = int(curdict['Legend']['relative Position'][key_Param.VALUE])
             if 'Text' in keysactive:
-                self.legendtext = str(curdict['Legend']['Text']['value'])
+                self.legendtext = str(curdict['Legend']['Text'][key_Param.VALUE])
             if 'Visible' in keysactive:
-                self.legendvisible = bool(curdict['Legend']['Visible']['value'])
+                self.legendvisible = bool(curdict['Legend']['Visible'][key_Param.VALUE])
             if 'X' in keysactive:
-                self.legendx = float(curdict['Legend']['X']['value'])
+                self.legendx = float(curdict['Legend']['X'][key_Param.VALUE])
             if 'Y' in keysactive:
-                self.legendy = float(curdict['Legend']['Y']['value'])
+                self.legendy = float(curdict['Legend']['Y'][key_Param.VALUE])
 
         curdict = self.myprops.myparams
         if 'Draw' in curdict.keys():
             keysactive = curdict['Draw'].keys()
             if 'Color' in keysactive:
                 self.color = getIfromRGB(
-                    curdict['Draw']['Color']['value'].replace('(', '').replace(')', '').split(', '))
+                    curdict['Draw']['Color'][key_Param.VALUE].replace('(', '').replace(')', '').split(', '))
             if 'Width' in keysactive:
-                self.width = int(curdict['Draw']['Width']['value'])
+                self.width = int(curdict['Draw']['Width'][key_Param.VALUE])
             if 'Style' in keysactive:
-                self.style = int(curdict['Draw']['Style']['value'])
+                self.style = int(curdict['Draw']['Style'][key_Param.VALUE])
             if 'Filled' in keysactive:
-                self.filled = bool(curdict['Draw']['Filled']['value'])
+                self.filled = bool(curdict['Draw']['Filled'][key_Param.VALUE])
             if 'Transparent' in keysactive:
-                self.transparent = bool(curdict['Draw']['Transparent']['value'])
+                self.transparent = bool(curdict['Draw']['Transparent'][key_Param.VALUE])
             if 'Alpha' in keysactive:
-                self.alpha = int(curdict['Draw']['Alpha']['value'])
+                self.alpha = int(curdict['Draw']['Alpha'][key_Param.VALUE])
             if 'Flash' in keysactive:
-                self.flash = bool(curdict['Draw']['Flash']['value'])
+                self.flash = bool(curdict['Draw']['Flash'][key_Param.VALUE])
 
         if 'Legend' in curdict.keys():
             keysactive = curdict['Legend'].keys()
             if 'Underlined' in keysactive:
-                self.legendunderlined = bool(curdict['Legend']['Underlined']['value'])
+                self.legendunderlined = bool(curdict['Legend']['Underlined'][key_Param.VALUE])
             if 'Bold' in keysactive:
-                self.legendbold = bool(curdict['Legend']['Bold']['value'])
+                self.legendbold = bool(curdict['Legend']['Bold'][key_Param.VALUE])
             if 'Font name' in keysactive:
-                self.legendfontname = str(curdict['Legend']['Font name']['value'])
+                self.legendfontname = str(curdict['Legend']['Font name'][key_Param.VALUE])
             if 'Font size' in keysactive:
-                self.legendfontsize = int(curdict['Legend']['Font size']['value'])
+                self.legendfontsize = int(curdict['Legend']['Font size'][key_Param.VALUE])
             if 'Color' in keysactive:
                 self.legendcolor = getIfromRGB(
-                    curdict['Legend']['Color']['value'].replace('(', '').replace(')', '').split(', '))
+                    curdict['Legend']['Color'][key_Param.VALUE].replace('(', '').replace(')', '').split(', '))
             if 'Italic' in keysactive:
-                self.legenditalic = bool(curdict['Legend']['Italic']['value'])
+                self.legenditalic = bool(curdict['Legend']['Italic'][key_Param.VALUE])
             if 'relative Position' in keysactive:
-                self.legendrelpos = int(curdict['Legend']['relative Position']['value'])
+                self.legendrelpos = int(curdict['Legend']['relative Position'][key_Param.VALUE])
             if 'Text' in keysactive:
-                self.legendtext = str(curdict['Legend']['Text']['value'])
+                self.legendtext = str(curdict['Legend']['Text'][key_Param.VALUE])
             if 'Visible' in keysactive:
-                self.legendvisible = bool(curdict['Legend']['Visible']['value'])
+                self.legendvisible = bool(curdict['Legend']['Visible'][key_Param.VALUE])
             if 'X' in keysactive:
-                self.legendx = float(curdict['Legend']['X']['value'])
+                self.legendx = float(curdict['Legend']['X'][key_Param.VALUE])
             if 'Y' in keysactive:
-                self.legendy = float(curdict['Legend']['Y']['value'])
+                self.legendy = float(curdict['Legend']['Y'][key_Param.VALUE])
 
         self.parent.forceupdategl = True
 
@@ -303,25 +303,25 @@ class cloudproperties:
             self.myprops.loadme.Disable()
             self.myprops.reloadme.Disable()
 
-        self.myprops.addparam('Draw', 'Color', getRGBfromI(0), 'Color', 'Drawing color', whichdict='Default')
-        self.myprops.addparam('Draw', 'Width', 10, 'Float', 'Drawing width', whichdict='Default')
-        self.myprops.addparam('Draw', 'Style', 0, 'Integer', 'Drawing style', whichdict='Default')
-        self.myprops.addparam('Draw', 'Filled', False, 'Logical', '', whichdict='Default')
-        self.myprops.addparam('Draw', 'Transparent', False, 'Logical', '', whichdict='Default')
-        self.myprops.addparam('Draw', 'Alpha', 0, 'Integer', 'Transparent intensity', whichdict='Default')
-        self.myprops.addparam('Draw', 'Flash', False, 'Logical', '', whichdict='Default')
-
-        self.myprops.addparam('Legend', 'Visible', False, 'Logical', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'Text', '', 'String', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'relative Position', 5, 'Integer', '', whichdict='Default')
+        self.myprops.addparam('Draw', 'Color', getRGBfromI(0), Type_Param.Color, 'Drawing color', whichdict='Default')
+        self.myprops.addparam('Draw', 'Width', 10, Type_Param.Float, 'Drawing width', whichdict='Default')
+        self.myprops.addparam('Draw', 'Style', 0, Type_Param.Integer, 'Drawing style', whichdict='Default')
+        self.myprops.addparam('Draw', 'Filled', False, Type_Param.Logical, '', whichdict='Default')
+        self.myprops.addparam('Draw', 'Transparent', False, Type_Param.Logical, '', whichdict='Default')
+        self.myprops.addparam('Draw', 'Alpha', 0, Type_Param.Integer, 'Transparent intensity', whichdict='Default')
+        self.myprops.addparam('Draw', 'Flash', False, Type_Param.Logical, '', whichdict='Default')
+
+        self.myprops.addparam('Legend', 'Visible', False, Type_Param.Logical, '', whichdict='Default')
+        self.myprops.addparam('Legend', 'Text', '', Type_Param.String, '', whichdict='Default')
+        self.myprops.addparam('Legend', 'relative Position', 5, Type_Param.Integer, '', whichdict='Default')
         self.myprops.addparam('Legend', 'X', 0, 'Float', '', whichdict='Default')
         self.myprops.addparam('Legend', 'Y', 0, 'Float', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'Bold', False, 'Logical', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'Italic', False, 'Logical', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'Font name', 'Arial', 'String', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'Font size', 10, 'Integer', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'Color', getRGBfromI(0), 'Color', '', whichdict='Default')
-        self.myprops.addparam('Legend', 'Underlined', False, 'Logical', '', whichdict='Default')
+        self.myprops.addparam('Legend', 'Bold', False, Type_Param.Logical, '', whichdict='Default')
+        self.myprops.addparam('Legend', 'Italic', False, Type_Param.Logical, '', whichdict='Default')
+        self.myprops.addparam('Legend', 'Font name', 'Arial', Type_Param.String, '', whichdict='Default')
+        self.myprops.addparam('Legend', 'Font size', 10, Type_Param.Integer, '', whichdict='Default')
+        self.myprops.addparam('Legend', 'Color', getRGBfromI(0), Type_Param.Color, '', whichdict='Default')
+        self.myprops.addparam('Legend', 'Underlined', False, Type_Param.Logical, '', whichdict='Default')
 
     def destroyprop(self):
         self.myprops = None
@@ -329,25 +329,25 @@ class cloudproperties:
     def show(self):
         self.defaultprop()
 
-        self.myprops.addparam('Draw', 'Color', getRGBfromI(self.color), 'Color', 'Drawing color')
+        self.myprops.addparam('Draw', 'Color', getRGBfromI(self.color), Type_Param.Color, 'Drawing color')
         self.myprops.addparam('Draw', 'Width', self.width, 'Float', 'Drawing width')
-        self.myprops.addparam('Draw', 'Style', self.style, 'Integer', 'Drawing style')
-        self.myprops.addparam('Draw', 'Filled', self.filled, 'Logical', '')
-        self.myprops.addparam('Draw', 'Transparent', self.transparent, 'Logical', '')
-        self.myprops.addparam('Draw', 'Alpha', self.alpha, 'Integer', 'Transparent intensity')
-        self.myprops.addparam('Draw', 'Flash', self.flash, 'Logical', '')
-
-        self.myprops.addparam('Legend', 'Visible', self.legendvisible, 'Logical', '')
-        self.myprops.addparam('Legend', 'Text', self.legendtext, 'String', '')
-        self.myprops.addparam('Legend', 'relative Position', self.legendrelpos, 'Integer', '')
+        self.myprops.addparam('Draw', 'Style', self.style, Type_Param.Integer, 'Drawing style')
+        self.myprops.addparam('Draw', 'Filled', self.filled, Type_Param.Logical, '')
+        self.myprops.addparam('Draw', 'Transparent', self.transparent, Type_Param.Logical, '')
+        self.myprops.addparam('Draw', 'Alpha', self.alpha, Type_Param.Integer, 'Transparent intensity')
+        self.myprops.addparam('Draw', 'Flash', self.flash, Type_Param.Logical, '')
+
+        self.myprops.addparam('Legend', 'Visible', self.legendvisible, Type_Param.Logical, '')
+        self.myprops.addparam('Legend', 'Text', self.legendtext, Type_Param.String, '')
+        self.myprops.addparam('Legend', 'relative Position', self.legendrelpos, Type_Param.Integer, '')
         self.myprops.addparam('Legend', 'X', self.legendx, 'Float', '')
         self.myprops.addparam('Legend', 'Y', self.legendy, 'Float', '')
-        self.myprops.addparam('Legend', 'Bold', self.legendbold, 'Logical', '')
-        self.myprops.addparam('Legend', 'Italic', self.legenditalic, 'Logical', '')
-        self.myprops.addparam('Legend', 'Font name', self.legendfontname, 'String', '')
-        self.myprops.addparam('Legend', 'Font size', self.legendfontsize, 'Integer', '')
-        self.myprops.addparam('Legend', 'Color', getRGBfromI(self.legendcolor), 'Color', '')
-        self.myprops.addparam('Legend', 'Underlined', self.legendunderlined, 'Logical', '')
+        self.myprops.addparam('Legend', 'Bold', self.legendbold, Type_Param.Logical, '')
+        self.myprops.addparam('Legend', 'Italic', self.legenditalic, Type_Param.Logical, '')
+        self.myprops.addparam('Legend', 'Font name', self.legendfontname, Type_Param.String, '')
+        self.myprops.addparam('Legend', 'Font size', self.legendfontsize, Type_Param.Integer, '')
+        self.myprops.addparam('Legend', 'Color', getRGBfromI(self.legendcolor), Type_Param.Color, '')
+        self.myprops.addparam('Legend', 'Underlined', self.legendunderlined, Type_Param.Logical, '')
 
         self.myprops.Populate()
         self.myprops.Show()
@@ -638,7 +638,7 @@ class cloud_vertices(Element_To_Draw):
             self.updatebounds(newcloud=cloud)
         pass
 
-    def plot(self, update=False):
+    def plot(self, update=False, *args, **kwargs):
 
         if update or self.gllist == 0 or self.forceupdategl and not self.ongoing:
             curvert: wolfvertex
@@ -745,9 +745,9 @@ class cloud_vertices(Element_To_Draw):
             self.zmax = -1.e300
 
             # if no vertice or file not present -> return
-            if len(self.myvertices) == 0 : 
+            if len(self.myvertices) == 0 :
                 return
-            
+
             xyz = self.get_xyz()
             self.xmin = np.min(xyz[:,0])
             self.xmax = np.max(xyz[:,0])