wolfhece 2.1.118__py3-none-any.whl → 2.1.120__py3-none-any.whl

wolfhece/lazviewer/viewer/qt.conf

@@ -0,0 +1,2 @@
+[Paths]
+Plugins=../libs/qt_plugins

wolfhece/lazviewer/viewer/viewer.py

@@ -12,8 +12,12 @@ _viewer_dir = os.path.dirname(inspect.getfile(inspect.currentframe()))
 if not os.path.isabs(_viewer_dir):
     _viewer_dir = os.path.abspath(_viewer_dir)
 
-__all__ = ['viewer']
+_viewer_libs_dir = os.path.join(_viewer_dir, '../libs')
+
+if not os.path.isabs(_viewer_libs_dir):
+    _viewer_libs_dir = os.path.abspath(_viewer_libs_dir)
 
+__all__ = ['viewer']
 
 class viewer:
     def __init__(self, *args, **kwargs):
@@ -22,7 +26,7 @@ class viewer:
         Examples:
             Create 100 random points
 
-            >>> xyz = pptk.rand(100, 3)
+            >>> xyz = pptk.rand(100, 3)python
 
             Visualize the points
 
@@ -49,10 +53,16 @@ class viewer:
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         s.bind(('localhost', 0))
         s.listen(0)
-        self._process = subprocess.Popen(
-            [os.path.join(_viewer_dir, 'viewer'), str(s.getsockname()[1])],
-            stdout=subprocess.PIPE,
-            stderr=(None if debug else subprocess.PIPE))
+
+        env = os.environ.copy()
+        env["PATH"] = _viewer_dir + os.pathsep + _viewer_libs_dir + os.pathsep + env["PATH"]
+        # print(env["PATH"])
+
+        self._process = subprocess.Popen([os.path.join(_viewer_dir, 'viewer'),
+                                          str(s.getsockname()[1])],
+                                          stdout=subprocess.PIPE,
+                                          stderr=(None if debug else subprocess.PIPE),
+                                          env = env)
         if debug:
             print ('Started viewer process: %s' \
                 % os.path.join(_viewer_dir, 'viewer'))
@@ -366,6 +376,8 @@ class viewer:
             >>> ffmpeg -i "frame_%03d.png" -c:v mpeg4 -qscale:v 0 -r 24 output.mp4
 
         """
+        import time
+
         if not os.path.isdir(folder):
             raise ValueError('invalid folder provided')
         poses, ts = _fix_poses_ts_input(poses, ts)
@@ -394,12 +406,20 @@ class viewer:
                 struct.pack('2f', t, t) + \
                 struct.pack('?', False)
             self.__send(msg)
+
+            time.sleep(0.1)
+
             filename = prefix \
                 + ('%0' + str(num_digits) + 'd') % (i + 1) + '.' + ext
             filename = os.path.join(folder, filename)
             self.capture(filename)
-            # todo: need to check whether write succeeded
-            #       ideally, capture(...) should return filename
+            # check whether write succeeded
+
+            tot_sec = 0.
+            while not os.path.isfile(filename) and tot_sec < 5.:
+                # wait for file to be written
+                time.sleep(0.1)
+                tot_sec += 0.1
 
     def wait(self):
         """

wolfhece/matplotlib_fig.py

@@ -1242,7 +1242,18 @@ class Matplotlib_Figure(wx.Frame):
         size_x, size_y = self.fig.get_size_inches()
 
         if self.wx_exists:
-            wx.Frame.__init__(self, None, -1, 'Matplotlib Figure', size=(size_x*dpi+16, size_y*dpi+240), style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER)
+            size_x = size_x*dpi+16
+            size_y = size_y*dpi+240
+
+            #compare to screen size
+            screen = wx.Display(0)
+            screen_size = screen.GetGeometry().GetSize()
+            if size_x > screen_size[0]:
+                size_x = screen_size[0]
+            if size_y > screen_size[1]:
+                size_y = screen_size[1]
+
+            wx.Frame.__init__(self, None, -1, 'Matplotlib Figure', size=(size_x, size_y), style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER)
 
         self.ax_dict:dict[str,Axes] = {}    # dict of axes
         self.ax:list[Axes] = []             # list of axes -- always flatten
@@ -2048,6 +2059,13 @@ class Matplotlib_Figure(wx.Frame):
             return key, list(self.ax_dict.values()).index(key)
 
     def plot(self, x:np.ndarray, y:np.ndarray, ax:Axes | int | str= None, **kwargs):
