mwxlib 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

mwx/controls.py

@@ -73,7 +73,7 @@ class Param:
             v = self.value
         try:
             return self.__format(v)
-        except ValueError:
+        except (TypeError, ValueError):
             return str(v)
     
     def __int__(self):
@@ -93,7 +93,7 @@ class Param:
                 return
         elif isinstance(v, str):
             try:
-                v = self.__eval(v.replace(',', '')) # eliminates commas; includes nan, inf
+                v = self.__eval(v.replace(',', '')) # eliminates commas
             except Exception:
                 v = self.value
                 internal_callback = False
@@ -202,9 +202,10 @@ class Param:
     def index(self):
         """A knob index -> value.
         Returns -1 if the value is not defined."""
-        if self:
-            return int(np.searchsorted(self.range, self.value))
-        return -1
+        v = self.value
+        if np.isnan(v) or np.isinf(v):
+            return -1
+        return int(np.searchsorted(self.range, v))
     
     @index.setter
     def index(self, j):
@@ -267,7 +268,7 @@ class LParam(Param):
         v = self.value
         if np.isnan(v) or np.isinf(v):
             return -1
-        return int(round((self.value - self.min) / self.step))
+        return int(round((v - self.min) / self.step))
     
     @index.setter
     def index(self, j):

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.1.5"
+__version__ = "1.1.7"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1979,7 +1979,7 @@ class ShellFrame(MiniFrame):
         if self.findDlg:
             self.OnFindClose(None)
         wnd.EnsureVisible(wnd.cline)
-        wnd.EnsureLineMoreOnScreen(wnd.cline)
+        wnd.ensureLineMoreOnScreen(wnd.cline)
     
     def OnFindPrev(self, evt):
         self.OnFindNext(evt, backward=True)

mwx/matplot2g.py

@@ -235,11 +235,11 @@ class AxesImagePhantom:
     
     @unit.setter
     def unit(self, v):
-        if v is None:
+        if v is None or np.isnan(v): # nan => undefined
             v = self.parent.unit
             self.__localunit = None
-        elif np.isnan(v) or np.isinf(v):
-            raise ValueError("The unit value cannot be NaN or Inf")
+        elif np.isinf(v):
+            raise ValueError("The unit value must not be inf")
         elif v <= 0:
             raise ValueError("The unit value must be greater than zero")
         else:
@@ -802,10 +802,8 @@ class GraphPlot(MatplotPanel):
     
     @unit.setter
     def unit(self, v):
-        if v is None:
-            raise ValueError("The globalunit must be non-nil value")
-        elif np.isnan(v) or np.isinf(v):
-            raise ValueError("Axis limits cannot be NaN or Inf")
+        if v is None or np.isnan(v) or np.isinf(v):
+            raise ValueError("The unit value must not be nan or inf")
         elif v <= 0:
             raise ValueError("The unit value must be greater than zero")
         else:

mwx/nutshell.py

@@ -667,35 +667,30 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.__mark = -1
         self.__stylus = {}
     
-    __dnd_from = None
     __dnd_flag = 0
     
     def OnDrag(self, evt): #<wx._core.StyledTextEvent>
-        EditorInterface.__dnd_from = evt.EventObject
-        try:
-            EditorInterface.__dnd_flag = (evt.Position < self.bolc) # force copy
-        except AttributeError:
+        if isinstance(self, Shell):
+            EditorInterface.__dnd_flag = (evt.Position < self.bolc) # readonly
+        else:
             EditorInterface.__dnd_flag = 0
         evt.Skip()
     
     def OnDragging(self, evt): #<wx._core.StyledTextEvent>
-        _from = EditorInterface.__dnd_from
-        _to = evt.EventObject
-        if isinstance(_from, Shell) and _from is not _to:  # from shell to buffer
-            wx.UIActionSimulator().KeyDown(wx.WXK_CONTROL) # force copy
-        try:
-            if evt.Position < self.bolc:
-                evt.DragResult = wx.DragNone # Don't drop (as readonly)
+        if isinstance(self, Shell):
+            if evt.Position < self.bolc: # target is readonly
+                evt.DragResult = wx.DragNone
             elif EditorInterface.__dnd_flag:
-                evt.DragResult = wx.DragCopy # Don't move
-        except AttributeError:
-            pass
+                ## from shell to shell
+                evt.DragResult = wx.DragCopy if wx.GetKeyState(wx.WXK_CONTROL) else wx.DragNone
+        else:
+            if EditorInterface.__dnd_flag:
+                ## from shell to buffer
+                evt.DragResult = wx.DragCopy if wx.GetKeyState(wx.WXK_CONTROL) else wx.DragNone
         evt.Skip()
     
     def OnDragged(self, evt): #<wx._core.StyledTextEvent>
-        EditorInterface.__dnd_from = None
         EditorInterface.__dnd_flag = 0
-        wx.UIActionSimulator().KeyUp(wx.WXK_CONTROL)
         evt.Skip()
     
     ## --------------------------------
@@ -1108,7 +1103,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 break
             lc = la
         self.ToggleFold(lc)
