viewport and unpreview

Author: yxdragon

imagepy/core/engine/filter.py

@@ -105,9 +105,10 @@ def show(self, temp=ParaDialog):
 
         self.dialog.on_help = lambda : IPy.show_md(self.title, DocumentManager.get(self.title))
         self.dialog.set_handle(lambda x:self.preview(self.ips, x))
-        if self.modal: return self.dialog.ShowModal() == wx.ID_OK
+
         self.dialog.on_ok = lambda : self.ok(self.ips)
         self.dialog.on_cancel = lambda : self.cancel(self.ips)
+        if self.modal: return self.dialog.ShowModal() == wx.ID_OK
         self.dialog.Show()
 
     def run(self, ips, snap, img, para = None):
@@ -184,7 +185,7 @@ def ok(self, ips, para=None, callafter=None):
 
     def cancel(self, ips):
         if 'auto_snap' in self.note:
-            ips.swap()
+            ips.img[:] = ips.snap
             ips.update()
 
     def start(self, para=None, callafter=None):

imagepy/data/markdown.css

@@ -43,7 +43,7 @@ p {
     margin-bottom: 9px;
 }
 p img {
-    width:100%%;
+    width:100%;
 }
 h1,
 h2,

imagepy/ui/canvas/canvas.py

@@ -243,8 +243,8 @@ def __del__(self):
     canvas.set_lut(lut)
     canvas.set_cn(0)
     canvas.set_back(astronaut())
-    canvas.set_cn('rgb', 1)
-    canvas.set_mode('msk')
+    canvas.set_cn((0,1,2), True)
+    canvas.set_mode(0.5)
     x = np.arange(512)
     y = np.sin(x/30) * 100 + 256
     canvas.marks['line'] = {'type':'line', 'lw':3, 'body':np.array([x,y]).T.tolist()}

imagepy/ui/panelconfig.py

@@ -63,6 +63,7 @@ def init_view(self, items, para, preview=False, modal = True):
 
     def OnDestroy( self, event ):
         self.set_handle(None)
+        self.on_cancel = self.on_ok = self.on_help = None
         del self.ctrl_dic
 
     def parse(self, para) :
@@ -92,17 +93,23 @@ def pack(self):
 
     def para_check(self, para, key):pass
 
-    def para_changed(self, key):
+    def para_changed(self, obj):
+        key = ''
         para = self.para
-        for p in list(para.keys()):
-            if p in self.ctrl_dic:
+        for p in self.ctrl_dic:
+            if p in para:
                 para[p] = self.ctrl_dic[p].GetValue()
+            if self.ctrl_dic[p] == obj: key = p
+
         sta = sum([i is None for i in list(para.values())])==0
         self.btn_ok.Enable(sta)
         if not sta: return
         self.para_check(para, key)
         if 'preview' not in self.ctrl_dic:return
-        if not self.ctrl_dic['preview'].GetValue():return
+        if not self.ctrl_dic['preview'].GetValue():
+            if key=='preview' and self.on_cancel != None: 
+                return self.on_cancel()
+            else: return
         self.handle(para)
 
     def reset(self, para=None):

imagepy/ui/widgets/colormap.py

@@ -95,4 +95,4 @@ def __init__( self, parent, title):
     def Bind(self, z, f): self.f = f
 
     def on_sel(self, event):
-        self.f(event)
+        self.f(self)

imagepy/ui/widgets/curvepanel.py

@@ -61,7 +61,7 @@ def on_ld(self, event):
             self.pts.append((x, 255-y))
             self.idx = len(self.pts)-1
             self.update()
-            self.handle(event)
+            self.handle(self)
 
     def on_lu(self, event):
         self.idx = -1
@@ -75,7 +75,7 @@ def on_rd(self, event):
             del self.pts[self.idx]
             self.idx = -1
             self.update()
-            self.handle(event)
+            self.handle(self)
 
     def on_mv(self, event):
         x = (event.GetX()-self.offset[0])/self.k 
@@ -91,7 +91,7 @@ def on_mv(self, event):
             y = np.clip(y, 0, 255)
             self.pts[self.idx] = (x, 255-y)
             self.update()
-            self.handle(event)
+            self.handle(self)
 
 
     def on_paint(self, event):

imagepy/ui/widgets/normal.py

@@ -30,7 +30,7 @@ def __init__(self, parent, rang, accury, title, unit):
     def Bind(self, z, f):self.f = f
 
     def ontext(self, event):
-        self.f(event)
+        self.f(self)
         if self.GetValue()==None:
             self.ctrl.SetBackgroundColour((255,255,0))
         else:
