wolfhece 2.0.16__py3-none-any.whl → 2.0.18__py3-none-any.whl

wolfhece/opengl/py3d.py

@@ -10,6 +10,7 @@ from enum import Enum
 import numpy as np
 from glm import lookAt, perspective, mat4, vec3, vec4, rotate, cross, dot, ortho, mat4x4, transpose, inverse, normalize, translate
 
+from ..PyTranslate import _
 from ..textpillow import Font_Priority, Text_Image, Text_Infos
 from ..wolf_texture import Text_Image_Texture
 
@@ -424,7 +425,7 @@ class WolfArray_plot3D():
     reference for texture 2D : https://registry.khronos.org/OpenGL-Refpages/gl4/html/glTexImage2D.xhtml
 
     OPENGL
-    ------
+
     The first element corresponds to the lower left corner of the texture image.
     Subsequent elements progress left-to-right through the remaining texels in the lowest row of the texture image,
      and then in successively higher rows of the texture image.
@@ -441,7 +442,7 @@ class WolfArray_plot3D():
            const void * data);
 
     NUMPY
-    -----
+
     shape[0] is the number of rows and shape[1] is the number of columns.
 
     The "data" buffer is row-major order or column-major order, depending on the value of the order parameter.
@@ -455,7 +456,7 @@ class WolfArray_plot3D():
        - OpenGL Texture width = shape[0]
        - OpenGL Texture height = shape[1]
 
-    ** ++ IMPORTANT **
+    ++ IMPORTANT
 
     We assume that if data is row-major order, the indexing [i,j] is (y, x) and if data is column-major order, the indexing is (x, y)
 
@@ -468,7 +469,7 @@ class WolfArray_plot3D():
        - Transposition is done by changing the indexing convention.
        - "texture" calls in shaders is the same for both row-major and column-major order.
 