-        self.EnsureLineOnScreen(lc)
+        self.ensureLineOnScreen(lc)
         return lc
     
     def get_region(self, line):
@@ -1265,7 +1260,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         w, h = self.PointFromPosition(pos)
         return self.FirstVisibleLine + h//self.TextHeight(0)
     
-    def EnsureLineOnScreen(self, line):
+    def ensureLineOnScreen(self, line):
         """Ensure a particular line is visible by scrolling the buffer
         without expanding any header line hiding it.
         """
@@ -1277,7 +1272,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         elif vl > hl + n - 1:
             self.ScrollToLine(vl - n + 1)
     
-    def EnsureLineMoreOnScreen(self, line, offset=0):
+    def ensureLineMoreOnScreen(self, line, offset=0):
         """Ensure a particular line is visible by scrolling the buffer
         without expanding any header line hiding it.
         If the line is at the screen edge, recenter it.
@@ -2446,7 +2441,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     for fn in dlg.Paths:
                         self.find_file(fn)
             return
-        if self.load_file(filename) == False:
+        if self.load_file(filename) == False: # not None
             buf = self.create_buffer(filename)
             buf._Buffer__mtime = 0 # => need_buffer_save
             self.swap_buffer(buf)

mwx/wxpdb.py

@@ -330,7 +330,7 @@ class Debugger(Pdb):
                     buffer.recenter(3)
                 buffer.goto_line(lineno - 1)
                 buffer.pointer = lineno - 1 # (->) pointer:marker
-                buffer.EnsureLineMoreOnScreen(lineno - 1)
+                buffer.ensureLineMoreOnScreen(lineno - 1)
             self.code = code
         wx.CallAfter(_mark)
     

{mwxlib-1.1.5.dist-info → mwxlib-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 1.1.5
+Version: 1.1.7
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto
@@ -17,7 +17,7 @@ Classifier: Topic :: Scientific/Engineering :: Image Processing
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: wxpython >=4.2.0
+Requires-Dist: wxpython>=4.2.0
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
 Requires-Dist: scipy

{mwxlib-1.1.5.dist-info → mwxlib-1.1.7.dist-info}/RECORD

@@ -1,18 +1,18 @@
 mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
 mwx/bookshelf.py,sha256=b_TMDaNIzLHoL0xbbqb3tt0BnRvhLAqaCn_pBdrigZw,7523
-mwx/controls.py,sha256=cNZkgwSv90lPIz61FvMtYxHIt8hJD_RQYXxsgTQIdLc,47949
-mwx/framework.py,sha256=KobxKW3ogvEBdm1I6cKr_4xyP5JTmxpDK3AsnQbLk90,76125
+mwx/controls.py,sha256=trJKRFgum3u-8f8hd6N3qk6jHt4dVqiLgE6CKK5EE4U,47971
+mwx/framework.py,sha256=bgO-mgMMYZtb3cQtPzOyErEVtpSvd9RJEdqFMpcpz6c,76125
 mwx/graphman.py,sha256=LjN1R8UZxHycrgAfnl_SoTT_vHuKcSISr5VVf0cMflM,69821
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=RuVWXC2A_qgZRNmBBptbHDn5MyxaWBqp3ru4bP_lDE0,33150
-mwx/matplot2g.py,sha256=4G5uZJZzATEC3QEVZ4pGHetEDfu5NJNUFyeAaQScK5s,64495
+mwx/matplot2g.py,sha256=dBAODQvSM_yf2uQUCrRO03ZOK3MycR8lEXTJfRXDlbY,64432
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=5X3o2TTXWxZ9pyXy-6XRsIKu09q8_lIWUDoST59FoIA,141488
+mwx/nutshell.py,sha256=wzcZSxTM9G2bYtIBri51-AA6JhiKrtfsh-DMgwJZ5io,141340
 mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
 mwx/utilus.py,sha256=HFvP682SyeSp8yNfUrdUXPhWdLuWVlsUSg6LqNBJOT8,37451
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
-mwx/wxpdb.py,sha256=--TQr-_zs9dWPYV2V4s3Zr4abvN14o5wD8anT9frHUg,18875
+mwx/wxpdb.py,sha256=AObuf4JLAmlQLj-yf0_mkBBd-Bhhz2Vb8hbTVcHEZOs,18875
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
 mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
@@ -22,8 +22,8 @@ mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.1.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.1.5.dist-info/METADATA,sha256=Gr1yxZsOVwU-M2UA0fLOrj78gjkJShfJfx7IwwBO4OU,7259
-mwxlib-1.1.5.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-mwxlib-1.1.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.1.5.dist-info/RECORD,,
+mwxlib-1.1.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.1.7.dist-info/METADATA,sha256=G8xDeGhF9BCMfozwYrtRmZgMltFt3QcKGv_ka5UjSEg,7258
+mwxlib-1.1.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mwxlib-1.1.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.1.7.dist-info/RECORD,,

{mwxlib-1.1.5.dist-info → mwxlib-1.1.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any