wolfhece 2.1.25__py3-none-any.whl → 2.1.27__py3-none-any.whl

wolfhece/libs/WolfOGL.pyx

@@ -2,6 +2,7 @@ from libc.math cimport pow
 from cython.view cimport array as cvarray
 cimport cython 
 import numpy as np
+cimport numpy as np
 cdef extern from "GL\gl.h" nogil:
     enum: __gl_h_
     enum: GL_TYPEDEFS_2_0
@@ -1551,6 +1552,38 @@ cdef extern from "GL\gl.h" nogil:
     void glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, GLfloat *value)
 
 
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef mapColor(float zValue, double[:] colorValues, int paletteSize, double[:,:] colorPalette, int cstcmap):
+    
+    cdef float zColor
+    cdef float lower
+    cdef float upper
+    cdef float[3] loccolor
+
+    # Mapper la valeur sur base d'intervalles
+    if zValue <= colorValues[0]:
+        return colorPalette[0,:]
+    elif (zValue >= colorValues[paletteSize-1]):
+        return colorPalette[-1,:]
+    else:
+        for i in range(1,paletteSize):
+            if zValue <= colorValues[i]:
+                lower = colorValues[i-1]
+                upper = colorValues[i]
+
+                if cstcmap == 1:
+                    return colorPalette[i-1,:]
+                else:
+                    zColor = ((zValue - lower) / (upper - lower))
+                    
+                    for k in range(3):
+                        loccolor[k] = colorPalette[i-1,k] * (1.0 - zColor) + colorPalette[i,k] * zColor
+                    
+                    return loccolor
+    
+    return colorPalette[0,:]
+
 @cython.boundscheck(False)  # Deactivate bounds checking
 @cython.wraparound(False)   # Deactivate negative indexing.
 cpdef double addme(float[:,:] array,double[:,:,:] rgb,double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha):
@@ -1603,3 +1636,327 @@ cpdef double addmeall(float[:,:] array,double[:,:,:] rgb,double ox, double oy, d
                 glNormal3f(0.e0,0.e0,1.e0)
                 glEnd()
 
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addme_uint8(float[:,:] array, np.uint8_t[:,:,:] rgb,double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,np.uint8_t alpha):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+            if array[i,j]!=nullvalue :            
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                glBegin(GL_QUADS)
+                glColor4ub(rgb[i,j,0],rgb[i,j,1],rgb[i,j,2],255)
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+                
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addmeall_uint8(float[:,:] array, np.uint8_t[:,:,:] rgb,double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,np.uint8_t alpha):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                glBegin(GL_QUADS)
+                glColor4ub(rgb[i,j,0],rgb[i,j,1],rgb[i,j,2],255)
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addme_pal(float[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+            if array[i,j]!=nullvalue :            
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(array[i,j],values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+                
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addmeall_pal(float[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(array[i,j],values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addme_int8_pal(np.int8_t[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+            if array[i,j]!=nullvalue :            
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+                
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addmeall_int8_pal(np.int8_t[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addme_int_pal(int[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+            if array[i,j]!=nullvalue :            
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+                
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addmeall_int_pal(int[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addme_int16_pal(np.int16_t[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+            if array[i,j]!=nullvalue :            
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+                
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addmeall_int16_pal(np.int16_t[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addme_double_pal(double[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+            if array[i,j]!=nullvalue :            
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+                
+
+@cython.boundscheck(False)  # Deactivate bounds checking
+@cython.wraparound(False)   # Deactivate negative indexing.
+cpdef double addmeall_double_pal(double[:,:] array, double[:,:] rgb, double[:] values, double ox, double oy, double dx, double dy,int jstart,int jend,int istart,int iend, int cursize, double nullvalue,double alpha, int cst_cmap):
+
+    cdef int i,j
+    cdef double x,y
+    cdef double dxaff,dyaff 
+    
+    dxaff=dx*float(cursize)
+    dyaff=dy*float(cursize)
+
+    for j in range(jstart,jend,cursize):
+        for i in range(istart,iend,cursize):
+                x=ox+float(i)*dx
+                y=oy+float(j)*dy
+
+                color = mapColor(float(array[i,j]),values,len(values),rgb, cst_cmap)
+                glBegin(GL_QUADS)
+                glColor4f(color[0],color[1],color[2],float(alpha))
+                glVertex2d(x,y)
+                glVertex2d(x+dxaff,y)
+                glVertex2d(x+dxaff,y+dyaff)
+                glVertex2d(x,y+dyaff)
+                glNormal3f(0.e0,0.e0,1.e0)
+                glEnd()
+

wolfhece/pyviews.py

@@ -1,7 +1,7 @@
 import logging
 
 from .drawing_obj import Element_To_Draw
-from .wolf_array import WolfArray,WolfArrayMB
+from .wolf_array import WolfArray,WolfArrayMB, VERSION_RGB
 from .PyParams import Wolf_Param, key_Param, Type_Param
 
 class WolfViews(Element_To_Draw):
@@ -178,10 +178,10 @@ class WolfViews(Element_To_Draw):
                 if isinstance(cur,WolfArray):
                     if cur.rgb is None:
                         if pal is not None:
-                            cur.rgb = pal.get_rgba(cur.array)
+                            if VERSION_RGB ==1: cur.rgb = pal.get_rgba(cur.array)
                         else:
                             cur.mypal.defaultgray_minmax(cur.array)
-                            cur.rgb = cur.mypal.get_rgba(cur.array)
+                            if VERSION_RGB ==1: cur.rgb = cur.mypal.get_rgba(cur.array)
 
                 cur.plot(sx,sy,xmin,ymin,xmax,ymax)
                 cur.plotted = oldplotted