Skip to content

Commit c53905e

Browse files
committed
nothing
1 parent 9f76210 commit c53905e

File tree

5 files changed

+85
-4
lines changed

5 files changed

+85
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def run(self, ips, imgs, para = None):
6464
if para['cov']:
6565
ellips = [i.centroid[::-1] + (i.major_axis_length/2,i.minor_axis_length/2, i.orientation+np.pi/2) for i in ls]
6666
layer['body'].append({'type':'ellipses', 'body':ellips})
67-
print(i,i,i,i,i)
67+
6868
if len(ls)>0: mark['body'][i] = layer
6969

7070
if para['center']:

sciapp/action/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
from .plugin.mea_tools import *
55
from .plugin.shp_tools import *
66
from .plugin.roi_tools import *
7+
from .plugin.img_tools import *
78
from .advanced import Filter, Free, Simple, Table, Macros, Widget, dataio, Report

sciapp/action/advanced/simple.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def check(self, ips):
4242
elif ips.dtype==np.int32 and not 'int' in note:
4343
self.app.alert('Do not surport 32-bit int uint image')
4444
return False
45-
elif ips.dtype in {np.float32, np.float64} and not 'float' in note:
45+
elif (ips.dtype==np.float32 or ips.dtype==np.float64) and not 'float' in note:
4646
self.app.alert('Do not surport float image')
4747
return False
4848
if sum([i in note for i in ('stack','stack2d','stack3d')])>0:

sciapp/action/plugin/generalio.py

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from ..advanced import dataio
22
from skimage.io import imread, imsave
33

4-
for i in ('bmp', 'jpg', 'tif', 'png', 'gif'):
4+
for i in ('bmp', 'jpg', 'jpeg', 'tif', 'png', 'gif'):
55
dataio.ReaderManager.add(i, imread, 'img')
66
dataio.WriterManager.add(i, imsave, 'img')
77

@@ -17,4 +17,29 @@ class SaveImage(dataio.ImageWriter):
1717

1818
def load(self, ips):
1919
self.filt = [i for i in sorted(dataio.WriterManager.names())]
20-
return True
20+
return True
21+
22+
from pandas import read_csv, read_excel
23+
read_csv2 = lambda p:read_csv(p, index_col=0)
24+
read_excel2 = lambda p:read_excel(p, index_col=0)
25+
26+
save_csv = lambda path, data:data.to_csv(path)
27+
dataio.ReaderManager.add('csv', read_csv2, 'tab')
28+
dataio.WriterManager.add('csv', save_csv, 'tab')
29+
30+
31+
save_excel = lambda path, data:data.to_excel(path)
32+
dataio.ReaderManager.add('xls', read_excel2, 'tab')
33+
dataio.WriterManager.add('xls', save_excel, 'tab')
34+
dataio.ReaderManager.add('xlsx', read_excel2, 'tab')
35+
dataio.WriterManager.add('xlsx', save_excel, 'tab')
36+
37+
class OpenTable(dataio.Reader):
38+
title = 'Excel Open'
39+
tag = 'tab'
40+
filt = ['csv', 'xls','xlsx']
41+
42+
class SaveTable(dataio.TableWriter):
43+
title = 'Excel Save'
44+
tag = 'tab'
45+
filt = ['csv', 'xls', 'xlsx']

sciapp/action/plugin/img_tools.py

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
from sciapp.action import ImageTool
2+
3+
class MoveTool(ImageTool):
4+
title = 'Move And Scale'
5+
def __init__(self):
6+
self.oldxy = None
7+
8+
def mouse_down(self, obj, x, y, btn, **key):
9+
if btn==1: self.oldxy = key['px'], key['py']
10+
if btn==3: key['canvas'].fit()
11+
12+
def mouse_up(self, obj, x, y, btn, **key):
13+
self.oldxy = None
14+
15+
def mouse_move(self, obj, x, y, btn, **key):
16+
if self.oldxy is None: return
17+
ox, oy = self.oldxy
18+
up = (1,-1)[key['canvas'].up]
19+
key['canvas'].move(key['px']-ox, (key['py']-oy)*up)
20+
self.oldxy = key['px'], key['py']
21+
22+
def mouse_wheel(self, obj, x, y, d, **key):
23+
if d>0: key['canvas'].zoomout(x, y, coord='data')
24+
if d<0: key['canvas'].zoomin(x, y, coord='data')
25+
26+
class ScaleTool(ImageTool):
27+
title = 'Scope'
28+
def __init__(self):
29+
self.ox, self.oy = 0, 0
30+
31+
def mouse_down(self, ips, x, y, btn, **key):
32+
if btn==2:
33+
self.ox, self.oy = key['canvas'].to_panel_coor(x,y)
34+
print(self.ox, self.oy)
35+
#print 'down', self.ox, self.oy
36+
if btn==1: key['canvas'].zoomout(x, y, 'data')
37+
if btn==3: key['canvas'].zoomin(x, y, 'data')
38+
ips.update()
39+
40+
def mouse_up(self, ips, x, y, btn, **key):
41+
pass
42+
43+
def mouse_move(self, ips, x, y, btn, **key):
44+
if btn==2:
45+
x,y = key['canvas'].to_panel_coor(x,y)
46+
#print 'x,y',x,y
47+
#print 'dx,dy:', x-self.ox, y-self.oy
48+
key['canvas'].move(x-self.ox, y-self.oy)
49+
ips.update()
50+
self.ox, self.oy = x,y
51+
52+
def mouse_wheel(self, ips, x, y, d, **key):
53+
if d>0:key['canvas'].zoomout(x, y, 'data')
54+
if d<0:key['canvas'].zoomin(x, y, 'data')
55+
ips.update()

0 commit comments

Comments
 (0)