mwxlib 1.2.7__py3-none-any.whl → 1.2.9__py3-none-any.whl

mwx/controls.py

@@ -337,13 +337,9 @@ class Knob(wx.Panel):
         label = self.__par.name + '  '
         
         if style == 'chkbox' or style == 'checkbox':
-            if lw >= 0:
-                lw += 16
             self.label = wx.CheckBox(self, label=label, size=(lw,-1))
             self.label.Bind(wx.EVT_CHECKBOX, self.OnCheck)
         elif style == 'button':
-            if lw >= 0:
-                lw += 16
             self.label = pb.PlateButton(self, label=label, size=(lw,-1),
                             style=pb.PB_STYLE_DEFAULT|pb.PB_STYLE_SQUARE)
             self.label.Bind(wx.EVT_BUTTON, self.OnPress)

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.2.7"
+__version__ = "1.2.9"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1484,7 +1484,7 @@ class ShellFrame(MiniFrame):
                                 style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
                             self.__autoload = False # Don't ask any more.
                             return
-                        book.load_file(buf.filename)
+                        book.load_file(buf.filename, buf.markline+1)
         ## Reinitialize self-specific builtins if other instances are destroyed.
         if evt.Active:
             self.Init()

mwx/graphman.py

@@ -1410,7 +1410,7 @@ class Frame(mwx.Frame):
         frames = self.load_buffer(paths, view)
         if frames:
             for frame in frames:
