Merge branch 'surface_creation'

tfmoraes
1 parent 4191a837
Showing 8 changed files with 380 additions and 97 deletions Show diff stats
invesalius/data/slice_.py
invesalius/data/surface.py
invesalius/data/surface_process.py
invesalius/gui/data_notebook.py
invesalius/gui/default_tasks.py
invesalius/gui/dialogs.py
invesalius/gui/task_slice.py
invesalius/gui/task_surface.py
@@ -596,10 +596,11 @@ class Slice(object):
     #---------------------------------------------------------------------------
     def CreateSurfaceFromIndex(self, pubsub_evt):
-        mask_index, overwrite_surface, algorithm, options = pubsub_evt.data
+        print pubsub_evt.data
+        surface_parameters = pubsub_evt.data
         proj = Project()
-        mask = proj.mask_dict[mask_index]
+        mask = proj.mask_dict[surface_parameters['options']['index']]
         # This is very important. Do not use masks' imagedata. It would mess up
         # surface quality event when using contour
@@ -611,12 +612,8 @@ class Slice(object):
         mask.matrix.flush()
-        Publisher.sendMessage('Create surface', (algorithm, options,
-                                                      self.matrix,
-                                                      self.matrix_filename,
-                                                      mask, self.spacing,
-                                                      overwrite_surface))
-
+        Publisher.sendMessage('Create surface', (self, mask,
+                                                 surface_parameters))
     def GetOutput(self):
         return self.blend_filter.GetOutput()
@@ -369,31 +369,29 @@ class SurfaceManager():
         """
         Create surface actor, save into project and send it to viewer.
         """
-        algorithm, options, matrix, filename_img, mask, spacing, overwrite = pubsub_evt.data
-        min_value, max_value = mask.threshold_range
-        fill_holes = False
-
-        mask.matrix.flush()
-
-        #if len(surface_data) == 5:
-            #imagedata, colour, [min_value, max_value], \
-            #edited_points, overwrite = pubsub_evt.data
-            #quality=_('Optimal *')
-            #surface_name = ""
-            #fill_holes = True
-            #keep_largest = False
-        #else:
-            #imagedata, colour, [min_value, max_value],\
-            #edited_points, overwrite, surface_name,\
-            #quality, fill_holes, keep_largest =\
-            #pubsub_evt.data
+        slice_, mask, surface_parameters = pubsub_evt.data
+        matrix = slice_.matrix
+        filename_img = slice_.matrix_filename
+        spacing = slice_.spacing
+        
+        algorithm = surface_parameters['method']['algorithm']
+        options = surface_parameters['method']['options']
+        
+        surface_name = surface_parameters['options']['name']
+        quality = surface_parameters['options']['quality']
+        fill_holes = surface_parameters['options']['fill']
+        keep_largest = surface_parameters['options']['keep_largest']
         mode = 'CONTOUR' # 'GRAYSCALE'
-        quality=_('Optimal *')
-        keep_largest = False
-        surface_name = ""
+        min_value, max_value = mask.threshold_range
         colour = mask.colour
+        try:
+            overwrite = surface_parameters['options']['overwrite']
+        except KeyError:
+            overwrite = False
+        mask.matrix.flush()
+
         if quality in const.SURFACE_QUALITY.keys():
             imagedata_resolution = const.SURFACE_QUALITY[quality][0]
             smooth_iterations = const.SURFACE_QUALITY[quality][1]
@@ -448,8 +446,9 @@ class SurfaceManager():
                                                 smooth_relaxation_factor,
                                                 smooth_iterations, language,
                                                 flip_image, q_in, q_out,
-                                                mask.was_edited and algorithm != u'InVesalius 3.b2',
-                                                algorithm)
+                                                algorithm != 'Default',
+                                                algorithm,
+                                                imagedata_resolution)
             p.append(sp)
             sp.start()
@@ -501,7 +500,7 @@ class SurfaceManager():
         polydata.SetSource(None)
         del polydata_append
-        if algorithm == u'Context aware smoothing':
+        if algorithm == 'ca_smoothing':
             normals = vtk.vtkPolyDataNormals()
             normals_ref = weakref.ref(normals)
             normals_ref().AddObserver("ProgressEvent", lambda obj,evt:
@@ -542,21 +541,23 @@ class SurfaceManager():
             polydata.DebugOn()
         else:
-            smoother = vtk.vtkWindowedSincPolyDataFilter()
+            #smoother = vtk.vtkWindowedSincPolyDataFilter()
+            smoother = vtk.vtkSmoothPolyDataFilter()
             smoother_ref = weakref.ref(smoother)
             smoother_ref().AddObserver("ProgressEvent", lambda obj,evt:
                             UpdateProgress(smoother_ref(), _("Generating 3D surface...")))
             smoother.SetInput(polydata)
             smoother.SetNumberOfIterations(smooth_iterations)
-            smoother.SetFeatureAngle(120)
-            smoother.SetEdgeAngle(90.0)
+            smoother.SetRelaxationFactor(smooth_relaxation_factor)
+            smoother.SetFeatureAngle(80)
+            #smoother.SetEdgeAngle(90.0)
+            #smoother.SetPassBand(0.1)
             smoother.BoundarySmoothingOn()
-            smoother.SetPassBand(0.1)
+            smoother.FeatureEdgeSmoothingOn()
+            #smoother.NormalizeCoordinatesOn()
+            #smoother.NonManifoldSmoothingOn()
             smoother.ReleaseDataFlagOn()
             smoother.GetOutput().ReleaseDataFlagOn()
-            #smoother.FeatureEdgeSmoothingOn()
-            #smoother.NonManifoldSmoothingOn()
-            #smoother.NormalizeCoordinatesOn()
             smoother.Update()
             del polydata
             polydata = smoother.GetOutput()
@@ -7,6 +7,8 @@ import vtk
 import i18n
 import converters
+import imagedata_utils as iu
+
 from scipy import ndimage
 class SurfaceProcess(multiprocessing.Process):
@@ -15,7 +17,7 @@ class SurfaceProcess(multiprocessing.Process):
                  mask_shape, mask_dtype, spacing, mode, min_value, max_value,
                  decimate_reduction, smooth_relaxation_factor,
                  smooth_iterations, language, flip_image, q_in, q_out,
-                 from_binary, algorithm):
+                 from_binary, algorithm, imagedata_resolution):
         multiprocessing.Process.__init__(self)
         self.pipe = pipe
