Download as
Browse Code »

Commit 6764eed4b433be50d6bbb04007dbeea9735ce82b

Authored by Paulo Henrique Junqueira Amorim
1 parent 5b2a66a5
Exists in master and in 67 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

ENH: Disabled InVesalius 3.b2 option to surface generation

Showing 4 changed files with 16 additions and 16 deletions   Show diff stats
invesalius/gui/dialogs.py
  Diff comments   View file @6764eed
@@ -917,8 +917,7 @@ class SurfaceDialog(wx.Dialog): @@ -917,8 +917,7 @@ class SurfaceDialog(wx.Dialog):
917 btn_sizer.AddButton(btn_cancel) 917 btn_sizer.AddButton(btn_cancel)
918 btn_sizer.Realize() 918 btn_sizer.Realize()
919 919
920 - self.alg_types = {0: u'Context aware smoothing', 1: u'Binary',  
921 - 2: u'InVesalius 3.b2'} 920 + self.alg_types = {0: u'Context aware smoothing', 1: u'Binary'}#,2: u'InVesalius 3.b2'}
922 self.cb_types = wx.ComboBox(self, -1, self.alg_types[0], 921 self.cb_types = wx.ComboBox(self, -1, self.alg_types[0],
923 choices=[self.alg_types[i] for i in sorted(self.alg_types)], 922 choices=[self.alg_types[i] for i in sorted(self.alg_types)],
924 style=wx.CB_READONLY) 923 style=wx.CB_READONLY)
invesalius/gui/widgets/slice_menu.py
  Diff comments   View file @6764eed
@@ -103,7 +103,7 @@ class SliceMenu(wx.Menu): @@ -103,7 +103,7 @@ class SliceMenu(wx.Menu):
103 # Add sub itens in the menu 103 # Add sub itens in the menu
104 self.AppendMenu(-1, _("Window Width and Level"), submenu_wl) 104 self.AppendMenu(-1, _("Window Width and Level"), submenu_wl)
105 self.AppendMenu(-1, _("Pseudo Colour"), submenu_pseudo_colours) 105 self.AppendMenu(-1, _("Pseudo Colour"), submenu_pseudo_colours)
106 - self.AppendMenu(-1, _("Image Tiling"), submenu_image_tiling) 106 + ###self.AppendMenu(-1, _("Image Tiling"), submenu_image_tiling)
107 107
108 # It doesn't work in Linux 108 # It doesn't work in Linux
109 self.Bind(wx.EVT_MENU, self.OnPopup) 109 self.Bind(wx.EVT_MENU, self.OnPopup)
invesalius/net/dicom.py
  Diff comments   View file @6764eed
@@ -172,22 +172,24 @@ class DicomNet: @@ -172,22 +172,24 @@ class DicomNet:
172 const char *call=NULL, 172 const char *call=NULL,
173 const char *outputdir=NULL)""" 173 const char *outputdir=NULL)"""
174 174
  175 + print ">>>>>", self.address, int(self.port), theQuery, 11112, self.aetitle,\
  176 + self.aetitle_call, "/home/phamorim/Desktop/output/"
175 177
176 178
177 - cnf.CMove(self.address, int(self.port), theQuery, 11113, self.aetitle,\  
178 - self.aetitle_call, "/home/phamorim/Desktop/output/") 179 + cnf.CMove(self.address, int(self.port), theQuery, 11112, self.aetitle,\
  180 + self.aetitle_call, "/home/phamorim/Desktop/")
179 181
  182 + print "BAIXOUUUUUUUU"
  183 + #ret = gdcm.DataSetArrayType()
180 184
181 - ret = gdcm.DataSetArrayType()  
182 -  
183 - cnf.CFind(self.address, int(self.port), theQuery, ret, self.aetitle,\  
184 - self.aetitle_call) 185 + #cnf.CFind(self.address, int(self.port), theQuery, ret, self.aetitle,\
  186 + # self.aetitle_call)
185 187
186 - print "aetitle",self.aetitle  
187 - print "call",self.aetitle_call  
188 - print "Baixados..........." 188 + #print "aetitle",self.aetitle
  189 + #print "call",self.aetitle_call
  190 + #print "Baixados..........."
189 191
190 192
191 - for r in ret:  
192 - print r  
193 - print "\n" 193 + #for r in ret:
  194 + # print r
  195 + # print "\n"
invesalius/utils.py
  Diff comments   View file @6764eed
@@ -220,7 +220,6 @@ def predict_memory(nfiles, x, y, p): @@ -220,7 +220,6 @@ def predict_memory(nfiles, x, y, p):
220 if (platform.architecture()[0] == '32bit'): 220 if (platform.architecture()[0] == '32bit'):
221 #(314859200 = 300 MB) 221 #(314859200 = 300 MB)
222 #(26999999 = 25 MB) 222 #(26999999 = 25 MB)
223 -  
224 #case occupy more than 300 MB image is reduced to 1.5, 223 #case occupy more than 300 MB image is reduced to 1.5,
225 #and 25 MB each image is resized 0.04. 224 #and 25 MB each image is resized 0.04.
226 if (m >= 314859200): 225 if (m >= 314859200):