-                frame.set_attributes(res.get(frame.name))
+                frame.update_attr(res.get(frame.name))
         
         n = len(frames)
         self.message(
@@ -1486,14 +1486,16 @@ class Frame(mwx.Frame):
                 res.update(eval(i.read())) # read res <dict>
             
             for name, attr in tuple(res.items()):
-                fn = os.path.join(savedir, name)
-                if not os.path.exists(fn): # search by relpath (dir+name)
-                    fn = attr.get('pathname')
-                if not os.path.exists(fn): # check & pop missing files
-                    res.pop(name)
-                    mis.update({name:attr})
+                fn = os.path.join(savedir, name) # search by relpath (dir / name)
+                if os.path.exists(fn):
+                    attr.update(pathname=fn)  # if found, update pathname
                 else:
-                    attr.update(pathname=fn)
+                    fn = attr.get('pathname') # if not found, try pathname
+                    if fn.startswith(r'\\'):
+                        warn(f"The pathnme of {fn!r} contains network path, "
+                             f"so the search may take long time.", stacklevel=3)
+                    if not os.path.exists(fn):
+                        mis[name] = res.pop(name) # pop missing items
         except FileNotFoundError:
             pass
         except Exception as e:
@@ -1507,7 +1509,7 @@ class Frame(mwx.Frame):
         """Write attributes file."""
         try:
             res, mis = self.read_attributes(filename)
-            new = dict((x.name, x.get_attributes()) for x in frames)
+            new = dict((x.name, x.attributes) for x in frames)
             
             ## `res` order may differ from that of given frames,
             ## so we take a few steps to merge `new` to be exported.
@@ -1540,7 +1542,7 @@ class Frame(mwx.Frame):
                     res, mis = self.read_attributes(fn)
                     savedirs[savedir] = res
                 results = savedirs[savedir]
-                frame.set_attributes(results.get(frame.name))
+                frame.update_attr(results.get(frame.name))
         return frames
     
     def save_frame(self, path=None, frame=None):

mwx/matplot2g.py

@@ -157,11 +157,7 @@ class AxesImagePhantom:
         ## Called in `on_pick` and `__contains__` to check objects in.
         return x is self.__art
     
-    def get_attributes(self):
-        """Auxiliary info about the frame."""
-        return self.__attributes
-    
-    def set_attributes(self, attr):
+    def update_attr(self, attr):
         """Update frame-specifc attributes:
         
             annotation : aux info (also displayed as a message in the infobar)
@@ -234,14 +230,18 @@ class AxesImagePhantom:
         lambda self,v: self.__art.set_clim(v),
         doc="Lower/Upper color limit values of the buffer.")
     
+    attributes = property(
+        lambda self: self.__attributes,
+        doc="Auxiliary info about the frame.")
+    
     pathname = property(
         lambda self: self.__attributes.get('pathname'),
-        lambda self,v: self.set_attributes({'pathname': v}),
+        lambda self,v: self.update_attr({'pathname': v}),
         doc="Fullpath of the buffer, if bound to a file.")
     
     annotation = property(
         lambda self: self.__attributes.get('annotation', ''),
-        lambda self,v: self.set_attributes({'annotation': v}),
+        lambda self,v: self.update_attr({'annotation': v}),
         doc="Annotation of the buffer.")
     
     @property
@@ -648,8 +648,8 @@ class GraphPlot(MatplotPanel):
             j = names.index(name) # existing frame
         if j != -1:
             art = self.__Arts[j]
-            art.update_buffer(buf)      # => [frame_modified]
-            art.set_attributes(kwargs)  # => [frame_updated] localunit => [canvas_draw]
+            art.update_buffer(buf)  # => [frame_modified]
+            art.update_attr(kwargs) # => [frame_updated] localunit => [canvas_draw]
             art.update_extent()
             if show:
                 self.select(j)

mwx/nutshell.py

@@ -2390,7 +2390,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             return True
         return False
     
-    def load_file(self, filename, lineno=0, verbose=True):
+    def load_file(self, filename, lineno=0, verbose=True, **kwargs):
         """Load a file into an existing or new buffer.
         The requests module is required to use URL extension.
         """
@@ -2412,18 +2412,18 @@ class EditorBook(AuiNotebook, CtrlInterface):
         try:
             if re.match(url_re, filename):
                 import requests
-                res = requests.get(filename, timeout=3.0)
-                if res.status_code == requests.codes.ok:
+                kwargs.setdefault('timeout', 3.0)
+                res = requests.get(filename, **kwargs)
+                if res.status_code == requests.codes.OK:
                     buf._load_textfile(res.text, filename)
                     self.swap_buffer(buf, lineno)
                     return True
-                ## raise Exception("URL not found:", filename)
-                res.raise_for_status()  # raise HTTP error
+                res.raise_for_status()  # raise HTTP error; don't catch here.
             if buf._load_file(filename):
                 self.swap_buffer(buf, lineno)
                 return True
             return False
-        except (OSError, UnicodeDecodeError) as e:
+        except (OSError, UnicodeDecodeError, ModuleNotFoundError) as e:
             self.post_message("Failed to load:", e)
             self.delete_buffer(buf)
             return False
@@ -3354,7 +3354,7 @@ class Nautilus(EditorInterface, Shell):
     ## cf. getMultilineCommand() -> caret-multi-line that starts with a prompt
     ##     [BUG 4.1.1] Don't use for current prompt --> Fixed in 4.2.0.
     
-    def getMultilineCommand(self):
+    def getMultilineCommand(self, rstrip=True):
         """Extract a multi-line command which starts with a prompt.
         
         (override) Don't remove trailing ps2 + spaces.
@@ -3364,7 +3364,12 @@ class Nautilus(EditorInterface, Shell):
         if region:
             p, q = (self.PositionFromLine(x) for x in region)
             p += len(sys.ps1)
-            return self.GetTextRange(p, q)
+            command = self.GetTextRange(p, q).rstrip(os.linesep) # remove the last cr/lf
+            if rstrip:
+                command = command.replace(os.linesep + sys.ps2, '\n')
+                command = command.rstrip()
+                command = command.replace('\n', os.linesep + sys.ps2)
+            return command
         return ''
     
     def get_region(self, line):

mwx/plugins/frame_listview.py

@@ -185,7 +185,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         if selected_frames:
             text = ''
             for frame in selected_frames:
-                text += pformat(frame.get_attributes(), sort_dicts=0) # ALL attributes
+                text += pformat(frame.attributes, sort_dicts=0) # ALL attributes
                 ## text += '{}\n{}\n'.format(frame.name, frame.annotation)
             Clipboard.write(text)
         else:

{mwxlib-1.2.7.dist-info → mwxlib-1.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mwxlib
-Version: 1.2.7
+Version: 1.2.9
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto
@@ -21,6 +21,15 @@ Requires-Dist: wxpython>=4.2.0
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
 Requires-Dist: scipy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 # mwxlib
 

{mwxlib-1.2.7.dist-info → mwxlib-1.2.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=b_TMDaNIzLHoL0xbbqb3tt0BnRvhLAqaCn_pBdrigZw,7523
-mwx/controls.py,sha256=5PCy3zguDRuwYl89P9tOCUU7xAGUETs944qZBy5MS9g,48146
-mwx/framework.py,sha256=wurY8uvLFJW6Xig5kTTI84MkFWAK3v4-a6H2eSEwv7M,76125
-mwx/graphman.py,sha256=6ON1lckAyCbIMhIPHRbi9yvWYI2yT_CIWhNFbW31-mc,70110
+mwx/controls.py,sha256=iSevLKxgB3vdGJr3Wv8nccbFNSw1Voazt_HYjp3RrmM,48044
+mwx/framework.py,sha256=FU5XzSPNg-vWZPvG8lMi7u5htB3aUkdKgpbXlSqIFEU,76141
+mwx/graphman.py,sha256=sKwPy31H4lwtShTAui_6upe_Ys2-MwBHhdFq-3onBNE,70328
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
-mwx/matplot2g.py,sha256=gs9U6VDdSX9wmzgrzDCWEZEL3DTOc5XkZOWZE5mffxc,64207
+mwx/matplot2g.py,sha256=ceeAjFkrDz49aSLo_9dIWZZd4HhnSjxe8u9G_ipBHek,64195
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=7nQ7UUFM9kvjDjHNUEdOkkeqZPiU6zOERwamqBdJpQs,140856
+mwx/nutshell.py,sha256=Cy2P4XZ0Wife66oXv3I0dRztlBmlSAlUkVhOq2tWPgs,141187
 mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
 mwx/utilus.py,sha256=bDeooo2bOcZwvkIdi0ElkT-qoblqzHNFsIveb72NFOo,37528
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
@@ -18,12 +18,12 @@ mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
 mwx/plugins/ffmpeg_view.py,sha256=NIHFJLPeliOXH3ke0NvQzYBhY0oeEP6dgZQofB5Ry1c,11031
 mwx/plugins/fft_view.py,sha256=08A_Y73XirV7kXpwf-v0mUA0Hr0MOfdMXv3tvL1hvWA,2789
-mwx/plugins/frame_listview.py,sha256=z2mGbOTStjaICU7vkn-fs_C8uvCD1xMldSOdr-_IKH0,10426
+mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs,10420
 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.2.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.2.7.dist-info/METADATA,sha256=sEkzDsdCV7wSQmHtCWDZLv9-2pbqdEQ7XvuD_VSyo5o,7258
-mwxlib-1.2.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mwxlib-1.2.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.2.7.dist-info/RECORD,,
+mwxlib-1.2.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.2.9.dist-info/METADATA,sha256=zDuA9RxTUziGyT-aTZFZhLSh2fN1_USrpr6lpoTLuT0,7456
+mwxlib-1.2.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mwxlib-1.2.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.2.9.dist-info/RECORD,,

{mwxlib-1.2.7.dist-info → mwxlib-1.2.9.dist-info}/WHEEL

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