@@ -35,6 +37,7 @@ class SurfaceProcess(multiprocessing.Process):
         self.shape = shape
         self.from_binary = from_binary
         self.algorithm = algorithm
+        self.imagedata_resolution = imagedata_resolution
         self.mask_filename = mask_filename
         self.mask_shape = mask_shape
@@ -96,6 +99,9 @@ class SurfaceProcess(multiprocessing.Process):
                                            "AXIAL")
             del a_image
+        if self.imagedata_resolution:
+            image = iu.ResampleImage3D(image, self.imagedata_resolution)
+
         flip = vtk.vtkImageFlip()
         flip.SetInput(image)
         flip.SetFilteredAxis(1)
@@ -29,6 +29,7 @@ import wx.lib.platebtn as pbtn
 from wx.lib.pubsub import pub as Publisher
 import constants as const
+import data.slice_ as slice_
 import gui.dialogs as dlg
 import gui.widgets.listctrl as listmix
 import utils as ul
@@ -615,9 +616,10 @@ class SurfaceButtonControlPanel(wx.Panel):
             self.OnDuplicate()
     def OnNew(self):
-        import project as prj
-
-        dialog = dlg.NewSurfaceDialog()
+        sl = slice_.Slice()
+        dialog = dlg.SurfaceCreationDialog(self, -1, 
+                            _('InVesalius 3 - New surface'),
+                            mask_edited=sl.current_mask.was_edited)
         try:
             if dialog.ShowModal() == wx.ID_OK:
                 ok = 1
@@ -627,25 +629,10 @@ class SurfaceButtonControlPanel(wx.Panel):
             ok = 1
         if ok:
-            (mask_index, surface_name, surface_quality, fill_holes,\
-            keep_largest) = dialog.GetValue()
-
-            # Retrieve information from mask
-            proj = prj.Project()
-            mask = proj.mask_dict[mask_index]
-
-            # Send all information so surface can be created
-            surface_data = [proj.imagedata,
-                            mask.colour,
-                            mask.threshold_range,
-                            mask.edited_points,
-                            False, # overwrite
-                            surface_name,
-                            surface_quality,
-                            fill_holes,
-                            keep_largest]
-
-            Publisher.sendMessage('Create surface', surface_data)
+            surface_options = dialog.GetValue()
+
+            Publisher.sendMessage('Create surface from index', surface_options)
+            dialog.Destroy()
     def OnRemove(self):
         self.parent.listctrl.RemoveSurfaces()
@@ -260,7 +260,7 @@ class UpperTaskPanel(wx.Panel):
         Publisher.subscribe(self.OnFoldExport, 'Fold export task')
     def OnOverwrite(self, pubsub_evt):
-        self.overwrite = pubsub_evt.data[1]
+        self.overwrite = pubsub_evt.data['options']['overwrite']
     def OnFoldSurface(self, pubsub_evt):
         if not self.overwrite:
@@ -34,6 +34,14 @@ import project as proj
 import session as ses
 import utils
+class MaskEvent(wx.PyCommandEvent):
+    def __init__(self , evtType, id, mask_index):
+        wx.PyCommandEvent.__init__(self, evtType, id,)
+        self.mask_index = mask_index
+
+myEVT_MASK_SET = wx.NewEventType()
+EVT_MASK_SET = wx.PyEventBinder(myEVT_MASK_SET, 1)
+
 class NumberDialog(wx.Dialog):
     def __init__(self, message, value=0):
         pre = wx.PreDialog()
@@ -964,7 +972,6 @@ class SurfaceDialog(wx.Dialog):
     def __init__(self):
         wx.Dialog.__init__(self, None, -1, u'Surface generation options')
         self._build_widgets()
-        self._bind_wx()
         self.CenterOnScreen()
     def _build_widgets(self):
