Skip to content

Commit 0880590

Browse files
committed
vispy
1 parent e584e02 commit 0880590

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

imagepy/app/imagepy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def init_table(self):
203203
self.tablenbwrap.SetSizer( sizer )
204204
self.tablenbwrap.Layout()
205205

206-
self.auimgr.AddPane( self.tablenbwrap, aui.AuiPaneInfo() .Center() .CaptionVisible( True ).PinButton( True ).Dock()
206+
self.auimgr.AddPane( self.tablenbwrap, aui.AuiPaneInfo() .Bottom() .CaptionVisible( True ).PinButton( True ).Dock(). Hide()
207207
.MaximizeButton( True ).Resizable().FloatingSize((800, 600)).BestSize(( 120,120 )). Caption('Table') .
208208
BottomDockable( True ).TopDockable( False ).LeftDockable( True ).RightDockable( True ) )
209209
self.tablenb.Bind( wx.lib.agw.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.on_active_table)

sciapp/action/plugin/mesh_tools.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def __init__(self):
1111
def mouse_down(self, obj, x, y, btn, **key):
1212
self.oldxy = x, y
1313
if btn == 1 and not key['shift']:
14-
picked = key['canvas'].at(x,y)
14+
picked = key['canvas'].at(x,y) if key['ctrl'] else None
1515
if not picked is None:
1616
self.curobj = picked
1717
self.curobj.set_data(high_light=0xffaaffff)
@@ -68,4 +68,6 @@ def mouse_wheel(self, obj, x, y, d, **key):
6868
camera = key['canvas'].camera
6969
if camera._distance is not None:
7070
camera._distance *= s
71-
camera.scale_factor *= s
71+
camera.scale_factor *= s
72+
73+
MeshViewTool().start(None)

sciwx/mesh/canvas.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def viewtext(text, view):
9494
view._picking_filter.id = view._id
9595
else:
9696
view._picking_filter.enabled = True
97-
view._picking_filter.id = mesh.high_light
97+
view._picking_filter.id = text.high_light
9898
# view.shading = 'flat'
9999
text.dirty = False
100100
return view
@@ -117,7 +117,7 @@ def viewvolume(vol, view):
117117
view._picking_filter.id = view._id
118118
else:
119119
view._picking_filter.enabled = True
120-
view._picking_filter.id = mesh.high_light
120+
view._picking_filter.id = vol.high_light
121121
# view.shading = 'flat'
122122
vol.dirty = False
123123
return view
@@ -162,6 +162,7 @@ def on_idle(self, event):
162162
need = 'update'
163163
self.bgcolor = self.scene3d.bg_color
164164
for i in self.visuals:
165+
if not isinstance(self.visuals[i], MeshVisual): continue
165166
self.visuals[i].ambient_light_color = self.scene3d.ambient_color
166167
self.visuals[i].light_color = self.scene3d.light_color
167168
self.visuals[i].light_dir = self.scene3d.light_dir

0 commit comments

Comments
 (0)