diff --git a/.gitignore b/.gitignore index f558d11..d18128e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,11 @@ +invesalius/*.classpath +invesalius/*.hg invesalius/*.log +invesalius/*.project invesalius/*.pyc +invesalius/*.swn +invesalius/*.swo +invesalius/*.swp invesalius/data/*.log invesalius/data/*.pyc invesalius/gui/*.log diff --git a/invesalius/constants.py b/invesalius/constants.py index 4991320..5128d58 100644 --- a/invesalius/constants.py +++ b/invesalius/constants.py @@ -239,7 +239,7 @@ ID_TO_BMP = {VOL_FRONT: ["Front", os.path.join(ICON_DIR, "view_front.png")], } # if 1, use vtkVolumeRaycastMapper, if 0, use vtkFixedPointVolumeRayCastMapper -TYPE_RAYCASTING_MAPPER = 0 +TYPE_RAYCASTING_MAPPER = 1 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.abspath(os.path.join("..", "presets", @@ -296,7 +296,7 @@ FILETYPE_VRML = wx.NewId() FILETYPE_OBJ = wx.NewId() FILETYPE_VTP = wx.NewId() FILETYPE_PLY = wx.NewId() - + FILETYPE_IMAGEDATA = wx.NewId() FILETYPE_BMP = wx.NewId() diff --git a/invesalius/control.py b/invesalius/control.py index 5bc6c04..cd05380 100755 --- a/invesalius/control.py +++ b/invesalius/control.py @@ -265,7 +265,7 @@ class Controller(): if len(patients_groups): group = dcm.SelectLargerDicomGroup(patients_groups) - imagedata, dicom = self.OpenDicomGroup(group, gui=False) + imagedata, dicom = self.OpenDicomGroup(group, gui=True) self.CreateDicomProject(imagedata, dicom) # OPTION 2: ANALYZE? else: diff --git a/invesalius/data/imagedata_utils.py b/invesalius/data/imagedata_utils.py index 0dd210e..966630f 100644 --- a/invesalius/data/imagedata_utils.py +++ b/invesalius/data/imagedata_utils.py @@ -55,22 +55,31 @@ def ResampleImage2D(imagedata, xy_dimension, Resample vtkImageData matrix. """ extent = imagedata.GetExtent() + print "-----------------------------" + print "extent:", extent spacing = imagedata.GetSpacing() + print "spacing:", spacing - if extent[1]==extent[3]: - f = extent[1] - x = 0 - y = 1 + #if extent[1]==extent[3]: + # f = extent[1] + #elif extent[1]==extent[5]: + # f = extent[1] + #elif extent[3]==extent[5]: + # f = extent[3] - elif extent[1]==extent[5]: + if abs(extent[1]-extent[3]) < abs(extent[3]-extent[5]): + print 1 f = extent[1] - x=0 - y=2 - - elif extent[3]==extent[5]: + elif abs(extent[1]-extent[5]) < abs(extent[1] - extent[3]): + print 2 + f = extent[1] + elif abs(extent[3]-extent[5]) < abs(extent[1] - extent[3]): + print 3 f = extent[3] - x = 1 - y = 2 + else: + print 4 + f = extent[1] + factor = xy_dimension/float(f+1) diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index 232257a..c5abd69 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -41,7 +41,9 @@ class NumberDialog(wx.Dialog): # Numeric value to be changed by user num_ctrl = masked.NumCtrl(self, value=value, integerWidth=3, - fractionWidth=2, allowNegative=True) + fractionWidth=2, + allowNegative=True, + signedForegroundColour = "Black") self.num_ctrl = num_ctrl # Buttons diff --git a/invesalius/gui/dicom_preview_panel.py b/invesalius/gui/dicom_preview_panel.py index 5a70d46..82f609d 100755 --- a/invesalius/gui/dicom_preview_panel.py +++ b/invesalius/gui/dicom_preview_panel.py @@ -40,6 +40,7 @@ MAX_VALUE = NCOLS*NROWS STR_SIZE = "Image size: %d x %d" +STR_SPC = "Spacing: %.2f" STR_LOCAL = "Location: %.2f" STR_PATIENT = "%s\n%s" STR_ACQ = "%s %s\nMade in InVesalius" @@ -194,7 +195,9 @@ class SingleImagePreview(wx.Panel): self.text_image_size.SetValue(value) ## Text related to slice position - value = STR_LOCAL %(dicom.image.position[2]) + value1 = STR_SPC %(dicom.image.spacing[2]) + value2 = STR_LOCAL %(dicom.image.position[2]) + value = "%s\n%s" %(value1, value2) self.text_image_location.SetValue(value) ## Text related to patient/ acquisiiton data diff --git a/invesalius/session.py b/invesalius/session.py index dd80b97..f9fbbe9 100644 --- a/invesalius/session.py +++ b/invesalius/session.py @@ -27,6 +27,7 @@ class Session(object): os.makedirs(invdir) self.invdir = invdir + # ? self.temp_item = False # Recent projects list -- libgit2 0.21.2