@@ -975,12 +982,266 @@ 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.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)
+        self.ca = SurfaceMethodPanel(self, -1, True)
+
+        self.main_sizer = wx.BoxSizer(wx.VERTICAL)
+        self.main_sizer.Add(self.ca, 0, wx.EXPAND|wx.ALL, 5)
+        self.main_sizer.Add(btn_sizer, 0, wx.EXPAND | wx.ALL, 5)
+
+        self.SetSizer(self.main_sizer)
+        self.Fit()
+
+    def GetOptions(self):
+        return self.ca.GetOptions()
+
+    def GetAlgorithmSelected(self):
+        return self.ca.GetAlgorithmSelected()
+
+
+####################### New surface creation dialog ###########################
+class SurfaceCreationDialog(wx.Dialog):
+    def __init__(self, parent=None, ID=-1, title=_(u"Surface creation"),
+                 size=wx.DefaultSize, pos=wx.DefaultPosition,
+                 style=wx.DEFAULT_DIALOG_STYLE, useMetal=False,
+                 mask_edited=False):
+
+        # Instead of calling wx.Dialog.__init__ we precreate the dialog
+        # so we can set an extra style that must be set before
+        # creation, and then we create the GUI object using the Create
+        # method.
+        pre = wx.PreDialog()
+        pre.SetExtraStyle(wx.DIALOG_EX_CONTEXTHELP)
+        pre.Create(parent, ID, title, pos, (50,30), style)
+
+        # This extra style can be set after the UI object has been created.
+        if 'wxMac' in wx.PlatformInfo and useMetal:
+            self.SetExtraStyle(wx.DIALOG_EX_METAL)
+
+        # This next step is the most important, it turns this Python
+        # object into the real wrapper of the dialog (instead of pre)
+        # as far as the wxPython extension is concerned.
+        self.PostCreate(pre)
+
+        self.CenterOnScreen()
+
+        self.nsd = SurfaceCreationOptionsPanel(self, -1)
+        self.nsd.Bind(EVT_MASK_SET, self.OnSetMask)
+        surface_options_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1,
+                                      _('Surface creation options')), wx.VERTICAL)
+        surface_options_sizer.Add(self.nsd, 0, wx.EXPAND|wx.ALL, 5)
+
+        self.ca = SurfaceMethodPanel(self, -1, mask_edited)
+        surface_method_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1,
+                                      _('Surface creation method')), wx.VERTICAL)
+        surface_method_sizer.Add(self.ca, 0, wx.EXPAND|wx.ALL, 5)
+
+        btn_ok = wx.Button(self, wx.ID_OK)
+        btn_ok.SetDefault()
+        btn_cancel = wx.Button(self, wx.ID_CANCEL)
+
+        btnsizer = wx.StdDialogButtonSizer()
+        btnsizer.AddButton(btn_ok)
+        btnsizer.AddButton(btn_cancel)
+        btnsizer.Realize()
+
+        sizer_panels = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_panels.Add(surface_method_sizer, 0, wx.EXPAND|wx.ALL, 5)
+        sizer_panels.Add(surface_options_sizer, 0, wx.EXPAND|wx.ALL, 5)
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(sizer_panels, 0, wx.ALIGN_RIGHT|wx.ALL, 5)
+        sizer.Add(btnsizer, 0, wx.ALIGN_RIGHT|wx.ALL, 5)
+
+        self.SetSizer(sizer)
+        sizer.Fit(self)
+
+        self.Show()
+
+    def OnSetMask(self, evt):
+        mask = proj.Project().mask_dict[evt.mask_index]
+        self.ca.mask_edited = mask.was_edited
+        self.ca.ReloadMethodsOptions()
+
+
+
+    def GetValue(self):
+        return {"method": self.ca.GetValue(),
+                "options": self.nsd.GetValue()}
+
+
+class SurfaceCreationOptionsPanel(wx.Panel):
+    def __init__(self, parent, ID=-1):
+        import constants as const
+        import data.surface as surface
+        import project as prj
+        
+        wx.Panel.__init__(self, parent, ID)
+
+        # LINE 1: Surface name
+        label_surface = wx.StaticText(self, -1, _("New surface name:"))
+
+        default_name =  const.SURFACE_NAME_PATTERN %(surface.Surface.general_index+2)
+        text = wx.TextCtrl(self, -1, "", size=(80,-1))
+        text.SetHelpText(_("Name the surface to be created"))
+        text.SetValue(default_name)
+        self.text = text
+
+        # LINE 2: Mask of reference
+
+        # Informative label
+        label_mask = wx.StaticText(self, -1, _("Mask of reference:"))
+
+        #Retrieve existing masks
+        project = prj.Project()
+        index_list = project.mask_dict.keys()
+        index_list.sort()
+        self.mask_list = [project.mask_dict[index].name for index in index_list]
+
+        # Mask selection combo
+        combo_mask = wx.ComboBox(self, -1, "", choices= self.mask_list,
+                                     style=wx.CB_DROPDOWN|wx.CB_READONLY)
+        combo_mask.SetSelection(len(self.mask_list)-1)
+        combo_mask.Bind(wx.EVT_COMBOBOX, self.OnSetMask)
+        if sys.platform != 'win32':
+            combo_mask.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        self.combo_mask = combo_mask
+
+        # LINE 3: Surface quality
+        label_quality = wx.StaticText(self, -1, _("Surface quality:"))
+
+        choices =  const.SURFACE_QUALITY_LIST
+        style = wx.CB_DROPDOWN|wx.CB_READONLY
+        combo_quality = wx.ComboBox(self, -1, "",
+                                    choices= choices,
+                                    style=style)
+        combo_quality.SetSelection(3)
+        if sys.platform != 'win32':
+            combo_quality.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        self.combo_quality = combo_quality
+
+        # OVERVIEW
+        # Sizer that joins content above
+        flag_link = wx.EXPAND|wx.GROW|wx.ALL
+        flag_button = wx.ALL | wx.EXPAND| wx.GROW
+
+        fixed_sizer = wx.FlexGridSizer(rows=2, cols=2, hgap=10, vgap=5)
+        fixed_sizer.AddGrowableCol(0, 1)
+        fixed_sizer.AddMany([ (label_surface, 1, flag_link, 0),
+                              (text, 1, flag_button, 0),
+                              (label_mask, 1, flag_link, 0),
+                              (combo_mask, 0, flag_button, 0),
+                              (label_quality, 1, flag_link, 0),
+                              (combo_quality, 0, flag_button, 0)])
+
+
+        # LINES 4 and 5: Checkboxes
+        check_box_holes = wx.CheckBox(self, -1, _("Fill holes"))
+        check_box_holes.SetValue(True)
+        self.check_box_holes = check_box_holes
+        check_box_largest = wx.CheckBox(self, -1, _("Keep largest region"))
+        self.check_box_largest = check_box_largest
+
+        # OVERVIEW
+        # Merge all sizers and checkboxes
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(fixed_sizer, 0, wx.TOP|wx.RIGHT|wx.LEFT|wx.GROW|wx.EXPAND, 5)
+        sizer.Add(check_box_holes, 0, wx.RIGHT|wx.LEFT, 5)
+        sizer.Add(check_box_largest, 0, wx.RIGHT|wx.LEFT, 5)
+
+        self.SetSizer(sizer)
+        sizer.Fit(self)
+
+    def OnSetMask(self, evt):
+        new_evt = MaskEvent(myEVT_MASK_SET, -1, self.combo_mask.GetSelection())
+        self.GetEventHandler().ProcessEvent(new_evt)
+
+    def GetValue(self):
+        mask_index = self.combo_mask.GetSelection()
+        surface_name = self.text.GetValue()
+        quality = const.SURFACE_QUALITY_LIST[self.combo_quality.GetSelection()]
+        fill_holes = self.check_box_holes.GetValue()
+        keep_largest = self.check_box_largest.GetValue()
+        return {"index": mask_index,
+                "name": surface_name,
+                "quality": quality,
+                "fill": fill_holes,
+                "keep_largest": keep_largest,
+                "overwrite": False}
+
+
+class CAOptions(wx.Panel):
+    '''
+    Options related to Context aware algorithm:
+    Angle: The min angle to a vertex to be considered a staircase vertex;
+    Max distance: The max distance a normal vertex must be to calculate its
+        weighting;
+    Min Weighting: The min weight a vertex must have;
+    Steps: The number of iterations the smoothing algorithm have to do.
+    '''
+    def __init__(self, parent):
+        wx.Panel.__init__(self, parent, -1)
+        self._build_widgets()
+    
+    def _build_widgets(self):
+        self.angle = floatspin.FloatSpin(self, -1, value=0.7, min_val=0.0,
+                                         max_val=1.0, increment=0.1,
+                                         digits=1)
+
+        self.max_distance = floatspin.FloatSpin(self, -1, value=3.0, min_val=0.0,
+                                         max_val=100.0, increment=0.1,
+                                         digits=2)
+
+        self.min_weight = floatspin.FloatSpin(self, -1, value=0.2, min_val=0.0,
+                                         max_val=1.0, increment=0.1,
+                                         digits=1)
+        
+        self.steps = wx.SpinCtrl(self, -1, value='10', min=1, max=100)
+
+        layout_sizer = wx.FlexGridSizer(rows=4, cols=2, hgap=5, vgap=5)
+        layout_sizer.Add(wx.StaticText(self, -1, _(u'Angle:')),  0, wx.EXPAND)
+        layout_sizer.Add(self.angle, 0, wx.EXPAND)
+        layout_sizer.Add(wx.StaticText(self, -1, _(u'Max. distance:')),  0, wx.EXPAND)
+        layout_sizer.Add(self.max_distance, 0, wx.EXPAND)
+        layout_sizer.Add(wx.StaticText(self, -1, _(u'Min. weight:')), 0, wx.EXPAND)
+        layout_sizer.Add(self.min_weight, 0, wx.EXPAND)
+        layout_sizer.Add(wx.StaticText(self, -1, _(u'N. steps:')),  0, wx.EXPAND)
+        layout_sizer.Add(self.steps, 0, wx.EXPAND)
+
+        self.main_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1, _('Context aware options')), wx.VERTICAL)
+        self.main_sizer.Add(layout_sizer, 0, wx.EXPAND | wx.ALL, 5)
+        self.SetSizer(self.main_sizer)
+
+class SurfaceMethodPanel(wx.Panel):
+    '''
+    This dialog is only shown when the mask whose surface will be generate was
+    edited. So far, the only options available are the choice of method to
+    generate the surface, Binary or `Context aware smoothing', and options from
+    `Context aware smoothing'
+    '''
+    def __init__(self, parent, id, mask_edited=False):
+        wx.Panel.__init__(self, parent, id)
+
+        self.mask_edited = mask_edited
+        self.alg_types = {_(u'Default'): 'Default',
+                          _(u'Context aware smoothing'): 'ca_smoothing',
+                          _(u'Binary'): 'Binary'}
+        self.edited_imp = [_(u'Default'), ]
+
+        self._build_widgets()
+        self._bind_wx()
+    def _build_widgets(self):
         self.ca_options = CAOptions(self)
