From a3614eda494142995d4b65217af7f1e9b989cdb8 Mon Sep 17 00:00:00 2001 From: paulojamorim Date: Mon, 6 Dec 2010 16:43:57 +0000 Subject: [PATCH] ENH: SVN Test --- invesalius/gui/dicom_preview_panel.py | 28 +++++++++++++++++++++++++--- invesalius/invesalius.py | 1 - 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/invesalius/gui/dicom_preview_panel.py b/invesalius/gui/dicom_preview_panel.py index 40b7298..943c70e 100755 --- a/invesalius/gui/dicom_preview_panel.py +++ b/invesalius/gui/dicom_preview_panel.py @@ -168,12 +168,16 @@ class Preview(wx.Panel): The little previews. """ def __init__(self, parent): - super(Preview, self).__init__(parent) + super(Preview, self).__init__(parent, style=wx.TAB_TRAVERSAL|wx.NO_BORDER) # Will it be white? self.select_on = False self.dicom_info = None self._init_ui() + + self.selected_images = [] + self.pressed_shift = 0 self._bind_events() + self.parent = parent def _init_ui(self): self.SetBackgroundColour(PREVIEW_BACKGROUND) @@ -218,11 +222,23 @@ class Preview(wx.Panel): #self.subtitle.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave) self.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) + self.title.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) self.subtitle.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) self.image_viewer.Bind(wx.EVT_LEFT_DOWN, self.OnSelect) #self.Bind(wx.EVT_SIZE, self.OnSize) + + + def OnPressedShift(self, evt): + print "ddddddddddddddddddddddddd" + if evt.GetKeyCode() == wx.WXK_SHIFT: + self.pressed_shift = 1 + + + def OnReleasedShift(self, evt): + if evt.GetKeyCode() == wx.WXK_SHIFT: + self.pressed_shift = 0 def SetDicomToPreview(self, dicom_info): """ @@ -276,7 +292,12 @@ class Preview(wx.Panel): #c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DSHADOW) #self.SetBackgroundColour(c) self.Select() - + print evt.m_shiftDown + print "SHIFTHHHHHHHHHHHHHHH>>>>", self.pressed_shift + if (self.pressed_shift): + dicom_id = self.dicom_info.id + print "=======>>>>>>>>>>>>>>>>>>>>>>>>>>>>", self.dicom_info.id + # Generating a EVT_PREVIEW_CLICK event my_evt = SerieEvent(myEVT_PREVIEW_CLICK, self.GetId()) my_evt.SetSelectedID(self.dicom_info.id) @@ -284,6 +305,7 @@ class Preview(wx.Panel): my_evt.SetEventObject(self) self.GetEventHandler().ProcessEvent(my_evt) + def OnSize(self, evt): if self.dicom_info: self.SetDicomToPreview(self.dicom_info) @@ -297,6 +319,7 @@ class Preview(wx.Panel): self.SetBackgroundColour(c) self.Refresh() + def OnDClick(self, evt): my_evt = SerieEvent(myEVT_PREVIEW_DBLCLICK, self.GetId()) my_evt.SetSelectedID(self.dicom_info.id) @@ -578,7 +601,6 @@ class DicomPreviewSlice(wx.Panel): my_evt = SerieEvent(myEVT_CLICK_SLICE, self.GetId()) my_evt.SetSelectedID(evt.GetSelectID()) my_evt.SetItemData(evt.GetItemData()) - if self.selected_dicom: self.selected_dicom.selected = self.selected_dicom is \ evt.GetEventObject().dicom_info diff --git a/invesalius/invesalius.py b/invesalius/invesalius.py index 9ac3e8e..0e01450 100755 --- a/invesalius/invesalius.py +++ b/invesalius/invesalius.py @@ -21,7 +21,6 @@ # detalhes. #------------------------------------------------------------------------- - import multiprocessing import optparse as op import os -- libgit2 0.21.2