-    ** -- IMPORTANT **
+    -- IMPORTANT
     """
 
     def __init__(self,
@@ -596,7 +597,7 @@ class WolfArray_plot3D():
         if self.cache is None:
             return None
 
-        return self.cache._sunposition
+        return self.cache.sunposition
 
     @sunposition.setter
     def sunposition(self, sunposition:vec3):
@@ -604,21 +605,21 @@ class WolfArray_plot3D():
         if self.cache is None:
             return
 
-        self.cache._sunposition = sunposition
+        self.cache.sunposition = sunposition
 
     @property
     def sunintensity(self):
         if self.cache is None:
             return None
 
-        return self.cache._sunintensity
+        return self.cache.sunintensity
 
     @sunintensity.setter
     def sunintensity(self, sunintensity:float):
         if self.cache is None:
             return
 
-        self.cache._sunintensity = sunintensity
+        self.cache.sunintensity = sunintensity
 
     def Draw(self):
 
@@ -665,7 +666,11 @@ class CanvasOGL(glcanvas.GLCanvas):
         self.far = 10000
 
         self._sunintensity = 1.
-        self._sunposition = vec3(1000., 1000., 1000.)
+        self._sunaltitude = 10000.
+        self._sun_x = 10000.
+        self._sun_y = 10000.
+        self._sun_idx = 0
+        # self._sunposition = vec3(1000., 1000., self._sunaltitude)
 
         self.grid = False
         self.drawposition = False
@@ -831,13 +836,42 @@ class CanvasOGL(glcanvas.GLCanvas):
 
     @property
     def sunposition(self):
-        return self._sunposition
+        return vec3(self._sun_x, self._sun_y, self._sunaltitude)
 
     @sunposition.setter
     def sunposition(self, sunposition:vec3):
-        self._sunposition = sunposition
+
+        self._sun_x, self._sun_y, self._sunaltitude = sunposition.x, sunposition.y, sunposition.z
+
         for curarray in self.arrays.values():
-            curarray.sunposition = sunposition
+            curarray.sunposition = sunposition #self.mvp_glm * sunposition
+
+    @property
+    def sunaltitude(self):
+        return self._sunaltitude
+
+    @sunaltitude.setter
+    def sunaltitude(self, sunaltitude:float):
+        self._sunaltitude = sunaltitude
+        self.sunposition = vec3(self._sun_x, self._sun_y, sunaltitude)
+
+    @property
+    def sunx(self):
+        return self._sun_x
+
+    @sunx.setter
+    def sunx(self, sunx:float):
+        self._sun_x = sunx
+        self.sunposition = vec3(sunx, self._sun_y, self._sunaltitude)
+
+    @property
+    def suny(self):
+        return self._sun_y
+
+    @suny.setter
+    def suny(self, suny:float):
+        self._sun_y = suny
+        self.sunposition = vec3(self._sun_x, suny, self._sunaltitude)
 
     @property
     def sunintensity(self):
@@ -1006,7 +1040,7 @@ class CanvasOGL(glcanvas.GLCanvas):
             self.height_view = self.width_view / self.ratio_woverh
 
         else:
-            self.eye = self.center - self._direction() * (1.-self.zoom_speed) * factor
+            self.eye = self.center - self._direction() * (1.-self.zoom_speed * factor)
 
         self.update_view()
 
@@ -1018,7 +1052,7 @@ class CanvasOGL(glcanvas.GLCanvas):
             self.height_view = self.width_view / self.ratio_woverh
 
         else:
-            self.eye = self.center - self._direction() * (1.+self.zoom_speed) * factor
+            self.eye = self.center - self._direction() * (1.+self.zoom_speed * factor)
 
         self.update_view()
 
@@ -1145,14 +1179,15 @@ class CanvasOGL(glcanvas.GLCanvas):
         self.deltaWheel = event.GetWheelDelta()
 
         ctrldown = event.ControlDown()
+        shiftdown = event.ShiftDown()
 
         if self.mouseWheel > 0:
-            if ctrldown:
+            if shiftdown:
                 self.closer(self.deltaWheel / 120 * 5)
             else:
                 self.closer(self.deltaWheel / 120)
         elif self.mouseWheel < 0:
-            if ctrldown:
+            if shiftdown:
                 self.further_away(self.deltaWheel / 120 * 5)
             else:
                 self.further_away(self.deltaWheel / 120)
@@ -1288,6 +1323,98 @@ class CanvasOGL(glcanvas.GLCanvas):
 
         self.update_view()
 
+    def copy_to_clipboard(self):
+        """ Copy the image to the clipboard """
+        self.SetCurrent(self.context)
+        pixels = glReadPixels(0, 0, self.width, self.height, GL_RGB, GL_UNSIGNED_BYTE)
+        image = wx.Image(self.width, self.height, pixels)
+        with wx.TheClipboard as clipboard:
+            clipboard.Open()
+            clipboard.SetData(wx.BitmapDataObject(wx.Bitmap(image)))
+            clipboard.Close()
+
+    def save_to_file(self):
+        """ Save the image to a file """
+        with wx.FileDialog(self, _("Save file"), wildcard="PNG files (*.png)|*.png",
+                           style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as fileDialog:
+            if fileDialog.ShowModal() == wx.ID_CANCEL:
+                return
+            pathname = fileDialog.GetPath()
+            self.SetCurrent(self.context)
+            pixels = glReadPixels(0, 0, self.width, self.height, GL_RGB, GL_UNSIGNED_BYTE)
+            image = wx.Image(self.width, self.height, pixels)
+            image.SaveFile(pathname, wx.BITMAP_TYPE_PNG)
+
+    def print_shortcuts(self) -> str:
+        """ Print shortcuts """
+
+        shortcuts = _("Definitions:\n")
+        shortcuts += "------------\n\n"
+        shortcuts = _("Camera is the eye position\n")
+        shortcuts += _("Center is the center of the view\n")
+        shortcuts += _("Direction is the vector from the eye to the center\n")
+        shortcuts += _("Up is the up vector, perpendicular to the direction\n")
+        shortcuts += _("Right is the vector normal to the direction-up plan\n\n")
+
+        shortcuts += _("Clicks\n")
+        shortcuts += "-------\n\n"
+        shortcuts += _("Left click and drag: translate the view in the up-right plane\n")
+        shortcuts += _("Right click: display the position of the mouse -- to improve\n")
+        shortcuts += "\n\n"
+        shortcuts += _("Zoom\n")
+        shortcuts += "----\n"
+        shortcuts += "\n\n"
+        shortcuts += _("0 or Home: autoscale\n")
+        shortcuts += _("Mouse wheel: zoom in/out  (eye closer or further from the center)\n")
+        shortcuts += _("Shift + mouse wheel: zoom in/out faster\n")
+        shortcuts += _("+ or - or mouse wheel: zoom in/out\n")
+        shortcuts += "\n\n"
+        shortcuts += _("Translation\n")
+        shortcuts += "-----------\n"
+        shortcuts += "\n\n"
+        shortcuts += _("Arrow keys: move the view\n")
+        shortcuts += _("Shift + arrow keys: move the view 0\n")
+        shortcuts += _("Page up/Page down: move the view along eye-center direction\n")
+        shortcuts += "\n\n"
+        shortcuts += _("Rotation\n")
+        shortcuts += "-----------\n"
+        shortcuts += "\n\n"
+        shortcuts += _("Ctrl + arrow keys: rotate the view around eye\n")
+        shortcuts += _("Alt + arrow keys: rotate the view around center\n")
+        shortcuts += "\n\n"
+        shortcuts += _("Projection/Orthographic\n")
+        shortcuts += "-----------------------\n"
+        shortcuts += "\n\n"
+        shortcuts += _("Space: switch between perspective and orthographic view\n")
+        shortcuts += "\n\n"
+        shortcuts += _("Sun\n")
+        shortcuts += "----\n"
+        shortcuts += "\n\n"
+        shortcuts += _("Ctrl+F1: sun position North-West\n")
+        shortcuts += _("Ctrl+F2: sun position South-West\n")
+        shortcuts += _("Ctrl+F3: sun position South-East\n")
+        shortcuts += _("Ctrl+F4: sun position North-East\n")
+        shortcuts += _("Ctrl+F5: decrease sun intensity\n")
+        shortcuts += _("Ctrl+F6: increase sun intensity\n")
+        shortcuts += _("Ctrl+F7: decrease sun altitude\n")
+        shortcuts += _("Ctrl+F8: increase sun altitude\n")
+        shortcuts += _("Ctrl+F9: iterate on precalculated sun positions (0->8)\n")
+
+        shortcuts += "\n\n"
+        shortcuts += _("Miscellaneous (experimental)\n")
+        shortcuts += "----------------------------\n"
+        shortcuts += "\n\n"
+        shortcuts += _("G: display/hide the grid\n")
+        shortcuts += _("X: display/hide the x plane\n")
+        shortcuts += _("Y: display/hide the y plane\n")
+        shortcuts += _("Z: display/hide the z plane\n")
+        shortcuts += _("C: display/hide the xy plane\n")
+        shortcuts += _("V: display/hide the yz plane\n")
+        shortcuts += _("B: display/hide the xz plane\n")
+        shortcuts += _("H: display the shortcuts\n")
+
+        return shortcuts
+
     def OnKeyDown(self, event):
         """ Called when a key is pressed."""
 
@@ -1310,6 +1437,86 @@ class CanvasOGL(glcanvas.GLCanvas):
             elif keycode == wx.WXK_DOWN:
                 self.rotate_right_eye(-self.rotation_speed)
 
+            elif keycode == ord('C'):
+                # copy image to clipboard
+                self.copy_to_clipboard()
+
+            elif keycode == ord('S'):
+                # save image to file
+                self.save_to_file()
+
+            elif keycode == wx.WXK_F9:
+                # rotate sunposition
+                if self._sun_idx == 0:
+                    self.sunposition = vec3(0., 0., self.sunaltitude) #+ self.center
+                    self._sun_idx +=1
+                elif self._sun_idx == 1:
+                    self.sunposition = vec3(-10000., 0., self.sunaltitude)
+                    self._sun_idx +=1
+                elif self._sun_idx == 2:
+                    self.sunposition = vec3(-10000., -10000, self.sunaltitude)
+                    self._sun_idx +=1
+                elif self._sun_idx == 3:
+                    self.sunposition = vec3(0., -10000, self.sunaltitude)
+                    self._sun_idx +=1
+                elif self._sun_idx == 4:
+                    self.sunposition = vec3(10000., -10000, self.sunaltitude)
+                    self._sun_idx +=1
+                elif self._sun_idx == 5:
+                    self.sunposition = vec3(10000., 0., self.sunaltitude)
+                    self._sun_idx +=1
+                elif self._sun_idx == 6:
+                    self.sunposition = vec3(10000., 10000, self.sunaltitude)
+                    self._sun_idx +=1
+                elif self._sun_idx == 7:
+                    self.sunposition = vec3(0., 10000, self.sunaltitude)
+                    self._sun_idx +=1
+                elif self._sun_idx == 8:
+                    self.sunposition = vec3(-10000., 10000, self.sunaltitude)
+                    self._sun_idx = 0
+
+                logging.info('sun position: {}'.format(self.sunposition))
+
+            elif keycode == wx.WXK_F1:
+                # sun position North-West
+                self.sunposition = vec3(-10000., 10000., self.sunaltitude)
+                logging.info(_('sun position: North-West'))
+
+            elif keycode == wx.WXK_F2:
+                # sun position South-West
+                self.sunposition = vec3(-10000., -10000., self.sunaltitude)
+                logging.info(_('sun position: South-West'))
+
+            elif keycode == wx.WXK_F3:
+                # sun position South-East
+                self.sunposition = vec3(10000., -10000., self.sunaltitude)
+                logging.info(_('sun position: South-East'))
+
+            elif keycode == wx.WXK_F4:
+                # sun position North-East
+                self.sunposition = vec3(10000., 10000., self.sunaltitude)
+                logging.info(_('sun position: North-East'))
+
+            elif keycode == wx.WXK_F5:
+                # sun intensity increase
+                self.sunintensity /= 1.1
+                logging.info(_('sun intensity: {}'.format(self.sunintensity)))
+
+            elif keycode == wx.WXK_F6:
+                # sun intensity decrease
+                self.sunintensity *= 1.1
+                logging.info(_('sun intensity: {}'.format(self.sunintensity)))
+
+            elif keycode == wx.WXK_F8:
+                # sun altitude increase
+                self.sunaltitude += 100.
+                logging.info(_('sun altitude: {}'.format(self.sunaltitude)))
+
+            elif keycode == wx.WXK_F7:
+                # sun altitude decrease
+                self.sunaltitude -= 100.
+                logging.info(_('sun altitude: {}'.format(self.sunaltitude)))
+
         elif altdown:
             if keycode == wx.WXK_LEFT:
                 self.rotate_z_center(-self.rotation_speed)
@@ -1429,6 +1636,14 @@ class CanvasOGL(glcanvas.GLCanvas):
                 self.xy_plane = False
                 self.yz_plane = False
 
+            elif keycode == ord('H'):
+                frmshortcuts = wx.Frame(self, -1, "Shortcuts", size=(400, 800))
+                panel = wx.Panel(frmshortcuts, -1)
+                st = wx.StaticText(panel, -1, self.print_shortcuts(), (10, 10))
+                frmshortcuts.Show()
+                logging.info(self.print_shortcuts())
+
+
         self.update_view()
 
         self.Refresh()

wolfhece/pyshields.py

@@ -303,7 +303,7 @@ def _get_Rouse(d:float, q:float, h:float, K:float, rhom:float=2650., rho:float=R
       elif frac==100:
             return rouse-1.2
 
-def get_transport_mode(d:float, q:float, h:float, K:float, rhom:float=2650., rho:float=RHO_PUREWATER) -> BED_LOAD | SUSPENDED_LOAD_50 | SUSPENDED_LOAD_100 | WASH_LOAD:
+def get_transport_mode(d:float, q:float, h:float, K:float, rhom:float=2650., rho:float=RHO_PUREWATER): # -> BED_LOAD | SUSPENDED_LOAD_50 | SUSPENDED_LOAD_100 | WASH_LOAD:
       """
       Transport mode
 
