fix bugs of aipen and app_demo in demo

sciwx/app/__init__.py

@@ -1,2 +1,2 @@
-from .manager import App
+from .sciapp import App
 from .sciapp import SciApp

sciwx/app/sciapp.py

@@ -7,7 +7,7 @@
 from sciwx.grid import GridNoteBook
 from sciwx.text import MDNoteFrame, TextNoteFrame
 from skimage.data import camera
-from sciwx.app.manager import App
+from sciapp.app import App
 
 class SciApp(wx.Frame, App):
     def __init__( self, parent ):

sciwx/canvas/widget.py

@@ -46,7 +46,7 @@ def add_toolbar(self):
         return toolbar
 
     def add_menubar(self):
-        menubar = MenuBar()
+        menubar = MenuBar(self)
         self.SetMenuBar(menubar)
         return menubar
 

sciwx/demo/aipen_demo.py

@@ -54,7 +54,7 @@ def mouse_move(self, ips, x, y, btn, **key):
     cf.set_imgs([astronaut(), 255-astronaut()])
     cf.set_cn((0,1,2))
     bar = cf.add_toolbar()
-    bar.add_tool(DefaultTool, 'M')
-    bar.add_tool(AIPen, 'A')
+    bar.add_tool('M', DefaultTool)
+    bar.add_tool('A', AIPen)
     cf.Show()
     app.MainLoop()

sciwx/demo/canvas3_image_obj.py

@@ -1,7 +1,8 @@
 import sys
 sys.path.append('../../')
 from skimage.data import astronaut, camera
-from sciwx.canvas import Canvas, Image, MCanvas
+from sciapp.object import Image
+from sciwx.canvas import ICanvas, MCanvas
 import wx
 
 def image_canvas_test():
@@ -10,7 +11,7 @@ def image_canvas_test():
     obj.cn = 0
 
     frame = wx.Frame(None, title='gray test')
-    canvas = Canvas(frame, autofit=True)
+    canvas = ICanvas(frame, autofit=True)
     canvas.set_img(obj)
     frame.Show()
 

sciwx/demo/canvas7_frame_menu.py

@@ -2,9 +2,9 @@
 sys.path.append('../../')
 from scipy.ndimage import gaussian_filter
 from sciwx.canvas import CanvasFrame
-from sciwx.event import ImgEvent
-
-class Gaussian(ImgEvent):
+# from sciwx.event import ImgEvent
+from sciapp.action import ImgAction
+class Gaussian(ImgAction):
     title = 'Gaussian'
     note = ['auto_snap', 'preview']
     para = {'sigma':2}
@@ -13,7 +13,7 @@ class Gaussian(ImgEvent):
     def run(self, ips, img, snap, para):
         gaussian_filter(snap, para['sigma'], output=img)
 
-class Undo(ImgEvent):
+class Undo(ImgAction):
     title = 'Undo'
     def run(self, ips, img, snap, para):
         print(ips.img.mean(), ips.snap.mean())

sciwx/demo/canvas7_frame_menu_tool.py

@@ -3,9 +3,9 @@
 from scipy.ndimage import gaussian_filter
 from skimage.draw import line
 from sciwx.canvas import CanvasFrame
-from sciwx.event import ImgEvent, Tool, DefaultTool
-
-class Gaussian(ImgEvent):
+# from sciwx.event import ImgEvent, Tool, DefaultTool
+from sciapp.action import ImgAction, Tool, DefaultTool
+class Gaussian(ImgAction):
     title = 'Gaussian'
     note = ['auto_snap', 'preview']
     para = {'sigma':2}
@@ -14,7 +14,7 @@ class Gaussian(ImgEvent):
     def run(self, ips, img, snap, para):
         gaussian_filter(snap, para['sigma'], output=img)
 
-class Undo(ImgEvent):
+class Undo(ImgAction):
     title = 'Undo'
     def run(self, ips, img, snap, para): ips.swap()
 
@@ -57,7 +57,7 @@ def mouse_wheel(self, ips, x, y, d, **key):pass
                                  ('Unto', Undo)]),]))
 
     bar = cf.add_toolbar()
-    bar.add_tool(DefaultTool, 'M')
-    bar.add_tool(Pencil, 'P')
+    bar.add_tool('M', DefaultTool)
+    bar.add_tool('P', Pencil)
     cf.Show()
     app.MainLoop()

sciwx/demo/shape_demo.py

@@ -1,7 +1,9 @@
 import sys
 sys.path.append('../../')
 from sciapp.object import mark2shp, Layer, json2shp
-from sciapp.action import ShapeEditor, PointEditor, LineEditor, PolygonEditor, \
+# from sciapp.action import ShapeEditor
+from sciapp.action import BaseEditor
+from sciapp.action import PointEditor, LineEditor, PolygonEditor, \
 RectangleEditor, EllipseEditor, FreeLineEditor, FreePolygonEditor, BaseEditor
 from sciwx.canvas import VCanvas as Canvas
 import wx
@@ -36,7 +38,7 @@ def mark_test(mark):
 
 if __name__ == '__main__':
     app = wx.App()
-    ShapeEditor(dtype={'layer', 'rectangles'}).start(None)
+    BaseEditor(dtype={'layer', 'rectangles'}).start(None)
     FreePolygonEditor().start(None)
     #mark_test(point)
     #mark_test(points)

sciwx/widgets/menubar.py

@@ -51,7 +51,7 @@ def __call__(self):
 
     app = wx.App()
     frame = wx.Frame(None)
-    menubar = MenuBar()
+    menubar = MenuBar(frame)
     menubar.load(data)
     frame.SetMenuBar(menubar)
     frame.Show()