+        self.cb_types = wx.ComboBox(self, -1, _(u'Default'),
+                                    choices=[i for i in sorted(self.alg_types)
+                                            if not (self.mask_edited and i in self.edited_imp)],
+                                    style=wx.CB_READONLY)
+        if self.mask_edited:
+            self.cb_types.SetValue(_(u'Context aware smoothing'))
+            self.ca_options.Enable()
+        else:
+            self.ca_options.Disable()
+
         method_sizer = wx.BoxSizer(wx.HORIZONTAL)
         method_sizer.Add(wx.StaticText(self, -1, u'Method:'), 0,
@@ -990,7 +1251,6 @@ class SurfaceDialog(wx.Dialog):
         self.main_sizer = wx.BoxSizer(wx.VERTICAL)
         self.main_sizer.Add(method_sizer, 0, wx.EXPAND | wx.ALL, 5)
         self.main_sizer.Add(self.ca_options, 0, wx.EXPAND | wx.ALL, 5)
-        self.main_sizer.Add(btn_sizer, 0, wx.EXPAND | wx.ALL, 5)
         self.SetSizer(self.main_sizer)
         self.Fit()
@@ -1000,7 +1260,7 @@ class SurfaceDialog(wx.Dialog):
     def _set_cb_types(self, evt):
         print evt.GetString()
-        if self.alg_types[evt.GetSelection()] == self.alg_types[0]:
+        if self.alg_types[evt.GetString()] == 'ca_smoothing':
             self.ca_options.Enable()
         else:
             self.ca_options.Disable()
@@ -1008,12 +1268,12 @@ class SurfaceDialog(wx.Dialog):
     def GetAlgorithmSelected(self):
         try:
-            return self.alg_types[self.cb_types.GetSelection()]
+            return self.alg_types[self.cb_types.GetValue()]
         except KeyError:
             return self.alg_types[0]
     def GetOptions(self):
-        if self.GetAlgorithmSelected() == self.alg_types[0]:
+        if self.GetAlgorithmSelected() == 'ca_smoothing':
             options = {'angle': self.ca_options.angle.GetValue(),
                        'max distance': self.ca_options.max_distance.GetValue(),
                        'min weight': self.ca_options.min_weight.GetValue(),
@@ -1022,4 +1282,20 @@ class SurfaceDialog(wx.Dialog):
             options = {}
         return options
+    def GetValue(self):
+        algorithm = self.GetAlgorithmSelected()
+        options = self.GetOptions()
+        return {"algorithm": algorithm, 
+                "options": options}
+        
+    def ReloadMethodsOptions(self):
+        self.cb_types.Clear()
+        self.cb_types.AppendItems([i for i in sorted(self.alg_types)
+                                   if not (self.mask_edited and i in self.edited_imp)])
+        if self.mask_edited:
+            self.cb_types.SetValue(_(u'Context aware smoothing'))
+            self.ca_options.Enable()
+        else:
+            self.cb_types.SetValue(_(u'Default'))
+            self.ca_options.Disable()
@@ -155,9 +155,19 @@ class InnerTaskPanel(wx.Panel):
                     options = dlgs.GetOptions()
                 else:
                     return
-            Publisher.sendMessage('Create surface from index',
-                                    (self.GetMaskSelected(),
-                                    overwrite, algorithm, options))
+
+            mask_index = sl.current_mask.index
+            method = {'algorithm': 'Default', 
+                      'options': options}
+            srf_options = {"index": mask_index,
+                           "name": '',
+                           "quality": _('Optimal *'),
+                           "fill": False,
+                           "keep_largest": False,
+                           "overwrite": overwrite}
+
+            Publisher.sendMessage('Create surface from index', 
+                                  {'method': method, 'options': srf_options})
             Publisher.sendMessage('Fold surface task')
         else:
             dlg.InexistentMask()
@@ -23,6 +23,7 @@ import wx.lib.hyperlink as hl
 from wx.lib.pubsub import pub as Publisher
 import constants as const
+import data.slice_ as slice_
 import gui.dialogs as dlg
 import gui.widgets.foldpanelbar as fpb
 import gui.widgets.colourselect as csel
@@ -30,7 +31,6 @@ import gui.widgets.platebtn as pbtn
 import project as prj
 import utils as utl
-
 #INTERPOLATION_MODE_LIST = ["Cubic", "Linear", "NearestNeighbor"]
 MIN_TRANSPARENCY = 0
 MAX_TRANSPARENCY = 100
@@ -131,7 +131,10 @@ class InnerTaskPanel(wx.Panel):
     def OnLinkNewSurface(self, evt=None):
         #import gui.dialogs as dlg
-        dialog = dlg.NewSurfaceDialog(self, -1, _('InVesalius 3 - New surface'))
+        sl = slice_.Slice()
+        dialog = dlg.SurfaceCreationDialog(self, -1, 
+                            _('InVesalius 3 - New surface'),
+                            mask_edited=sl.current_mask.was_edited)
         try:
             if dialog.ShowModal() == wx.ID_OK:
@@ -142,26 +145,29 @@ class InnerTaskPanel(wx.Panel):
             ok = 1
         if (ok):
-            # Retrieve information from dialog
-            (mask_index, surface_name, surface_quality, fill_holes,\
-            keep_largest) = dialog.GetValue()
-
-            # Retrieve information from mask
-            proj = prj.Project()
-            mask = proj.mask_dict[mask_index]
-
-            # Send all information so surface can be created
-            surface_data = [proj.imagedata,
-                            mask.colour,
-                            mask.threshold_range,
-                            mask.edited_points,
-                            False, # overwrite
-                            surface_name,
-                            surface_quality,
-                            fill_holes,
-                            keep_largest]
-
-            Publisher.sendMessage('Create surface', surface_data)
+            ## Retrieve information from dialog
+            #(mask_index, surface_name, surface_quality, fill_holes,\
+            #keep_largest) = dialog.GetValue()
+
+            ## Retrieve information from mask
+            #proj = prj.Project()
+            #mask = proj.mask_dict[mask_index]
+
+            ## Send all information so surface can be created
+            #surface_data = [proj.imagedata,
+                            #mask.colour,
+                            #mask.threshold_range,
+                            #mask.edited_points,
+                            #False, # overwrite
+                            #surface_name,
+                            #surface_quality,
+                            #fill_holes,
+                            #keep_largest]
+
+
+            surface_options = dialog.GetValue()
+
+            Publisher.sendMessage('Create surface from index', surface_options)
             dialog.Destroy()
         if evt:
             evt.Skip()
	@@ -260,7 +260,7 @@ class UpperTaskPanel(wx.Panel):		@@ -260,7 +260,7 @@ class UpperTaskPanel(wx.Panel):
260	Publisher.subscribe(self.OnFoldExport, 'Fold export task')	260	Publisher.subscribe(self.OnFoldExport, 'Fold export task')
261		261
262	def OnOverwrite(self, pubsub_evt):	262	def OnOverwrite(self, pubsub_evt):
263	- self.overwrite = pubsub_evt.data[1]	263	+ self.overwrite = pubsub_evt.data['options']['overwrite']
264		264
265	def OnFoldSurface(self, pubsub_evt):	265	def OnFoldSurface(self, pubsub_evt):
266	if not self.overwrite:	266	if not self.overwrite:
	@@ -34,6 +34,14 @@ import project as proj		@@ -34,6 +34,14 @@ import project as proj
34	import session as ses	34	import session as ses
35	import utils	35	import utils
36		36
		37	+class MaskEvent(wx.PyCommandEvent):
		38	+ def __init__(self , evtType, id, mask_index):
		39	+ wx.PyCommandEvent.__init__(self, evtType, id,)
		40	+ self.mask_index = mask_index
		41	+
		42	+myEVT_MASK_SET = wx.NewEventType()
		43	+EVT_MASK_SET = wx.PyEventBinder(myEVT_MASK_SET, 1)
		44	+
37	class NumberDialog(wx.Dialog):	45	class NumberDialog(wx.Dialog):
38	def __init__(self, message, value=0):	46	def __init__(self, message, value=0):
39	pre = wx.PreDialog()	47	pre = wx.PreDialog()
	@@ -964,7 +972,6 @@ class SurfaceDialog(wx.Dialog):		@@ -964,7 +972,6 @@ class SurfaceDialog(wx.Dialog):
964	def __init__(self):	972	def __init__(self):
965	wx.Dialog.__init__(self, None, -1, u'Surface generation options')	973	wx.Dialog.__init__(self, None, -1, u'Surface generation options')
966	self._build_widgets()	974	self._build_widgets()
967	- self._bind_wx()
968	self.CenterOnScreen()	975	self.CenterOnScreen()
969		976
970	def _build_widgets(self):	977	def _build_widgets(self):
	@@ -975,12 +982,266 @@ class SurfaceDialog(wx.Dialog):		@@ -975,12 +982,266 @@ class SurfaceDialog(wx.Dialog):
975	btn_sizer.AddButton(btn_cancel)	982	btn_sizer.AddButton(btn_cancel)
976	btn_sizer.Realize()	983	btn_sizer.Realize()
977		984
978	- self.alg_types = {0: u'Context aware smoothing', 1: u'Binary'}#,2: u'InVesalius 3.b2'}
979	- self.cb_types = wx.ComboBox(self, -1, self.alg_types[0],
980	- choices=[self.alg_types[i] for i in sorted(self.alg_types)],
981	- style=wx.CB_READONLY)	985	+ self.ca = SurfaceMethodPanel(self, -1, True)
		986	+
		987	+ self.main_sizer = wx.BoxSizer(wx.VERTICAL)
		988	+ self.main_sizer.Add(self.ca, 0, wx.EXPAND\|wx.ALL, 5)
		989	+ self.main_sizer.Add(btn_sizer, 0, wx.EXPAND \| wx.ALL, 5)
		990	+
		991	+ self.SetSizer(self.main_sizer)
		992	+ self.Fit()
		993	+
		994	+ def GetOptions(self):
		995	+ return self.ca.GetOptions()
		996	+
		997	+ def GetAlgorithmSelected(self):
		998	+ return self.ca.GetAlgorithmSelected()
		999	+
		1000	+
		1001	+####################### New surface creation dialog ###########################
		1002	+class SurfaceCreationDialog(wx.Dialog):
		1003	+ def __init__(self, parent=None, ID=-1, title=_(u"Surface creation"),
		1004	+ size=wx.DefaultSize, pos=wx.DefaultPosition,
		1005	+ style=wx.DEFAULT_DIALOG_STYLE, useMetal=False,
		1006	+ mask_edited=False):
		1007	+
		1008	+ # Instead of calling wx.Dialog.__init__ we precreate the dialog
		1009	+ # so we can set an extra style that must be set before
		1010	+ # creation, and then we create the GUI object using the Create
		1011	+ # method.
		1012	+ pre = wx.PreDialog()
		1013	+ pre.SetExtraStyle(wx.DIALOG_EX_CONTEXTHELP)
		1014	+ pre.Create(parent, ID, title, pos, (50,30), style)
		1015	+
		1016	+ # This extra style can be set after the UI object has been created.
		1017	+ if 'wxMac' in wx.PlatformInfo and useMetal:
		1018	+ self.SetExtraStyle(wx.DIALOG_EX_METAL)
		1019	+
		1020	+ # This next step is the most important, it turns this Python
		1021	+ # object into the real wrapper of the dialog (instead of pre)
		1022	+ # as far as the wxPython extension is concerned.
		1023	+ self.PostCreate(pre)
		1024	+
		1025	+ self.CenterOnScreen()
		1026	+
		1027	+ self.nsd = SurfaceCreationOptionsPanel(self, -1)
		1028	+ self.nsd.Bind(EVT_MASK_SET, self.OnSetMask)
		1029	+ surface_options_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1,
		1030	+ _('Surface creation options')), wx.VERTICAL)
		1031	+ surface_options_sizer.Add(self.nsd, 0, wx.EXPAND\|wx.ALL, 5)
		1032	+
		1033	+ self.ca = SurfaceMethodPanel(self, -1, mask_edited)
		1034	+ surface_method_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1,
		1035	+ _('Surface creation method')), wx.VERTICAL)
		1036	+ surface_method_sizer.Add(self.ca, 0, wx.EXPAND\|wx.ALL, 5)
		1037	+
		1038	+ btn_ok = wx.Button(self, wx.ID_OK)
		1039	+ btn_ok.SetDefault()
		1040	+ btn_cancel = wx.Button(self, wx.ID_CANCEL)
		1041	+
		1042	+ btnsizer = wx.StdDialogButtonSizer()
		1043	+ btnsizer.AddButton(btn_ok)
		1044	+ btnsizer.AddButton(btn_cancel)
		1045	+ btnsizer.Realize()
		1046	+
		1047	+ sizer_panels = wx.BoxSizer(wx.HORIZONTAL)
		1048	+ sizer_panels.Add(surface_method_sizer, 0, wx.EXPAND\|wx.ALL, 5)
		1049	+ sizer_panels.Add(surface_options_sizer, 0, wx.EXPAND\|wx.ALL, 5)
		1050	+
		1051	+ sizer = wx.BoxSizer(wx.VERTICAL)
		1052	+ sizer.Add(sizer_panels, 0, wx.ALIGN_RIGHT\|wx.ALL, 5)
		1053	+ sizer.Add(btnsizer, 0, wx.ALIGN_RIGHT\|wx.ALL, 5)
		1054	+
		1055	+ self.SetSizer(sizer)
		1056	+ sizer.Fit(self)
		1057	+
		1058	+ self.Show()
		1059	+
		1060	+ def OnSetMask(self, evt):
		1061	+ mask = proj.Project().mask_dict[evt.mask_index]
		1062	+ self.ca.mask_edited = mask.was_edited
		1063	+ self.ca.ReloadMethodsOptions()
		1064	+
		1065	+
		1066	+
		1067	+ def GetValue(self):
		1068	+ return {"method": self.ca.GetValue(),
		1069	+ "options": self.nsd.GetValue()}
		1070	+
		1071	+
		1072	+class SurfaceCreationOptionsPanel(wx.Panel):
		1073	+ def __init__(self, parent, ID=-1):
		1074	+ import constants as const
		1075	+ import data.surface as surface
		1076	+ import project as prj
		1077	+
		1078	+ wx.Panel.__init__(self, parent, ID)
		1079	+
		1080	+ # LINE 1: Surface name
		1081	+ label_surface = wx.StaticText(self, -1, _("New surface name:"))
		1082	+
		1083	+ default_name = const.SURFACE_NAME_PATTERN %(surface.Surface.general_index+2)
		1084	+ text = wx.TextCtrl(self, -1, "", size=(80,-1))
		1085	+ text.SetHelpText(_("Name the surface to be created"))
		1086	+ text.SetValue(default_name)
		1087	+ self.text = text
		1088	+
		1089	+ # LINE 2: Mask of reference
		1090	+
		1091	+ # Informative label
		1092	+ label_mask = wx.StaticText(self, -1, _("Mask of reference:"))
		1093	+
		1094	+ #Retrieve existing masks
		1095	+ project = prj.Project()
		1096	+ index_list = project.mask_dict.keys()
		1097	+ index_list.sort()
		1098	+ self.mask_list = [project.mask_dict[index].name for index in index_list]
		1099	+
		1100	+ # Mask selection combo
		1101	+ combo_mask = wx.ComboBox(self, -1, "", choices= self.mask_list,
		1102	+ style=wx.CB_DROPDOWN\|wx.CB_READONLY)
		1103	+ combo_mask.SetSelection(len(self.mask_list)-1)
		1104	+ combo_mask.Bind(wx.EVT_COMBOBOX, self.OnSetMask)
		1105	+ if sys.platform != 'win32':
		1106	+ combo_mask.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
		1107	+ self.combo_mask = combo_mask
		1108	+
		1109	+ # LINE 3: Surface quality
		1110	+ label_quality = wx.StaticText(self, -1, _("Surface quality:"))
		1111	+
		1112	+ choices = const.SURFACE_QUALITY_LIST
		1113	+ style = wx.CB_DROPDOWN\|wx.CB_READONLY
		1114	+ combo_quality = wx.ComboBox(self, -1, "",
		1115	+ choices= choices,
		1116	+ style=style)
		1117	+ combo_quality.SetSelection(3)
		1118	+ if sys.platform != 'win32':
		1119	+ combo_quality.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
		1120	+ self.combo_quality = combo_quality
		1121	+
		1122	+ # OVERVIEW
		1123	+ # Sizer that joins content above
		1124	+ flag_link = wx.EXPAND\|wx.GROW\|wx.ALL
		1125	+ flag_button = wx.ALL \| wx.EXPAND\| wx.GROW
		1126	+
		1127	+ fixed_sizer = wx.FlexGridSizer(rows=2, cols=2, hgap=10, vgap=5)
		1128	+ fixed_sizer.AddGrowableCol(0, 1)
		1129	+ fixed_sizer.AddMany([ (label_surface, 1, flag_link, 0),
		1130	+ (text, 1, flag_button, 0),
		1131	+ (label_mask, 1, flag_link, 0),
		1132	+ (combo_mask, 0, flag_button, 0),
		1133	+ (label_quality, 1, flag_link, 0),
		1134	+ (combo_quality, 0, flag_button, 0)])
		1135	+
		1136	+
		1137	+ # LINES 4 and 5: Checkboxes
		1138	+ check_box_holes = wx.CheckBox(self, -1, _("Fill holes"))
		1139	+ check_box_holes.SetValue(True)
		1140	+ self.check_box_holes = check_box_holes
		1141	+ check_box_largest = wx.CheckBox(self, -1, _("Keep largest region"))
		1142	+ self.check_box_largest = check_box_largest
		1143	+
		1144	+ # OVERVIEW
		1145	+ # Merge all sizers and checkboxes
		1146	+ sizer = wx.BoxSizer(wx.VERTICAL)
		1147	+ sizer.Add(fixed_sizer, 0, wx.TOP\|wx.RIGHT\|wx.LEFT\|wx.GROW\|wx.EXPAND, 5)
		1148	+ sizer.Add(check_box_holes, 0, wx.RIGHT\|wx.LEFT, 5)
		1149	+ sizer.Add(check_box_largest, 0, wx.RIGHT\|wx.LEFT, 5)
		1150	+
		1151	+ self.SetSizer(sizer)
		1152	+ sizer.Fit(self)
		1153	+
		1154	+ def OnSetMask(self, evt):
		1155	+ new_evt = MaskEvent(myEVT_MASK_SET, -1, self.combo_mask.GetSelection())
		1156	+ self.GetEventHandler().ProcessEvent(new_evt)
		1157	+
		1158	+ def GetValue(self):
		1159	+ mask_index = self.combo_mask.GetSelection()
		1160	+ surface_name = self.text.GetValue()
		1161	+ quality = const.SURFACE_QUALITY_LIST[self.combo_quality.GetSelection()]
		1162	+ fill_holes = self.check_box_holes.GetValue()
		1163	+ keep_largest = self.check_box_largest.GetValue()
		1164	+ return {"index": mask_index,
		1165	+ "name": surface_name,
		1166	+ "quality": quality,
		1167	+ "fill": fill_holes,
		1168	+ "keep_largest": keep_largest,
		1169	+ "overwrite": False}
		1170	+
		1171	+
		1172	+class CAOptions(wx.Panel):
		1173	+ '''
		1174	+ Options related to Context aware algorithm:
		1175	+ Angle: The min angle to a vertex to be considered a staircase vertex;
		1176	+ Max distance: The max distance a normal vertex must be to calculate its
		1177	+ weighting;
		1178	+ Min Weighting: The min weight a vertex must have;
		1179	+ Steps: The number of iterations the smoothing algorithm have to do.
		1180	+ '''
		1181	+ def __init__(self, parent):
		1182	+ wx.Panel.__init__(self, parent, -1)
		1183	+ self._build_widgets()
		1184	+
		1185	+ def _build_widgets(self):
		1186	+ self.angle = floatspin.FloatSpin(self, -1, value=0.7, min_val=0.0,
		1187	+ max_val=1.0, increment=0.1,
		1188	+ digits=1)
		1189	+
		1190	+ self.max_distance = floatspin.FloatSpin(self, -1, value=3.0, min_val=0.0,
		1191	+ max_val=100.0, increment=0.1,
		1192	+ digits=2)
		1193	+
		1194	+ self.min_weight = floatspin.FloatSpin(self, -1, value=0.2, min_val=0.0,
		1195	+ max_val=1.0, increment=0.1,
		1196	+ digits=1)
		1197	+
		1198	+ self.steps = wx.SpinCtrl(self, -1, value='10', min=1, max=100)
		1199	+
		1200	+ layout_sizer = wx.FlexGridSizer(rows=4, cols=2, hgap=5, vgap=5)
		1201	+ layout_sizer.Add(wx.StaticText(self, -1, _(u'Angle:')), 0, wx.EXPAND)
		1202	+ layout_sizer.Add(self.angle, 0, wx.EXPAND)
		1203	+ layout_sizer.Add(wx.StaticText(self, -1, _(u'Max. distance:')), 0, wx.EXPAND)
		1204	+ layout_sizer.Add(self.max_distance, 0, wx.EXPAND)
		1205	+ layout_sizer.Add(wx.StaticText(self, -1, _(u'Min. weight:')), 0, wx.EXPAND)
		1206	+ layout_sizer.Add(self.min_weight, 0, wx.EXPAND)
		1207	+ layout_sizer.Add(wx.StaticText(self, -1, _(u'N. steps:')), 0, wx.EXPAND)
		1208	+ layout_sizer.Add(self.steps, 0, wx.EXPAND)
		1209	+
		1210	+ self.main_sizer = wx.StaticBoxSizer(wx.StaticBox(self, -1, _('Context aware options')), wx.VERTICAL)
		1211	+ self.main_sizer.Add(layout_sizer, 0, wx.EXPAND \| wx.ALL, 5)
		1212	+ self.SetSizer(self.main_sizer)
		1213	+
		1214	+class SurfaceMethodPanel(wx.Panel):
		1215	+ '''
		1216	+ This dialog is only shown when the mask whose surface will be generate was
		1217	+ edited. So far, the only options available are the choice of method to
		1218	+ generate the surface, Binary or `Context aware smoothing', and options from
		1219	+ `Context aware smoothing'
		1220	+ '''
		1221	+ def __init__(self, parent, id, mask_edited=False):
		1222	+ wx.Panel.__init__(self, parent, id)
		1223	+
		1224	+ self.mask_edited = mask_edited
		1225	+ self.alg_types = {_(u'Default'): 'Default',
		1226	+ _(u'Context aware smoothing'): 'ca_smoothing',
		1227	+ _(u'Binary'): 'Binary'}
		1228	+ self.edited_imp = [_(u'Default'), ]
		1229	+
		1230	+ self._build_widgets()
		1231	+ self._bind_wx()