@@ -350,7 +350,7 @@ def get_d_cr_susp(q:float, h:float, K:float, rhom:float=2650., rho:float=RHO_PUR
       except:
             return 0.
 
-def shieldsdia_sadim(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> [plt.Figure,plt.Axes]:
+def shieldsdia_sadim(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> tuple[plt.Figure,plt.Axes]:
       """ Plot Shields diagram with sadim"""
 
       smax = 1000
@@ -406,7 +406,7 @@ def shieldsdia_sadim(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWAT
 
       return fig,ax
 
-def shieldsdia_dstar(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> [plt.Figure,plt.Axes]:
+def shieldsdia_dstar(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWATER, figax=None) -> tuple[plt.Figure,plt.Axes]:
       """ Plot Shields diagram with dstar"""
 
       smax = 1000
@@ -465,7 +465,7 @@ def shieldsdia_dstar(s_psicr=None, dstar_psicr=None, rhom=2650., rho=RHO_PUREWAT
 
       return fig,ax
 
-def shieldsdia_dim(figax=None) -> [plt.Figure,plt.Axes]:
+def shieldsdia_dim(figax=None) -> tuple[plt.Figure,plt.Axes]:
       """ Plot Shields diagram with dimensional values"""
 
       smax=1e6

wolfhece/pythonfortran/example_makendarray.py

@@ -2,60 +2,65 @@ import numpy as np
 import ctypes as ct
 from tools import make_nd_array
 
-"""
-Création d'un matrice numpy depui un buffer/adresse mémoire
-"""
 
-a = np.zeros((10,10))
+def main():
+    """
+    Création d'un matrice numpy depui un buffer/adresse mémoire
+    """
 
-# a.ctypes.data => int, buffer's memory address
-# see : https://numpy.org/doc/stable/reference/generated/numpy.ndarray.ctypes.html
-q = make_nd_array(a.ctypes.data, a.shape)
+    a = np.zeros((10,10))
 
-#  récupération de la structure ct.pointer pointant vers l'espace de stockage de l'objet numpy "a"'
-p = a.ctypes.data_as(ct.POINTER(ct.c_double))
-#  récupération de l'adresse mémoire dans la structure ctypes.pointer
-addr_p = list(p.contents._b_base_._objects.values())[0].value
-# mais il y a plus simple ...
-addr_p_2 = ct.addressof(p.contents)
+    # a.ctypes.data => int, buffer's memory address
+    # see : https://numpy.org/doc/stable/reference/generated/numpy.ndarray.ctypes.html
+    q = make_nd_array(a.ctypes.data, a.shape)
 
-assert addr_p == addr_p_2
+    #  récupération de la structure ct.pointer pointant vers l'espace de stockage de l'objet numpy "a"'
+    p = a.ctypes.data_as(ct.POINTER(ct.c_double))
+    #  récupération de l'adresse mémoire dans la structure ctypes.pointer
+    addr_p = list(p.contents._b_base_._objects.values())[0].value
+    # mais il y a plus simple ...
+    addr_p_2 = ct.addressof(p.contents)
 
-#  comparaison avec l'adresse mémoire du buffer de a
-print(addr_p, a.ctypes.data)
-assert a.ctypes.data == addr_p, 'Not the same address'
+    assert addr_p == addr_p_2
 
-c=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=False, readonly=False, order='F')
-d=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=True , readonly=False, order='F')
+    #  comparaison avec l'adresse mémoire du buffer de a
+    print(addr_p, a.ctypes.data)
+    assert a.ctypes.data == addr_p, 'Not the same address'
 
-e=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=False, readonly=True, order='F')
-f=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=True , readonly=True, order='F')
-g=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=True , readonly=False, order='F')
+    c=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=False, readonly=False, order='F')
+    d=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=True , readonly=False, order='F')
 
