From 6764eed4b433be50d6bbb04007dbeea9735ce82b Mon Sep 17 00:00:00 2001
From: paulojamorim <paulojamorim@gmail.com>
Date: Wed, 8 Aug 2012 13:53:35 +0000
Subject: [PATCH] ENH: Disabled InVesalius 3.b2 option to surface generation

---
 invesalius/gui/dialogs.py            |  3 +--
 invesalius/gui/widgets/slice_menu.py |  2 +-
 invesalius/net/dicom.py              | 26 ++++++++++++++------------
 invesalius/utils.py                  |  1 -
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py
index 81004d6..9347c21 100644
--- a/invesalius/gui/dialogs.py
+++ b/invesalius/gui/dialogs.py
@@ -917,8 +917,7 @@ class SurfaceDialog(wx.Dialog):
         btn_sizer.AddButton(btn_cancel)
         btn_sizer.Realize()
 
-        self.alg_types = {0: u'Context aware smoothing', 1: u'Binary',
-                          2: u'InVesalius 3.b2'}
+        self.alg_types = {0: u'Context aware smoothing', 1: u'Binary'}#,2: u'InVesalius 3.b2'}
         self.cb_types = wx.ComboBox(self, -1, self.alg_types[0],
                                     choices=[self.alg_types[i] for i in sorted(self.alg_types)],
                                    style=wx.CB_READONLY)
diff --git a/invesalius/gui/widgets/slice_menu.py b/invesalius/gui/widgets/slice_menu.py
index f5fc835..038bcd4 100644
--- a/invesalius/gui/widgets/slice_menu.py
+++ b/invesalius/gui/widgets/slice_menu.py
@@ -103,7 +103,7 @@ class SliceMenu(wx.Menu):
         # Add sub itens in the menu
         self.AppendMenu(-1, _("Window Width and Level"), submenu_wl)
         self.AppendMenu(-1, _("Pseudo Colour"), submenu_pseudo_colours)
-        self.AppendMenu(-1, _("Image Tiling"), submenu_image_tiling)
+        ###self.AppendMenu(-1, _("Image Tiling"), submenu_image_tiling)
 
         # It doesn't work in Linux
         self.Bind(wx.EVT_MENU, self.OnPopup)
diff --git a/invesalius/net/dicom.py b/invesalius/net/dicom.py
index b5c5eb6..cc0e397 100644
--- a/invesalius/net/dicom.py
+++ b/invesalius/net/dicom.py
@@ -172,22 +172,24 @@ class DicomNet:
         const char *call=NULL, 
         const char *outputdir=NULL)"""
 
+        print ">>>>>", self.address, int(self.port), theQuery, 11112, self.aetitle,\
+                  self.aetitle_call, "/home/phamorim/Desktop/output/"
 
 
-        cnf.CMove(self.address, int(self.port), theQuery, 11113, self.aetitle,\
-                  self.aetitle_call, "/home/phamorim/Desktop/output/")
+        cnf.CMove(self.address, int(self.port), theQuery, 11112, self.aetitle,\
+                  self.aetitle_call, "/home/phamorim/Desktop/")
 
+        print "BAIXOUUUUUUUU"
+        #ret = gdcm.DataSetArrayType()
 
-        ret = gdcm.DataSetArrayType()
-
-        cnf.CFind(self.address, int(self.port), theQuery, ret, self.aetitle,\
-                  self.aetitle_call)
+        #cnf.CFind(self.address, int(self.port), theQuery, ret, self.aetitle,\
+        #          self.aetitle_call)
 
-        print "aetitle",self.aetitle
-        print "call",self.aetitle_call
-        print "Baixados..........."
+        #print "aetitle",self.aetitle
+        #print "call",self.aetitle_call
+        #print "Baixados..........."
 
 
-        for r in ret:
-            print r
-            print "\n"
+        #for r in ret:
+        #    print r
+        #    print "\n"
diff --git a/invesalius/utils.py b/invesalius/utils.py
index 02c192e..523e5d1 100755
--- a/invesalius/utils.py
+++ b/invesalius/utils.py
@@ -220,7 +220,6 @@ def predict_memory(nfiles, x, y, p):
         if (platform.architecture()[0] == '32bit'):
             #(314859200 = 300 MB)
             #(26999999 = 25 MB)
-
             #case occupy more than 300 MB image is reduced to 1.5,
             #and 25 MB each image is resized 0.04.
             if (m >= 314859200):
--
libgit2 0.21.2