982		1232
		1233	+ def _build_widgets(self):
983	self.ca_options = CAOptions(self)	1234	self.ca_options = CAOptions(self)
		1235	+ self.cb_types = wx.ComboBox(self, -1, _(u'Default'),
		1236	+ choices=[i for i in sorted(self.alg_types)
		1237	+ if not (self.mask_edited and i in self.edited_imp)],
		1238	+ style=wx.CB_READONLY)
		1239	+ if self.mask_edited:
		1240	+ self.cb_types.SetValue(_(u'Context aware smoothing'))
		1241	+ self.ca_options.Enable()
		1242	+ else:
		1243	+ self.ca_options.Disable()
		1244	+
984		1245
985	method_sizer = wx.BoxSizer(wx.HORIZONTAL)	1246	method_sizer = wx.BoxSizer(wx.HORIZONTAL)
986	method_sizer.Add(wx.StaticText(self, -1, u'Method:'), 0,	1247	method_sizer.Add(wx.StaticText(self, -1, u'Method:'), 0,
	@@ -990,7 +1251,6 @@ class SurfaceDialog(wx.Dialog):		@@ -990,7 +1251,6 @@ class SurfaceDialog(wx.Dialog):
990	self.main_sizer = wx.BoxSizer(wx.VERTICAL)	1251	self.main_sizer = wx.BoxSizer(wx.VERTICAL)
991	self.main_sizer.Add(method_sizer, 0, wx.EXPAND \| wx.ALL, 5)	1252	self.main_sizer.Add(method_sizer, 0, wx.EXPAND \| wx.ALL, 5)
992	self.main_sizer.Add(self.ca_options, 0, wx.EXPAND \| wx.ALL, 5)	1253	self.main_sizer.Add(self.ca_options, 0, wx.EXPAND \| wx.ALL, 5)
993	- self.main_sizer.Add(btn_sizer, 0, wx.EXPAND \| wx.ALL, 5)
994		1254
995	self.SetSizer(self.main_sizer)	1255	self.SetSizer(self.main_sizer)
996	self.Fit()	1256	self.Fit()
	@@ -1000,7 +1260,7 @@ class SurfaceDialog(wx.Dialog):		@@ -1000,7 +1260,7 @@ class SurfaceDialog(wx.Dialog):
1000		1260
1001	def _set_cb_types(self, evt):	1261	def _set_cb_types(self, evt):
1002	print evt.GetString()	1262	print evt.GetString()
1003	- if self.alg_types[evt.GetSelection()] == self.alg_types[0]:	1263	+ if self.alg_types[evt.GetString()] == 'ca_smoothing':
1004	self.ca_options.Enable()	1264	self.ca_options.Enable()
1005	else:	1265	else:
1006	self.ca_options.Disable()	1266	self.ca_options.Disable()
	@@ -1008,12 +1268,12 @@ class SurfaceDialog(wx.Dialog):		@@ -1008,12 +1268,12 @@ class SurfaceDialog(wx.Dialog):
1008		1268
1009	def GetAlgorithmSelected(self):	1269	def GetAlgorithmSelected(self):
1010	try:	1270	try:
1011	- return self.alg_types[self.cb_types.GetSelection()]	1271	+ return self.alg_types[self.cb_types.GetValue()]
1012	except KeyError:	1272	except KeyError:
1013	return self.alg_types[0]	1273	return self.alg_types[0]
1014		1274
1015	def GetOptions(self):	1275	def GetOptions(self):
1016	- if self.GetAlgorithmSelected() == self.alg_types[0]:	1276	+ if self.GetAlgorithmSelected() == 'ca_smoothing':
1017	options = {'angle': self.ca_options.angle.GetValue(),	1277	options = {'angle': self.ca_options.angle.GetValue(),
1018	'max distance': self.ca_options.max_distance.GetValue(),	1278	'max distance': self.ca_options.max_distance.GetValue(),
1019	'min weight': self.ca_options.min_weight.GetValue(),	1279	'min weight': self.ca_options.min_weight.GetValue(),
	@@ -1022,4 +1282,20 @@ class SurfaceDialog(wx.Dialog):		@@ -1022,4 +1282,20 @@ class SurfaceDialog(wx.Dialog):
1022	options = {}	1282	options = {}
1023	return options	1283	return options
1024		1284
		1285	+ def GetValue(self):
		1286	+ algorithm = self.GetAlgorithmSelected()
		1287	+ options = self.GetOptions()
1025		1288
		1289	+ return {"algorithm": algorithm,
		1290	+ "options": options}
		1291	+
		1292	+ def ReloadMethodsOptions(self):
		1293	+ self.cb_types.Clear()
		1294	+ self.cb_types.AppendItems([i for i in sorted(self.alg_types)
		1295	+ if not (self.mask_edited and i in self.edited_imp)])
		1296	+ if self.mask_edited:
		1297	+ self.cb_types.SetValue(_(u'Context aware smoothing'))
		1298	+ self.ca_options.Enable()
		1299	+ else:
		1300	+ self.cb_types.SetValue(_(u'Default'))
		1301	+ self.ca_options.Disable()
	@@ -155,9 +155,19 @@ class InnerTaskPanel(wx.Panel):		@@ -155,9 +155,19 @@ class InnerTaskPanel(wx.Panel):
155	options = dlgs.GetOptions()	155	options = dlgs.GetOptions()
156	else:	156	else:
157	return	157	return
158	- Publisher.sendMessage('Create surface from index',
159	- (self.GetMaskSelected(),
160	- overwrite, algorithm, options))	158	+
		159	+ mask_index = sl.current_mask.index
		160	+ method = {'algorithm': 'Default',
		161	+ 'options': options}
		162	+ srf_options = {"index": mask_index,
		163	+ "name": '',
		164	+ "quality": _('Optimal *'),
		165	+ "fill": False,
		166	+ "keep_largest": False,
		167	+ "overwrite": overwrite}
		168	+
		169	+ Publisher.sendMessage('Create surface from index',
		170	+ {'method': method, 'options': srf_options})
161	Publisher.sendMessage('Fold surface task')	171	Publisher.sendMessage('Fold surface task')
162	else:	172	else:
163	dlg.InexistentMask()	173	dlg.InexistentMask()