-assert c.ctypes.data == a.ctypes.data, 'Not the same address'
-assert d.ctypes.data != a.ctypes.data, 'Same address'
+    e=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=False, readonly=True, order='F')
+    f=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=True , readonly=True, order='F')
+    g=make_nd_array(addr_p, [10,10], dtype=np.float64, own_data=True , readonly=False, order='F')
 
-assert e.flags.writeable == False, 'Array "e" is in read/write mode'
-assert f.flags.writeable == False, 'Array "f" is in read/write mode'
-assert g.flags.writeable == True,  'Array "g" is in read only mode'
+    assert c.ctypes.data == a.ctypes.data, 'Not the same address'
+    assert d.ctypes.data != a.ctypes.data, 'Same address'
 
+    assert e.flags.writeable == False, 'Array "e" is in read/write mode'
+    assert f.flags.writeable == False, 'Array "f" is in read/write mode'
+    assert g.flags.writeable == True,  'Array "g" is in read only mode'
 
-# Initialisation d'une Numpy array as 'C' order or 'F' order
-a = np.zeros((10,10), dtype=np.float64, order='C') # default order == 'C'
-a[:,1:]=3.
 
-h=make_nd_array(a.ctypes.data, [10,1], dtype=np.float64, own_data=True , readonly=False, order='F') # première ligne
-# h = [0,3,3,3,3,3,3,3,3,3,3]
+    # Initialisation d'une Numpy array as 'C' order or 'F' order
+    a = np.zeros((10,10), dtype=np.float64, order='C') # default order == 'C'
+    a[:,1:]=3.
 
