rename event to action

Author: yxdragon

sciwx.docx

@@ -0,0 +1,3 @@
+from .action import SciAction
+from .imgact import ImgAction
+from .tolact import Tool, DefaultTool

sciwx/action/__init__.py

@@ -0,0 +1,6 @@
+class SciAction:
+    name = 'SciAction'
+    def __init__(self): pass
+    def start(self, app): 
+    	self.app = app
+    	print(self.name, 'started!')

sciwx/action/action.py

@@ -1,13 +1,11 @@
-from .event import SciEvent
+from .action import SciAction
 from ..widgets import ParaDialog
 
-class ImgEvent(SciEvent):
-    title = 'Image Event'
+class ImgAction(SciAction):
+    title = 'Image Action'
     note, para, view = [], None, None
 
-    def __init__(self, app):
-        self.app = app
-        self.ips = app.get_img()
+    def __init__(self): pass
 
     def show(self):
         dialog = ParaDialog(self.app.get_img_win(), self.title)
@@ -27,12 +25,14 @@ def cancel(self, ips):
     def run(self, ips, img, snap, para):
         print('I am running!!!')
 
-    def start(self, para=None, callback=None):
-        print('Image Event Started!')
+    def start(self, app, para=None, callback=None):
+        print('Image Action Started!')
+        self.app = app
+        self.ips = app.get_img()
         if 'auto_snap' in self.note: self.ips.snapshot()
         if para!=None:
             self.run(self.ips, self.ips.img, self.ips.snap, para)
-        elif self.view==None and self.__class__.show is ImgEvent.show:
+        elif self.view==None and self.__class__.show is ImgAction.show:
             self.run(self.ips, self.ips.img, self.ips.snap, para)
         elif self.show():
             self.run(self.ips, self.ips.img, self.ips.snap, self.para)

sciwx/event/imevt.py renamed to sciwx/action/imgact.py

@@ -1,17 +1,20 @@
-from .event import SciEvent
+from .action import SciAction
 
-class Tool(SciEvent):
+class Tool(SciAction):
     title = 'Base Tool'
     default = None
     def mouse_down(self, image, x, y, btn, **key): pass
     def mouse_up(self, image, x, y, btn, **key): pass
     def mouse_move(self, image, x, y, btn, **key): pass
     def mouse_wheel(self, image, x, y, d, **key): pass
-    def start(self): Tool.default = self
+    def start(self, app): 
+        self.app = app
+        Tool.default = self
+        if not app is None: app.tool = self
 
 class DefaultTool(Tool):
     title = 'Move And Scale'
-    def __init__(self, app): 
+    def __init__(self): 
         self.oldxy = None
 
     def mouse_down(self, image, x, y, btn, **key):
@@ -31,4 +34,4 @@ def mouse_wheel(self, image, x, y, d, **key):
         if d>0: key['canvas'].zoomout(x, y, coord='data')
         if d<0: key['canvas'].zoomin(x, y, coord='data')
 
-DefaultTool(None).start()
+DefaultTool().start(None)

sciwx/event/tool.py renamed to sciwx/action/tolact.py

@@ -2,7 +2,7 @@
 import time, threading
 
 import wx.lib.agw.aui as aui
-from sciwx.widgets import MenuBar, ToolBar
+from sciwx.widgets import MenuBar, ToolBar, ChoiceBook
 from sciwx.canvas import CanvasNoteBook
 from sciwx.grid import GridNoteBook
 from sciwx.text import MDNoteFrame, TextNoteFrame
@@ -23,8 +23,9 @@ def __init__( self, parent ):
         self.init_tool()
         self.init_canvas()
         self.init_table()
-        #self.load_menu(data)
+        self.init_widgets()
         self.init_text()
+        self.init_status()
 
         self.Layout()
         self.auimgr.Update()
@@ -34,8 +35,7 @@ def __init__( self, parent ):
         self.Bind(wx.EVT_CLOSE, self.on_close)
         self.Bind(aui.EVT_AUI_PANE_CLOSE, self.on_pan_close)
 
-
-    def add_status(self):
+    def init_status(self):
         self.stapanel = stapanel = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
         sizersta = wx.BoxSizer( wx.HORIZONTAL )
         self.txt_info = wx.StaticText( stapanel, wx.ID_ANY, "ImagePy  v0.2", wx.DefaultPosition, wx.DefaultSize, 0 )
@@ -57,6 +57,9 @@ def load_tool(self, data, default=None):
         if not default is None: self.toolbar.add_pop('P', default)
         self.toolbar.Layout()
 
