merge and review

Author: yxdragon

imagepy/menus/Analysis/Region Analysis/regionprops_plgs.py

@@ -16,7 +16,7 @@ class RegionCounter(Simple):
     title = 'Geometry Analysis'
     note = ['8-bit', '16-bit', 'int']
     para = {'con':'8-connect', 'center':True, 'area':True, 'l':True, 'extent':False, 'cov':False, 'slice':False,
-            'ed':False, 'holes':False, 'ca':False, 'fa':False, 'solid':False}
+            'ed':False, 'holes':False, 'ca':False, 'fa':False, 'solid':False, 'labeled':False}
     view = [(list, 'con', ['4-connect', '8-connect'], str, 'conection', 'pix'),
             (bool, 'slice', 'slice'),
             ('lab', None, '=========  indecate  ========='),
@@ -29,7 +29,8 @@ class RegionCounter(Simple):
             (bool, 'holes', 'holes'),
             (bool, 'fa', 'filled area'),
             (bool, 'solid', 'solidity'),
-            (bool, 'cov', 'cov')]
+            (bool, 'cov', 'cov'),
+            (bool, 'labeled', 'has been labeled')]
 
     #process
     def run(self, ips, imgs, para = None):
@@ -51,7 +52,7 @@ def run(self, ips, imgs, para = None):
         data, mark = [], {'type':'layers', 'body':{}}
         strc = generate_binary_structure(2, 1 if para['con']=='4-connect' else 2)
         for i in range(len(imgs)):
-            label(imgs[i], strc, output=buf)
+            np.copyto(imgs[i], buf) if para['labeled'] else label(imgs[i], strc, output=buf)
             ls = regionprops(buf)
 
             dt = [[i]*len(ls), list(range(len(ls)))]

imagepy/menus/Analysis/statistic_plg.py

@@ -68,16 +68,15 @@ def show_hist(parent, title, hist):
 
 class Histogram(Simple):
     title = 'Histogram'
-    note = ['8-bit', '16-bit', 'rgb']
+    note = ['all']
 
     def run(self, ips, imgs, para = None):
         msk = ips.mask('in')
+        rg = np.linspace(*ips.range, 257)
+        img = ips.img if msk is None else ips.img[msk]
         if ips.channels == 3:
-            img = ips.img if msk is None else ips.img[msk]
-            hist = [np.histogram(img.ravel()[i::3], np.arange(257))[0] for i in (0,1,2)]
-        else:
-            img = ips.lookup() if msk is None else ips.lookup()[msk]
-            hist = np.histogram(img, np.arange(257))[0]
+            hist = [np.histogram(img.ravel()[i::3], rg)[0] for i in (0,1,2)]
+        else: hist = np.histogram(img,rg)[0]
         show_hist(self.app, ips.title+'-Histogram', hist)
 
 class Frequence(Simple):
@@ -94,11 +93,9 @@ def run(self, ips, imgs, para = None):
         msk = ips.mask('in')
         for i in range(len(imgs)):
             img = imgs[i] if msk is None else imgs[i][msk]
-            maxv = img.max()
-            if maxv==0:continue
-            ct = np.histogram(img, maxv+1, [0,maxv])[0]
+            ct = np.bincount(img.ravel()) #np.histogram(img, maxv+1, [0,maxv])[0]
             titles = ['slice','value','count']
-            dt = [[i]*len(ct), list(range(maxv+1)), ct]
+            dt = [np.ones(len(ct), dtype=np.uint32)+i, np.arange(len(ct)), ct]
             if not para['slice']:
                 titles, dt = titles[1:], dt[1:]
             if self.para['fre']:
@@ -144,27 +141,6 @@ def run(self, ips, imgs, para = None):
             data.append(self.count(img, para))
             self.progress(n, len(imgs))
         self.app.show_table(pd.DataFrame(data, columns=titles), ips.title+'-statistic')
-        
-class Mark:
-    def __init__(self, data):
-        self.data = data
-
-    def draw(self, dc, f, **key):
-        dc.SetPen(wx.Pen((255,255,0), width=1, style=wx.SOLID))
-        dc.SetTextForeground((255,255,0))
-        font = wx.Font(8, wx.FONTFAMILY_DEFAULT, 
-                       wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False)
-        
-        dc.SetFont(font)
-        data = self.data[0 if len(self.data)==1 else key['cur']]
-
-        for i in range(len(data)):
-            pos = f(*(data[i][0], data[i][1]))
-            dc.SetBrush(wx.Brush((255,255,255)))
-            dc.DrawCircle(pos[0], pos[1], 2)
-            dc.SetBrush(wx.Brush((0,0,0), wx.BRUSHSTYLE_TRANSPARENT))
-            dc.DrawCircle(pos[0], pos[1], data[i][2]*key['k'])
-            dc.DrawText('id={}, r={}'.format(i, data[i][2]), pos[0], pos[1])
 
 class PointsValue(Simple):
     title = 'Points Value'