@@ -78,7 +78,7 @@ def __init__(self, parent, title, unit):
     def Bind(self, z, f):self.f = f
 
     def ontext(self, event):
-        self.f(event)
+        self.f(self)
 
     def SetValue(self, n):
         self.ctrl.SetValue(n)
@@ -120,7 +120,7 @@ def oncolor(self, event):
             rst = dialog.GetColourData().GetColour()
             self.ctrl.SetBackgroundColour(rst)
             self.ctrl.SetValue(rst.GetAsString(wx.C2S_HTML_SYNTAX))
-            self.f(event)
+            self.f(self)
         dialog.Destroy()
 
     def SetValue(self, color):
@@ -199,7 +199,7 @@ def Bind(self, z, f):
         self.f = f
 
     def on_choice(self, event):
-        self.f(event)
+        self.f(self)
 
     def SetValue(self, x):
         n = self.choices.index(x) if x in self.choices else 0
@@ -260,7 +260,7 @@ def GetValue(self):
 
     # Virtual event handlers, overide them in your derived class
     def on_text( self, event ):
-        self.f(event)
+        self.f(self)
         if self.GetValue()==None:
             self.txt_value.SetBackgroundColour((255,255,0))
         else: self.txt_value.SetBackgroundColour((255,255,255))
@@ -292,7 +292,7 @@ def Bind(self, z, f):
         self.f = f
 
     def on_check(self, event):
-        self.f(event)
+        self.f(self)
 
     def GetValue(self):
         return [self.choices[i] for i in self.ctrl.GetCheckedItems()]
@@ -354,14 +354,14 @@ def on_scroll(self, event):
         n = value/255.0*(self.max-self.min)+self.min
         self.text.SetValue(str(round(n,self.accury) if self.accury>0 else int(n)))
         self.text.SetBackgroundColour((255,255,255))
-        self.f(event)
+        self.f(self)
 
     def on_spin(self, event):
         self.slider.SetValue(self.spin.GetValue())
         self.on_scroll(event)
 
     def on_text(self, event):
-        self.f(event)
+        self.f(self)
         if self.GetValue()==None:
             self.text.SetBackgroundColour((255,255,0))
         else:
@@ -416,7 +416,7 @@ def __init__(self, parent, title):
         self.GetValue = check.GetValue
         check.Bind(wx.EVT_CHECKBOX, self.on_check)
 
-    def on_check(self, event):self.f(event)
+    def on_check(self, event):self.f(self)
     def Bind(self, z, f): self.f = f
 
 if __name__ == '__main__':

imagepy/ui/widgets/viewport.py

@@ -47,12 +47,12 @@ def on_paint(self, event):
         wx.BufferedPaintDC(self, self.buffer)
 
     def on_ld(self, event):
+        self.handle(True)
         x, y = event.GetX(), event.GetY()
         x = 1.0*(x-self.offx)/self.imgw
         y = 1.0*(y-self.offy)/self.imgh
         if x<0 or x>1 or y<0 or y>1:return
         self.loc = (x*self.ibox[0], y*self.ibox[1])
-        self.handle()
         self.drag = True
 
     def on_lu(self, event):

imagepy/widgets/navigator/navigator_wgt.py

@@ -70,6 +70,7 @@ def on_apply(self, event):
 		self.viewport.set_box(win.canvas.conbox, win.canvas.winbox)
 
 	def on_zoom(self, event):
+		self.on_apply(event)
 		k = self.scales[self.slider.GetValue()]
 		self.label.SetLabel('%.2f%%'%(k*100))
 		win = IPy.get_window()
@@ -81,6 +82,7 @@ def on_zoom(self, event):
 		self.viewport.set_box(win.canvas.conbox, win.canvas.winbox)
 
 	def on_fit(self, event):
+		self.on_apply(event)
 		win = IPy.get_window()
 		if win is None: return
 		win.canvas.fit()
@@ -92,6 +94,7 @@ def on_fit(self, event):
 		self.viewport.set_box(win.canvas.conbox, win.canvas.winbox)
 
 	def on_one(self, event):
+		self.on_apply(event)
 		win = IPy.get_window()
 		if win is None: return
 		a,b,c,d = win.canvas.winbox
@@ -102,7 +105,8 @@ def on_one(self, event):
 		self.label.SetLabel('%.2f%%'%100)
 		self.viewport.set_box(win.canvas.conbox, win.canvas.winbox)
 
-	def on_handle(self):
+	def on_handle(self, update=False):
+		if update: self.on_apply(update)
 		win = IPy.get_window()
 		if win is None: return
 		x, y = self.viewport.GetValue()