wolfhece 2.2.33__py3-none-any.whl → 2.2.35__py3-none-any.whl

wolfhece/wolf_texture.py

@@ -48,12 +48,32 @@ class genericImagetexture(Element_To_Draw):
                  which: str,
                  label: str,
                  mapviewer,
-                 xmin, xmax, ymin, ymax,
-                 imageFile="",
-                 imageObj=None,
+                 xmin:float, xmax:float, ymin:float, ymax:float,
+                 imageFile:str = "",
+                 imageObj = None,
                  transparent_color = None,
                  tolerance:int = 3,
-                 replace_color = None) -> None:
+                 replace_color = None,
+                 drawing_scale:float = 1.0,
+                 offset:list[float, float] = [0.,0.]) -> None:
+
+        """ Initialize the image texture
+
+        :param which: Type of image (e.g., 'satellite', 'map', etc.)
+        :param label: Label for the texture
+        :param mapviewer: The map viewer object to which this texture belongs
+        :param xmin: Minimum X coordinate for the texture
+        :param xmax: Maximum X coordinate for the texture
+        :param ymin: Minimum Y coordinate for the texture
+        :param ymax: Maximum Y coordinate for the texture
+        :param imageFile: Optional file path to load the image from
+        :param imageObj: Optional PIL Image object to use instead of loading from file
+        :param transparent_color: Color to treat as transparent in the image
+        :param tolerance: Tolerance for color matching when replacing transparent color
+        :param replace_color: Color to replace the transparent color with
+        :param drawing_scale: Scale factor for the image
+        :param offset: Offset to apply to the texture position
+        """
 
         super().__init__(label, True, mapviewer, False)
 
@@ -61,6 +81,7 @@ class genericImagetexture(Element_To_Draw):
             self.mapviewer.canvas.SetCurrent(mapviewer.context)
         except:
             logging.error(_('Opengl setcurrent -- Do you have a active canvas ?'))
+            return
 
         self.time = None
         self.xmin = xmin
@@ -82,6 +103,9 @@ class genericImagetexture(Element_To_Draw):
         self.imageFile = imageFile
         self.myImage = imageObj
 
+        self.drawing_scale = drawing_scale
+        self.offset = offset
+
         if imageFile != "":
             if exists(imageFile):
                 try:
@@ -142,6 +166,11 @@ class genericImagetexture(Element_To_Draw):
             del self.myImage
 
     def load(self, imageFile=""):
+        """ Load the image texture into OpenGL
+
+        :param imageFile: Optional file path to load the image from
+        """
+
         if self.width == -99999 or self.height == -99999:
             return
 
@@ -167,6 +196,7 @@ class genericImagetexture(Element_To_Draw):
                 'Opengl setcurrent -- maybe a conflict with an existing opengl32.dll file - please rename the opengl32.dll in the libs directory and retry')
 
     def update_minmax(self):
+        """ Update the spatial extent of the texture based on its size """
 
         if self.myImage is None:
             return
@@ -181,7 +211,7 @@ class genericImagetexture(Element_To_Draw):
 
             self.ymax = self.ymin + dx *scale
 
-    def reload(self,xmin=-99999,xmax=-99999,ymin=-99999,ymax=-99999):
+    def reload(self, xmin=-99999, xmax=-99999, ymin=-99999, ymax=-99999):
 
         if xmin !=-99999:
             self.xmin = xmin
@@ -210,7 +240,28 @@ class genericImagetexture(Element_To_Draw):
         # Nothing to do, set during initialization phase
         pass
 
+    def uv(self, x: float, y: float) -> tuple[float, float]:
+        """ Convert coordinates to texture coordinates taking into account the texture's spatial extent,
+        the scaleing factor, and the offset.
+
+        :param x: X coordinate in pixels
+        :param y: Y coordinate in pixels
+        :return: Tuple of (u, v) texture coordinates
+        """
+        if self.width == -99999 or self.height == -99999:
+            return 0.0, 0.0
+
+        u = (x - self.offset[0] - self.xmin) / ((self.xmax - self.xmin) * self.drawing_scale)
+        v = 1.0 - (y - self.offset[1] - self.ymin) / ((self.ymax - self.ymin) * self.drawing_scale)
+
+        # Ensure u and v are within the range [0, 1]
+        u = max(0.0, min(1.0, u))
+        v = max(0.0, min(1.0, v))
+
+        return u, v
+
     def paint(self):
+        """ Paint the image texture on the OpenGL canvas """
 
         glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)
 
@@ -222,14 +273,31 @@ class genericImagetexture(Element_To_Draw):
         glBindTexture(GL_TEXTURE_2D, self.idtexture[0])
 
         glBegin(GL_QUADS)
-        glTexCoord2f(0.0, 0.0)
-        glVertex2f(self.xmin, self.ymax)
-        glTexCoord2f(1.0, 0.0)
-        glVertex2f(self.xmax, self.ymax)
-        glTexCoord2f(1.0, 1.0)
-        glVertex2f(self.xmax, self.ymin)
-        glTexCoord2f(0.0, 1.0)
-        glVertex2f(self.xmin, self.ymin)
+
+        # Draw a quad with texture coordinates
+        xy = [[self.xmin, self.ymax],
+              [self.xmax, self.ymax],
+              [self.xmax, self.ymin],
+              [self.xmin, self.ymin]]
+        uv = [self.uv(x,y) for x,y in xy]
+
+        glTexCoord2f(uv[0][0], uv[0][1])
+        glVertex2f(xy[0][0], xy[0][1])
+        glTexCoord2f(uv[1][0], uv[1][1])
+        glVertex2f(xy[1][0], xy[1][1])
+        glTexCoord2f(uv[2][0], uv[2][1])
+        glVertex2f(xy[2][0], xy[2][1])
+        glTexCoord2f(uv[3][0], uv[3][1])
+        glVertex2f(xy[3][0], xy[3][1])
+
+        # glTexCoord2f(0.0, 0.0)
+        # glVertex2f(self.xmin, self.ymax)
+        # glTexCoord2f(1.0, 0.0)
+        # glVertex2f(self.xmax, self.ymax)
+        # glTexCoord2f(1.0, 1.0)
+        # glVertex2f(self.xmax, self.ymin)
+        # glTexCoord2f(0.0, 1.0)
+        # glVertex2f(self.xmin, self.ymin)
         glEnd()
         glDisable(GL_TEXTURE_2D)
         glDisable(GL_BLEND)