+        """ Plot x, y on the current ax or on the ax specified
+
+        :param x: x values
+        :param y: y values
+        :param ax: ax to plot on
+        :param kwargs: kwargs for the plot (same as matplotlib.pyplot.plot)
+        """
 
         ax, idx_ax = self.get_ax_idx(ax)
 
@@ -2068,8 +2086,72 @@ class Matplotlib_Figure(wx.Frame):
                 self._line_current.SetSelection(len(ax.get_lines())-1)
 
         self.fig.tight_layout()
+        self.fig.canvas.draw()
         self.update_layout()
 
+    def scatter(self, x:np.ndarray, y:np.ndarray, ax:Axes | int | str= None, **kwargs):
+        """ Scatter Plot x, y on the current ax or on the ax specified
+
+        :param x: x values
+        :param y: y values
+        :param ax: ax to plot on
+        :param kwargs: kwargs for the plot (same as matplotlib.pyplot.plot)
+        """
+
+        ax, idx_ax = self.get_ax_idx(ax)
+
+        ax.scatter(x, y, **kwargs)
+
+        new_props = Matplolib_line_properties(ax.get_lines()[-1], self._axes_properties[idx_ax])
+
+        if self.wx_exists:
+            new_props.add_props_to_sizer(self._collaps_pane.GetPane(), self._sizer_grid_props)
+
+        ax_prop:Matplotlib_ax_properties = self._axes_properties[idx_ax]
+        ax_prop._lines.append(new_props)
+        ax_prop.get_properties()
+
+        if self.wx_exists:
+            if ax == self.cur_ax:
+                self._line_current.SetItems([line.get_label() for line in ax.get_lines()])
+                self._line_current.SetSelection(len(ax.get_lines())-1)
+
+        self.fig.tight_layout()
+        self.fig.canvas.draw()
+        self.update_layout()
+
+    def violinplot(self, dataset:np.ndarray, position:np.ndarray=None, ax:Axes | int | str= None, **kwargs):
+        """ Plot x, y on the current ax or on the ax specified
+
+        :param x: x values
+        :param y: y values
+        :param ax: ax to plot on
+        :param kwargs: kwargs for the plot (same as matplotlib.pyplot.plot)
+        """
+
+        ax, idx_ax = self.get_ax_idx(ax)
+
+        ax.violinplot(dataset, position, **kwargs)
+
+        # new_props = Matplolib_line_properties(ax.get_lines()[-1], self._axes_properties[idx_ax])
+
+        # if self.wx_exists:
+        #     new_props.add_props_to_sizer(self._collaps_pane.GetPane(), self._sizer_grid_props)
+
+        # ax_prop:Matplotlib_ax_properties = self._axes_properties[idx_ax]
+        # ax_prop._lines.append(new_props)
+        # ax_prop.get_properties()
+
+        # if self.wx_exists:
+        #     if ax == self.cur_ax:
+        #         self._line_current.SetItems([line.get_label() for line in ax.get_lines()])
+        #         self._line_current.SetSelection(len(ax.get_lines())-1)
+
+        self.fig.tight_layout()
+        self.fig.canvas.draw()
+        self.update_layout()
+
+
     def to_dict(self) -> dict:
         """ properties to dict """
 

wolfhece/opengl/py3d.py

@@ -1238,7 +1238,7 @@ class CanvasOGL(glcanvas.GLCanvas):
         curarray = self.arrays[list(self.arrays.keys())[int(idx)-1]]
         i = int(x)
         j = int(y)
-        
+
         if i > 0 and i < curarray.ztexture.shape[0] and j > 0 and j < curarray.ztexture.shape[1]:
             z = curarray.ztexture[i, j]
 
@@ -1798,9 +1798,15 @@ class Wolf_Viewer3D(wx.Frame):
         """ Add an array to the canvas """
         self.canvas.add_array(name, array)
 
-    def force_view(self, x, y, z):
-        """ Force the view to the specified coordinates """
-        self.canvas.force_view(x, y, z)
+    def force_view(self, x, y, z= -1):
+        """ Force the view to the specified coordinates.
+
+        if z == -1, the z value is the same as the current z value."""
+        if z==-1:
+            curx,cury,curz = self.canvas.center
+            self.canvas.force_view(x, y, curz)
+        else:
+            self.canvas.force_view(x, y, z)
 
     def autoscale(self):
         """ Auto scale the view to fit all the arrays """