Commit a3614eda494142995d4b65217af7f1e9b989cdb8
1 parent
f8f2ab10
Exists in
master
and in
5 other branches
ENH: SVN Test
Showing
2 changed files
with
25 additions
and
4 deletions
Show diff stats
invesalius/gui/dicom_preview_panel.py
@@ -168,12 +168,16 @@ class Preview(wx.Panel): | @@ -168,12 +168,16 @@ class Preview(wx.Panel): | ||
168 | The little previews. | 168 | The little previews. |
169 | """ | 169 | """ |
170 | def __init__(self, parent): | 170 | def __init__(self, parent): |
171 | - super(Preview, self).__init__(parent) | 171 | + super(Preview, self).__init__(parent, style=wx.TAB_TRAVERSAL|wx.NO_BORDER) |
172 | # Will it be white? | 172 | # Will it be white? |
173 | self.select_on = False | 173 | self.select_on = False |
174 | self.dicom_info = None | 174 | self.dicom_info = None |
175 | self._init_ui() | 175 | self._init_ui() |
176 | + | ||
177 | + self.selected_images = [] | ||
178 | + self.pressed_shift = 0 | ||
176 | self._bind_events() | 179 | self._bind_events() |
180 | + self.parent = parent | ||
177 | 181 | ||
178 | def _init_ui(self): | 182 | def _init_ui(self): |
179 | self.SetBackgroundColour(PREVIEW_BACKGROUND) | 183 | self.SetBackgroundColour(PREVIEW_BACKGROUND) |
@@ -218,11 +222,23 @@ class Preview(wx.Panel): | @@ -218,11 +222,23 @@ class Preview(wx.Panel): | ||
218 | #self.subtitle.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave) | 222 | #self.subtitle.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave) |
219 | 223 | ||
220 | self.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) | 224 | self.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
225 | + | ||
221 | self.title.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) | 226 | self.title.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
222 | self.subtitle.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) | 227 | self.subtitle.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
223 | self.image_viewer.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) | 228 | self.image_viewer.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
224 | 229 | ||
225 | #self.Bind(wx.EVT_SIZE, self.OnSize) | 230 | #self.Bind(wx.EVT_SIZE, self.OnSize) |
231 | + | ||
232 | + | ||
233 | + def OnPressedShift(self, evt): | ||
234 | + print "ddddddddddddddddddddddddd" | ||
235 | + if evt.GetKeyCode() == wx.WXK_SHIFT: | ||
236 | + self.pressed_shift = 1 | ||
237 | + | ||
238 | + | ||
239 | + def OnReleasedShift(self, evt): | ||
240 | + if evt.GetKeyCode() == wx.WXK_SHIFT: | ||
241 | + self.pressed_shift = 0 | ||
226 | 242 | ||
227 | def SetDicomToPreview(self, dicom_info): | 243 | def SetDicomToPreview(self, dicom_info): |
228 | """ | 244 | """ |
@@ -276,7 +292,12 @@ class Preview(wx.Panel): | @@ -276,7 +292,12 @@ class Preview(wx.Panel): | ||
276 | #c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DSHADOW) | 292 | #c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DSHADOW) |
277 | #self.SetBackgroundColour(c) | 293 | #self.SetBackgroundColour(c) |
278 | self.Select() | 294 | self.Select() |
279 | - | 295 | + print evt.m_shiftDown |
296 | + print "SHIFTHHHHHHHHHHHHHHH>>>>", self.pressed_shift | ||
297 | + if (self.pressed_shift): | ||
298 | + dicom_id = self.dicom_info.id | ||
299 | + print "=======>>>>>>>>>>>>>>>>>>>>>>>>>>>>", self.dicom_info.id | ||
300 | + | ||
280 | # Generating a EVT_PREVIEW_CLICK event | 301 | # Generating a EVT_PREVIEW_CLICK event |
281 | my_evt = SerieEvent(myEVT_PREVIEW_CLICK, self.GetId()) | 302 | my_evt = SerieEvent(myEVT_PREVIEW_CLICK, self.GetId()) |
282 | my_evt.SetSelectedID(self.dicom_info.id) | 303 | my_evt.SetSelectedID(self.dicom_info.id) |
@@ -284,6 +305,7 @@ class Preview(wx.Panel): | @@ -284,6 +305,7 @@ class Preview(wx.Panel): | ||
284 | my_evt.SetEventObject(self) | 305 | my_evt.SetEventObject(self) |
285 | self.GetEventHandler().ProcessEvent(my_evt) | 306 | self.GetEventHandler().ProcessEvent(my_evt) |
286 | 307 | ||
308 | + | ||
287 | def OnSize(self, evt): | 309 | def OnSize(self, evt): |
288 | if self.dicom_info: | 310 | if self.dicom_info: |
289 | self.SetDicomToPreview(self.dicom_info) | 311 | self.SetDicomToPreview(self.dicom_info) |
@@ -297,6 +319,7 @@ class Preview(wx.Panel): | @@ -297,6 +319,7 @@ class Preview(wx.Panel): | ||
297 | self.SetBackgroundColour(c) | 319 | self.SetBackgroundColour(c) |
298 | self.Refresh() | 320 | self.Refresh() |
299 | 321 | ||
322 | + | ||
300 | def OnDClick(self, evt): | 323 | def OnDClick(self, evt): |
301 | my_evt = SerieEvent(myEVT_PREVIEW_DBLCLICK, self.GetId()) | 324 | my_evt = SerieEvent(myEVT_PREVIEW_DBLCLICK, self.GetId()) |
302 | my_evt.SetSelectedID(self.dicom_info.id) | 325 | my_evt.SetSelectedID(self.dicom_info.id) |
@@ -578,7 +601,6 @@ class DicomPreviewSlice(wx.Panel): | @@ -578,7 +601,6 @@ class DicomPreviewSlice(wx.Panel): | ||
578 | my_evt = SerieEvent(myEVT_CLICK_SLICE, self.GetId()) | 601 | my_evt = SerieEvent(myEVT_CLICK_SLICE, self.GetId()) |
579 | my_evt.SetSelectedID(evt.GetSelectID()) | 602 | my_evt.SetSelectedID(evt.GetSelectID()) |
580 | my_evt.SetItemData(evt.GetItemData()) | 603 | my_evt.SetItemData(evt.GetItemData()) |
581 | - | ||
582 | if self.selected_dicom: | 604 | if self.selected_dicom: |
583 | self.selected_dicom.selected = self.selected_dicom is \ | 605 | self.selected_dicom.selected = self.selected_dicom is \ |
584 | evt.GetEventObject().dicom_info | 606 | evt.GetEventObject().dicom_info |
invesalius/invesalius.py
@@ -21,7 +21,6 @@ | @@ -21,7 +21,6 @@ | ||
21 | # detalhes. | 21 | # detalhes. |
22 | #------------------------------------------------------------------------- | 22 | #------------------------------------------------------------------------- |
23 | 23 | ||
24 | - | ||
25 | import multiprocessing | 24 | import multiprocessing |
26 | import optparse as op | 25 | import optparse as op |
27 | import os | 26 | import os |