mwxlib 1.5.13__py3-none-any.whl → 1.6.0__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.5.13"
+__version__ = "1.6.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/graphman.py

@@ -554,25 +554,13 @@ class Graph(GraphPlot):
         if self.infobar.IsShown():
             self.infobar.ShowMessage(frame.annotation)
     
-    def get_markups_visible(self):
-        return self.marked.get_visible()
-    
-    def set_markups_visible(self, v):
-        self.selected.set_visible(v)
-        self.marked.set_visible(v)
-        self.rected.set_visible(v)
-        self.update_art_of_mark()
-    
-    def remove_markups(self):
-        del self.selector
-        del self.markers
-        del self.region
-    
     def hide_layers(self):
         for plug in self.parent.get_all_plugs():
             for art in plug.Arts:
                 art.set_visible(0)
-        self.remove_markups()
+        del self.selector
+        del self.markers
+        del self.region
         self.draw()
 
 
@@ -740,13 +728,6 @@ class Frame(mwx.Frame):
             (wx.ID_PASTE, "&Paste\t(C-v)", "Paste buffer from clipboard", Icon('paste'),
                 lambda v: self.__view.read_buffer_from_clipboard()),
             (),
-            (mwx.ID_(21), "Toggle &markers", "Show/Hide markups", wx.ITEM_CHECK, Icon('+'),
-                lambda v: self.__view.set_markups_visible(v.IsChecked()),
-                lambda v: v.Check(self.__view.get_markups_visible())),
-                
-            (mwx.ID_(22), "&Remove markers", "Remove markups", Icon('-'),
-                lambda v: self.__view.remove_markups()),
-            (),
             (mwx.ID_(23), "Hide all &layers", "Hide all layers", Icon('xr'),
                 lambda v: self.__view.hide_layers()),
             (),
@@ -756,14 +737,14 @@ class Frame(mwx.Frame):
                 
             (mwx.ID_(25), "&Invert color\t(C-i)", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.__view.invert_cmap(),
-                lambda v: v.Check(self.__view.get_cmap()[-2:] == "_r")),
+                lambda v: v.Check(self.__view.get_cmapstr()[-2:] == "_r")),
         ]
         
         def _cmenu(i, name):
             return (mwx.ID_(30 + i), "&" + name, name, wx.ITEM_CHECK,
-                lambda v: self.__view.set_cmap(name),
-                lambda v: v.Check(self.__view.get_cmap() == name
-                               or self.__view.get_cmap() == name+"_r"),
+                lambda v: self.__view.set_cmapstr(name),
+                lambda v: v.Check(self.__view.get_cmapstr() == name
+                               or self.__view.get_cmapstr() == name+"_r"),
             )
         colours = [c for c in dir(cm) if c[-2:] != "_r"
                     and isinstance(getattr(cm, c), colors.LinearSegmentedColormap)]
@@ -771,8 +752,8 @@ class Frame(mwx.Frame):
         self.menubar["Edit"] += [
             (),
             ## (mwx.ID_(26), "Default Color", "gray", wx.ITEM_CHECK,
-            ##     lambda v: self.__view.set_cmap('gray'),
-            ##     lambda v: v.Check(self.__view.get_cmap()[:4] == "gray")),
+            ##     lambda v: self.__view.set_cmapstr('gray'),
+            ##     lambda v: v.Check(self.__view.get_cmapstr()[:4] == "gray")),
             ##     
             ("Standard colors",
                 [_cmenu(i, c) for i, c in enumerate(colours) if c.islower()]),
@@ -814,8 +795,8 @@ class Frame(mwx.Frame):
         })
         
         ## Add main-menu to context-menu
-        self.graph.menu += self.menubar["Edit"][2:7]
-        self.output.menu += self.menubar["Edit"][2:7]
+        self.graph.menu += self.menubar["Edit"][2:4]
+        self.output.menu += self.menubar["Edit"][2:4]
         
         self._mgr.Bind(aui.EVT_AUI_PANE_CLOSE, self.OnPaneClose)
         

mwx/matplot2g.py

@@ -51,7 +51,8 @@ def _to_buffer(img):
     if not isinstance(img, np.ndarray):
         raise ValueError("targets must be arrays or images.")
     
-    assert img.ndim > 1, "targets must be 2d arrays."
+    if img.ndim < 2:
+        raise ValueError("targets must be 2d arrays.")
     
     if img.ndim > 2:
         return cv2.cvtColor(img, cv2.COLOR_RGB2GRAY)