-assert h.shape==(10,1)
-assert (h == np.asarray([[0.],[3.],[3.],[3.],[3.],[3.],[3.],[3.],[3.],[3.]])).all()
+    h=make_nd_array(a.ctypes.data, [10,1], dtype=np.float64, own_data=True , readonly=False, order='F') # première ligne
+    # h = [0,3,3,3,3,3,3,3,3,3,3]
 
-a = np.zeros((10,10), dtype=np.float64, order='F')
-a[:,1:]=3.
+    assert h.shape==(10,1)
+    assert (h == np.asarray([[0.],[3.],[3.],[3.],[3.],[3.],[3.],[3.],[3.],[3.]])).all()
 
-i=make_nd_array(a.ctypes.data, [10,1], dtype=np.float64, own_data=True , readonly=False, order='F') # première colonne
-# i = [0,0,0,0,0,0,0,0,0,0]
+    a = np.zeros((10,10), dtype=np.float64, order='F')
+    a[:,1:]=3.
 
-assert i.shape==(10,1)
-assert (i == np.asarray([0.,0.,0.,0.,0.,0.,0.,0.,0.,0.])).all()
-assert (i == np.asarray([[0.],[0.],[0.],[0.],[0.],[0.],[0.],[0.],[0.],[0.]])).all()
+    i=make_nd_array(a.ctypes.data, [10,1], dtype=np.float64, own_data=True , readonly=False, order='F') # première colonne
+    # i = [0,0,0,0,0,0,0,0,0,0]
+
+    assert i.shape==(10,1)
+    assert (i == np.asarray([0.,0.,0.,0.,0.,0.,0.,0.,0.,0.])).all()
+    assert (i == np.asarray([[0.],[0.],[0.],[0.],[0.],[0.],[0.],[0.],[0.],[0.]])).all()
+
+if __name__ == '__main__':
+    main()