+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
//HOLA!!!
//HOLA!!!
this->wxvtkbaseview = NULL;
mcontourvoiwidget=NULL;
-
if(wxvtkbaseview!=NULL&&imagedata!=NULL){
setBaseView(wxvtkbaseview);
setImageData(imagedata);
initializeVOIWidget();
-
- }
-
-
+ }
}
- void wxWidgetVOI::initializeVOIWidget(){
+
+ void wxWidgetVOI::initializeVOIWidget()
+ {
wxSizer* sizer = this->GetSizer();
-
- if(mcontourvoiwidget!=NULL){
- sizer->Remove( mcontourvoiwidget );
+
+/// \TODO fix deprecated warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated (declared at /usr/include/wx-2.8/wx/sizer.h:513)
+ if(mcontourvoiwidget!=NULL)
+ {
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+ sizer->Remove( mcontourvoiwidget );
+#else
+ sizer->Detach( mcontourvoiwidget );
+#endif
mcontourvoiwidget->Destroy();
}
mcontourvoiwidget = new ContourVOIWidget( this, wxvtkbaseview, imagedata );
mcontourvoiwidget->ConfigureVTK();
-
sizer -> Add( mcontourvoiwidget,1,wxGROW );
// wxwidget = new wxMPRWidget2( panel, marimagedata , 1 );
// wxwidget->ConfigureVTK();
this->Refresh();
}
- void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview){
+ void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview)
+ {
this->wxvtkbaseview = wxvtkbaseview;
}
- void wxWidgetVOI::setImageData(vtkImageData * imagedata){
+
+ void wxWidgetVOI::setImageData(vtkImageData * imagedata)
+ {
this->imagedata = imagedata;
}
wxMessageDialog(NULL, bbtk::std2wx("(ContourVOI) Input 'In' is not set"), bbtk::std2wx(bbGetFullName()) ).ShowModal();
}*/
-
vtkImageData* img = bbGetInputIn();
wxVtkBaseView* base = bbGetInputwxVtkBaseView();
wxwidgetvoi->initializeVOIWidget();
}
-
if (wxwidgetvoi!=NULL && _img!=NULL && _base != NULL){
ContourVOIWidget* contourvoiwidget = wxwidgetvoi->GetContourVOIWidget();
bbSetOutputVOI(_extract->GetOutput());
//JCP
*/
-
-
+
bbSetOutputIndex( Index );
bbSetOutputSize( Size );
}
-
}
//------------------------------------------------------
//------------------------------------------------------
void ContourVOI::bbUserSetDefaultValues()
{
-
_img = NULL;
_base = NULL;
//EED 20Juin2011 _extract =NULL;
}
- //-----------------------------------------------------------------
- void ContourVOI::bbUserInitializeProcessing()
- {
- }
+//-----------------------------------------------------------------
+void ContourVOI::bbUserInitializeProcessing()
+{
+}
- //-----------------------------------------------------------------
- void ContourVOI::bbUserFinalizeProcessing()
- {
- }
+//-----------------------------------------------------------------
+void ContourVOI::bbUserFinalizeProcessing()
+{
+}
- //-----------------------------------------------------------------
+//-----------------------------------------------------------------
-
}
// EO namespace bbcreaMaracasVisu
-
-