@@ -324,13 +325,19 @@ class AxesImagePhantom:
             sx = slice(max(0, nx[0]), nx[1])  # nx slice
             sy = slice(max(0, ny[1]), ny[0])  # ny slice 反転 (降順)
             return self.__buf[sy, sx]
-        return self.__buf
+        return None
     
     @roi.setter
     def roi(self, v):
-        self.roi[:] = v # cannot broadcast input array into different shape
+        if not self.parent.region.size:
+             raise ValueError("region is not selected.")
+        self.roi[:] = v  # cannot broadcast input array into different shape
         self.update_buffer()
     
+    @property
+    def roi_or_buffer(self):
+        return self.roi if self.parent.region.size else self.buffer
+    
     @property
     def buffer(self):
         return self.__buf
@@ -565,7 +572,7 @@ class GraphPlot(MatplotPanel):
             (),
             (mwx.ID_(500), "&Invert Color", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.invert_cmap(),
-                lambda v: v.Check(self.get_cmap()[-2:] == "_r")),
+                lambda v: v.Check(self.get_cmapstr()[-2:] == "_r")),
             (),
             (wx.ID_CLOSE, "&Kill buffer\t(C-k)", "Kill buffer", _Icon(wx.ART_DELETE),
                 lambda v: self.kill_buffer(),
@@ -637,7 +644,7 @@ class GraphPlot(MatplotPanel):
             show: Show immediately when loaded.
             **kwargs: frame attributes.
         """
-        assert buf is not None, "Load buffer must be an array or string (not None)"
+        assert buf is not None, "Load buffer must be an array or path:str (not None)"
         
         if isinstance(buf, str):
             buf = Image.open(buf)
@@ -898,12 +905,12 @@ class GraphPlot(MatplotPanel):
             self.handler('frame_deselected', self.frame)
             self.on_picker_lock(evt)
     
-    def get_cmap(self):
+    def get_cmapstr(self):
         if self.frame:
             return self.frame.get_cmap().name
         return ''
     
-    def set_cmap(self, name):
+    def set_cmapstr(self, name):
         if self.frame:
             self.frame.set_cmap(name)
             self.handler('frame_cmapped', self.frame)
@@ -912,7 +919,7 @@ class GraphPlot(MatplotPanel):
     def invert_cmap(self):
         if self.frame:
             name = self.frame.get_cmap().name
-            self.set_cmap(name + "_r" if name[-2:] != "_r" else name[:-2])
+            self.set_cmapstr(name + "_r" if name[-2:] != "_r" else name[:-2])
     
     def trace_point(self, x, y, type=NORMAL):
         """Puts (override) a message of points x and y."""
@@ -985,7 +992,7 @@ class GraphPlot(MatplotPanel):
             return
         
         name = frame.name
-        data = frame.roi
+        data = frame.roi_or_buffer
         GraphPlot.clipboard_name = name
         GraphPlot.clipboard_data = data
         bins, vlim, img = _to_image(data, frame.cuts)

mwx/plugins/ffmpeg_view.py

@@ -216,7 +216,7 @@ class Plugin(Layer):
             tc.value = round(self.mc.Tell()) / 1000
     
     def set_crop(self):
-        """Set crop area (W:H:Left:Top) to roi."""
+        """Set crop area (W:H:Left:Top) to ROI."""
         if not self._path:
             return
         frame = self.graph.frame
@@ -232,7 +232,7 @@ class Plugin(Layer):
                 self.message("Failed to evaluate crop text.")
     
     def get_crop(self):
-        """Get crop area (W:H:Left:Top) from roi."""
+        """Get crop area (W:H:Left:Top) from ROI."""
         if not self._path:
             return
         crop = ''

mwx/plugins/fft_view.py

@@ -51,7 +51,7 @@ class Plugin(Layer):
         frame = self.graph.frame
         if frame:
             self.message("FFT execution...")
-            src = fftcrop(frame.roi)
+            src = fftcrop(frame.roi_or_buffer)
             h, w = src.shape
             
             dst = fftshift(fft2(src))
@@ -60,8 +60,7 @@ class Plugin(Layer):
             u = 1 / w
             if self.pchk.Value:
                 u /= frame.unit
-            self.output.load(dst, "*fft of {}*".format(frame.name),
-                                  localunit=u)
+            self.output.load(dst, f"*fft of {frame.name}*", localunit=u)
             self.message("\b done")
     
     def newifft(self):
@@ -69,18 +68,17 @@ class Plugin(Layer):
         frame = self.output.frame
         if frame:
             self.message("iFFT execution...")
-            src = frame.roi
+            src = frame.buffer  # Don't crop fft region
             h, w = src.shape
             
             if self.ftor.check:
                 y, x = np.ogrid[-h/2:h/2, -w/2:w/2]
                 mask = np.hypot(y, x) > w / self.ftor.value
-                src = src.copy() # apply mask to the copy
+                src = src.copy()  # apply mask to the copy
                 src[mask] = 0
             
             dst = ifft2(ifftshift(src))
             
             self.message("\b Loading image...")
-            self.graph.load(dst.real, "*ifft of {}*".format(frame.name),
-                                      localunit=1/w/frame.unit)
+            self.graph.load(dst.real, f"*ifft of {frame.name}*", localunit=1/w/frame.unit)
             self.message("\b done")

{mwxlib-1.5.13.dist-info → mwxlib-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mwxlib
-Version: 1.5.13
+Version: 1.6.0
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

{mwxlib-1.5.13.dist-info → mwxlib-1.6.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
 mwx/controls.py,sha256=B9f_A0ev3SPf75K-LIZCusMLeDGYz1O3cMml7IOrDrM,49870
-mwx/framework.py,sha256=E9wqJeF8_r7qhBGBHAt6lsLdEhckqeTzjPgYPbRpFZ8,77464
-mwx/graphman.py,sha256=m5n4Ew25CXyCszTOI8RiFMNKfJPrV5Rte4ZwdH8bGGo,69831
+mwx/framework.py,sha256=xVov9uy6gheXOphdorERXQ-Pivj2I3Ir3N0t829gkKM,77463
+mwx/graphman.py,sha256=Cmg0mwIGTAHtdXArFxJXPZC7yPGvSvAZexw7zgp02L8,69099
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=cjdN12RENqWFw1v9QyO05XQc6dK3Pn_ltdC3OfmhGfg,32995
-mwx/matplot2g.py,sha256=KY4zvtd-11RhlaSJD8nNbzv2cM4i3IWDi1rFmQJf8_g,65213
+mwx/matplot2g.py,sha256=0gxjl7UKx8QGRI2thpniA7dQu9fpHGG0mvl7Ml2exrc,65474
 mwx/matplot2lg.py,sha256=jE-LYPEVaEapQN8L-eviRyEx4Lw-8GyLGzZotrIZShU,27413
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
 mwx/nutshell.py,sha256=Sa5PKSiXxT74Mj_vE9fUinxkfm5Xtg1MGGUjwbRH-yY,147552
@@ -16,13 +16,13 @@ mwx/wxpdb.py,sha256=ehRawAnqQberUeDN9j_-drWYQzu23w5UeQyto4nj53g,18812
 mwx/wxwil.py,sha256=_74m3jEUu3ktjHKHWEEK34ck439u9A0PhDDxFVTA0_Y,5404
 mwx/wxwit.py,sha256=W7wP9loxw0dAdk5-NWMIHt19Og1h-3vFzz-8BPicHB4,7348
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=GT3mAP7cvAgkzHyA0Em_FP8wiWS-dRekUyBgaXIBQCc,10982
-mwx/plugins/fft_view.py,sha256=Hsho8y-42hG3htQAJ9ct1347NHJ8qPvN4snq_1jYOxw,2793
+mwx/plugins/ffmpeg_view.py,sha256=TZX4hoB4z8vJ2yO_aXHOkc7kHxRASVLchY5TRkqPbrU,10982
+mwx/plugins/fft_view.py,sha256=k_Ow7osBR-nXyiqAPFdEsd7B3Q-87By3INntJMZxahc,2742
 mwx/plugins/frame_listview.py,sha256=yd2NCgspqGfTNhj1wxuW8r1zapIm7vNzVX2iytk8CDM,10618
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=vWCJoHd_oyXOeXTHtXGY7wfNQeNAZhV3GZu4xlc8GDY,16867
-mwxlib-1.5.13.dist-info/METADATA,sha256=Z1q0ZF9W0_js50oiiwHqvPtGXRCPMrbkih4zpgM-G3w,7382
-mwxlib-1.5.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.5.13.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.5.13.dist-info/RECORD,,
+mwxlib-1.6.0.dist-info/METADATA,sha256=ZLDHrIHbEvcB3Ee4lLQxk6ZnDFkL5aXN3gT5QdkcyBc,7381
+mwxlib-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.6.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.6.0.dist-info/RECORD,,