+    def load_widget(self, data):
+        self.widgets.load(data)
+        
     def init_menu(self):
         self.menubar = MenuBar(self)
 
@@ -94,6 +97,11 @@ def init_table(self):
             .MaximizeButton( True ).Resizable().FloatingSize((800, 600)).BestSize(( 120,120 )). Caption('Tables') . 
             BottomDockable( True ).TopDockable( False ).LeftDockable( True ).RightDockable( True ) )
 
+    def init_widgets(self):
+        self.widgets = ChoiceBook(self)
+        self.auimgr.AddPane( self.widgets, aui.AuiPaneInfo() .Right().Caption('Widgets') .PinButton( True )
+            .Dock().Resizable().FloatingSize( wx.DefaultSize ).MinSize( wx.Size( 266,-1 ) ).Layer( 10 ) )
+
     def init_text(self):
         self.mdframe = MDNoteFrame(self, 'Sci Document')
         self.txtframe = TextNoteFrame(self, 'Sci Text')

sciwx/app/sciapp.py

@@ -1,5 +1,4 @@
 from .canvas import Canvas
 from .mcanvas import MCanvas
 from .widget import CanvasFrame, CanvasNoteBook, CanvasNoteFrame
-from ..event import Tool, DefaultTool
 from .image import Image

sciwx/canvas/__init__.py

@@ -3,7 +3,7 @@
 from .imutil import mix_img
 from .mark import drawmark
 from .image import Image
-from ..event import Tool, DefaultTool
+from ..action import Tool, DefaultTool
 from time import time
 
 class Canvas (wx.Panel):
@@ -207,6 +207,7 @@ def draw_image(self, dc, img, back, mode):
         mix_img(img, m, o, shp, self.outimg,
             self.outrgb, self.outint, self.image.rg, self.image.lut,
             self.image.log, cns=self.image.cn, mode=self.image.mode)
+        
         self.outbmp.CopyFromBuffer(memoryview(self.outrgb))
         dc.DrawBitmap(self.outbmp, *csbox[:2])
 

sciwx/canvas/canvas.py

@@ -1,7 +1,47 @@
 import numpy as np
 
 default_lut = np.arange(256*3, dtype=np.uint8).reshape((3,-1)).T
-        
+
+def get_updown(imgs, slices='all', chans='all', step=1):
+    c = chans if isinstance(chans, int) else slice(None)
+    if isinstance(slices, int): imgs = [imgs[slices]]
+    if step<=1: step = int(1/step+0.5)
+    else: step = int(min(imgs[0].shape[:2])/step+0.5)
+    s = slice(None, None, max(step,1))
+    s = (s,s,c)[:imgs[0].ndim]
+    mins = [i[s].min(axis=(0,1)) for i in imgs]
+    maxs = [i[s].max(axis=(0,1)) for i in imgs]
+    mins = np.array(mins).reshape((len(mins),-1))
+    maxs = np.array(maxs).reshape((len(maxs),-1))
+    mins, maxs = mins.min(axis=0), maxs.max(axis=0)
+    if np.iscomplexobj(mins):
+        mins, maxs = np.zeros(mins.shape), np.abs(maxs)
+    if chans!='all': return mins.min(), maxs.max()
+    return [(i,j) for i,j in zip(mins, maxs)]
+
+def lookup(img, cn, rgs, lut):
+    if isinstance(cn, int): cn = [cn]
+    img = img.reshape(img.shape[:2]+(-1,))
+    buf = np.zeros(img.shape[:2]+(len(cn),), dtype=np.uint8)
+    for i in range(len(cn)):
+        rg = rgs[cn[i]]
+        k = 255.0/(max(1e-10, rg[1]-rg[0]))
+        bf = np.clip(img[:,:,cn[i]], rg[0], rg[1])
+        np.subtract(bf, rg[0], out=bf, casting='unsafe')
+        np.multiply(bf, k, out=buf[:,:,i], casting='unsafe')
+    return buf if len(cn)==3 else lut[buf.reshape(img.shape[:2])]
+
+def histogram(imgs, rg=(0,256), slices='all', chans='all', step=1):
+    c = chans if isinstance(chans, int) else slice(None)
+    if isinstance(slices, int): imgs = [imgs[slices]]
+    if step<=1: step = int(1/step+0.5)
+    else: step = int(min(imgs[0].shape[:2])/step+0.5)
+    s = slice(None, None, max(step,1))
+    s = (s,s,c)[:imgs[0].ndim]
+    rg = np.linspace(rg[0], rg[1], 257)
+    hist = [np.histogram(i[s], rg)[0] for i in imgs]
+    return np.sum(hist, axis=0)
+
 class Image:
     def __init__(self, img=None):
         self.name = 'Image'
