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 | 168 | The little previews. |
| 169 | 169 | """ |
| 170 | 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 | 172 | # Will it be white? |
| 173 | 173 | self.select_on = False |
| 174 | 174 | self.dicom_info = None |
| 175 | 175 | self._init_ui() |
| 176 | + | |
| 177 | + self.selected_images = [] | |
| 178 | + self.pressed_shift = 0 | |
| 176 | 179 | self._bind_events() |
| 180 | + self.parent = parent | |
| 177 | 181 | |
| 178 | 182 | def _init_ui(self): |
| 179 | 183 | self.SetBackgroundColour(PREVIEW_BACKGROUND) |
| ... | ... | @@ -218,11 +222,23 @@ class Preview(wx.Panel): |
| 218 | 222 | #self.subtitle.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave) |
| 219 | 223 | |
| 220 | 224 | self.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
| 225 | + | |
| 221 | 226 | self.title.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
| 222 | 227 | self.subtitle.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
| 223 | 228 | self.image_viewer.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) |
| 224 | 229 | |
| 225 | 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 | 243 | def SetDicomToPreview(self, dicom_info): |
| 228 | 244 | """ |
| ... | ... | @@ -276,7 +292,12 @@ class Preview(wx.Panel): |
| 276 | 292 | #c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DSHADOW) |
| 277 | 293 | #self.SetBackgroundColour(c) |
| 278 | 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 | 301 | # Generating a EVT_PREVIEW_CLICK event |
| 281 | 302 | my_evt = SerieEvent(myEVT_PREVIEW_CLICK, self.GetId()) |
| 282 | 303 | my_evt.SetSelectedID(self.dicom_info.id) |
| ... | ... | @@ -284,6 +305,7 @@ class Preview(wx.Panel): |
| 284 | 305 | my_evt.SetEventObject(self) |
| 285 | 306 | self.GetEventHandler().ProcessEvent(my_evt) |
| 286 | 307 | |
| 308 | + | |
| 287 | 309 | def OnSize(self, evt): |
| 288 | 310 | if self.dicom_info: |
| 289 | 311 | self.SetDicomToPreview(self.dicom_info) |
| ... | ... | @@ -297,6 +319,7 @@ class Preview(wx.Panel): |
| 297 | 319 | self.SetBackgroundColour(c) |
| 298 | 320 | self.Refresh() |
| 299 | 321 | |
| 322 | + | |
| 300 | 323 | def OnDClick(self, evt): |
| 301 | 324 | my_evt = SerieEvent(myEVT_PREVIEW_DBLCLICK, self.GetId()) |
| 302 | 325 | my_evt.SetSelectedID(self.dicom_info.id) |
| ... | ... | @@ -578,7 +601,6 @@ class DicomPreviewSlice(wx.Panel): |
| 578 | 601 | my_evt = SerieEvent(myEVT_CLICK_SLICE, self.GetId()) |
| 579 | 602 | my_evt.SetSelectedID(evt.GetSelectID()) |
| 580 | 603 | my_evt.SetItemData(evt.GetItemData()) |
| 581 | - | |
| 582 | 604 | if self.selected_dicom: |
| 583 | 605 | self.selected_dicom.selected = self.selected_dicom is \ |
| 584 | 606 | evt.GetEventObject().dicom_info | ... | ... |