imagepy/menus/File/new_plg.py

@@ -8,7 +8,7 @@
 import numpy as np
 
 class Plugin(Free):
-    title = 'New'
+    title = 'New Image'
     para = {'name':'Undefined','width':300, 'height':300, 'type':'8-bit','slice':1}
     view = [(str, 'name', 'name', ''),
             (int, 'width',  (1,10240), 0,  'width', 'pix'),

imagepy/menus/Image/Color/splitandmerge_plgs.py

@@ -21,7 +21,7 @@ def run(self, ips, imgs, para = None):
             for c,ci in zip((r,g,b),(0,1,2)):
                 if self.para['copy']:c.append(i[:,:,ci].copy())
                 else: c.append(i[:,:,ci])
-            self.progress(i, n)
+            self.progress(n+1, len(imgs))
         for im, tl in zip([r,g,b],['red','green','blue']):
             self.app.show_img(im, ips.title+'-'+tl)
         if self.para['destory']:

imagepy/menus/Window/windowskiller_plg.py

@@ -16,7 +16,7 @@ class ImageKiller(Free):
             (bool, 'all', 'close all images')]
 
     def run(self, para = None):
-        self.app.close_image(None if para['all'] else para['img'])
+        self.app.close_img(None if para['all'] else para['img'])
 
 class TableKiller(Free):
     title = 'Kill Table'

sciapp/app.py

@@ -6,9 +6,9 @@ def __init__(self, asyn=True):
         self.asyn = asyn
         self.managers = {}
         self.img_manager = self.manager('img')
-        self.wimg_manager = self.manager('wimg')
+        #self.wimg_manager = self.manager('wimg')
         self.tab_manager = self.manager('tab')
-        self.wtab_manager = self.manager('wtab')
+        #self.wtab_manager = self.manager('wtab')
         self.mesh_manager = self.manager('mesh')
         self.wmesh_manager = self.manager('wmesh')
         self.task_manager = self.manager('task')
@@ -40,8 +40,8 @@ def show_img(self, img, name):
         self.img_manager.add(img.name, img)
         print(img.info)
 
-    def add_img_win(self, win, name):
-        self.wimg_manager.add(name, win)
+    #def add_img_win(self, win, name):
+    #    self.wimg_manager.add(name, win)
 
     def close_img(self, name): 
         self.img_manager.remove(name)

sciwx/canvas/mcanvas.py

@@ -258,8 +258,7 @@ def on_scroll(self, event):
         self.canvas.on_idle(event)
 
     def on_idle(self, event):
-        if self.image.img is None:
-            return
+        if self.image.img is None: return
         image, info = self.image, self.lab_info.GetLabel()
         imgs = image.slices, image.channels, image.cn, image.cur
         selfs = self.pages ,self.chans, self.cn, self.cur

sciwx/widgets/paradialog.py

@@ -52,8 +52,10 @@ def init_view(self, items, para, preview=False, modal=True, app=None):
         self.para, self.modal = para, modal
         for item in items:
             self.add_ctrl_(widgets[item[0]], item[1], item[2:], app=app)
-        if preview:self.add_ctrl_(Check, 'preview', ('preview',), app=app)
+        if preview: self.add_ctrl_(Check, 'preview', ('preview',), app=app)
         self.reset(para)
+        for p in self.ctrl_dic:
+            if p in para: para[p] = self.ctrl_dic[p].GetValue()
         self.add_confirm(modal)
         wx.Dialog.Bind(self, wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         #wx.Dialog.Bind(self, wx.EVT_IDLE, lambda e: self.reset())

sciwx/widgets/ribbonbar.py

@@ -132,28 +132,15 @@ def start(self, app):
         def __call__(self):
             return self
 
-    # data = ('menu', [
-    #             ('File', None, [
-    #                 ('Open CV', (255,0,0), P('O')),
-    #                 '-',
-    #                   ('Close', None, P('C'))]),
-    #         ('Edit', None, [('Copy', None, P('C')),
-    #                   ('A', None, [('B', None, P('B')),
-    #                          ('C', None, P('C'))]),
-    #                   ('Paste', None, P('P'))])])
-
     data = ('menu', [
-                ('File', [
-                    ('Open', P('O')),
+                ('File', None, [
+                    ('Open CV', (255,0,0), P('O')),
                     '-',
-                    ('Close', P('C'))]),
-                ('Edit', [
-                    ('Copy', P('C')),
-                    ('A', [
-                        ('B', P('B')),
-                        ('C', P('C'))]),
-                    ('Paste', P('P'))])])
-    
+                      ('Close', None, P('C'))]),
+            ('Edit', None, [('Copy', None, P('C')),
+                      ('A', None, [('B', None, P('B')),
+                             ('C', None, P('C'))]),
+                      ('Paste', P('P'))])])
     app = wx.App()
     frame = wx.Frame(None)
     menubar = RibbonBar(frame)