@@ -25,6 +65,10 @@ def img(self): return self.imgs[self.cur]
     def img(self, value): 
         self.imgs[self.cur] = value
         self.cn = [0, (0,1,2)][self.channels==3]
+        if self.dtype == np.uint8:
+            self.rg = [(0, 255)] * self.channels
+        else: 
+            self.rg = self.get_updown('all', 'all', step=512)
 
     @property
     def channels(self):
@@ -49,6 +93,15 @@ def info(self):
         return '%sx%s  S:%s/%s  C:%s/%s'%(*self.shape,
             self.cur+1, self.slices, self.cn, self.channels)
 
+    @property
+    def range(self):
+        rg = np.array(self.rg).reshape((-1,2))
+        return (rg[:,0].min(), rg[:,1].max())
+
+    @range.setter
+    def range(self, value):
+        self.rg = [value] * len(self.rg)
+
     def update(self): self.dirty = True
 
     def snapshot(self):
@@ -60,7 +113,24 @@ def swap(self):
         if self.snap is None:return
         buf = self.img.copy()
         self.img[:], self.snap[:] = self.snap, buf
-        print('swap')
+
+    def histogram(self, rg=None, slices=None, chans=None, step=1):
+        if slices is None: slices = self.cur
+        if chans is None: chans = self.cn
+        if rg is None: rg = self.range
+        print(rg, slices, chans, step)
+        return histogram(self.imgs, rg, slices, chans, step)
+
+    def get_updown(self, slices='all', chans='one', step=1):
+        if slices is None: slices = self.cur
+        if chans is None: chans = self.cn
+        return get_updown(self.imgs, slices, chans, step)
+
+    def lookup(self, img=None):
+        if img is None: img = self.img
+        a = lookup(img, self.cn, self.rg, self.lut)
+        print(a.shape)
+        return a
 
 if __name__ == '__main__':
     img = Image(np.zeros((5,5)))

sciwx/canvas/image.py

@@ -36,7 +36,7 @@ def __init__(self, parent=None, autofit=False):
         self.Layout()
         self.sli_page.Bind(wx.EVT_SCROLL, self.on_scroll)
         self.sli_chan.Bind(wx.EVT_SCROLL, self.on_scroll)
-        # self.Bind(wx.EVT_IDLE, self.on_idle)
+        self.Bind(wx.EVT_IDLE, self.on_idle)
 
         #self.Fit()
         self.set_rg = self.canvas.set_rg
@@ -91,6 +91,10 @@ def slider(self):
             self.sli_chan.SetMax(channels-1)
             self.chans,self.cn = channels, self.canvas.image.cn
 
+    def on_idle(self, event):
+        if self.image.dirty: self.update()
+        self.image.dirty = False
+
     def update(self):
         if self.image.img is None: return
         self.slider()

sciwx/canvas/mcanvas.py

@@ -2,7 +2,11 @@
 sys.path.append('../../')
 from sciwx.app import SciApp
 from sciwx.canvas import CanvasFrame
-from sciwx.event import ImgEvent, Tool, DefaultTool
+from sciwx.action import ImgAction, Tool, DefaultTool
+from sciwx.plugins.curve import Curve
+from sciwx.plugins.channels import Channels
+from sciwx.plugins.histogram import Histogram
+from sciwx.plugins.viewport import ViewPort
 
 from sciwx.plugins.filters import Gaussian, Undo
 from sciwx.plugins.pencil import Pencil
@@ -13,7 +17,8 @@
 
     app = wx.App(False)
     frame = SciApp(None)
-    frame.Show()
+    
+    logo = 'C:/Users/54631/Documents/projects/imagepy/imagepy/tools/Standard/magic.gif'
     frame.load_menu(('menu',[('File',[('Open', Open),
                                       ('Save', Save)]),
                              ('Filters', [('Gaussian', Gaussian),
@@ -22,6 +27,12 @@
                                             ('D', DefaultTool)]),
                               ('draw', [('X', Pencil),
                                         ('X', Pencil)])]), 'draw')
+    frame.load_widget(('widgets', [('Histogram', [('Histogram', Histogram),
+                                                  ('Curve', Curve),
+                                                  ('Channels', Channels)]),
+                                   ('Navigator', [('Viewport', ViewPort)])]))
+    
     frame.show_img(camera())
     frame.show_img(camera())
+    frame.Show()
     app.MainLoop()