]> Creatis software - creaContours.git/commitdiff
avoid warnings on 'virtual destructor'
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 12 Nov 2008 14:46:11 +0000 (14:46 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 12 Nov 2008 14:46:11 +0000 (14:46 +0000)
appli/wxContourGUIExample/CMakeLists.txt
bbtk/src/bbCreaContournDimensions.cxx
lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h
lib/kernel_ManagerContour_NDimensions/CommandObject.cxx
lib/kernel_ManagerContour_NDimensions/CommandObject.h
lib/kernel_ManagerContour_NDimensions/ComposedCommand.h
lib/kernel_ManagerContour_NDimensions/ExecutableCommand.h
lib/kernel_ManagerContour_NDimensions/ICommandsUser.h

index cbfed29..07cf171 100644 (file)
@@ -8,13 +8,13 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES( wxContourGUIExample
-                                               creaImageIO     
-                                               Interface_Icons_NDimensions_lib
-                                               Interface_ManagerContour_NDimensions_lib
-                                               kernel_ManagerContour_NDimensions_lib
-                                               CreaEnvironment
-                                               maracasVisuLib
-                                               vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon
-                                          )
+                       creaImageIO     
+                       Interface_Icons_NDimensions_lib
+                       Interface_ManagerContour_NDimensions_lib
+                       kernel_ManagerContour_NDimensions_lib
+                       CreaEnvironment
+                       maracasVisuLib
+                       vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon
+                     )
 
 INSTALL_TARGETS(/bin/ wxContourGUIExample )
index 29ffeaf..af72d5c 100644 (file)
@@ -58,16 +58,23 @@ void nDimensions::CreateWidget()
        _builder->buildCountour_Envornment( imageSectionsFN, outlinesMap );
        
        wxFrame* frame1 = new wxFrame(bbGetWxParent(), wxID_ANY, wxT("ROI Application  -    Evaluation version, 23 Oct 2008 "), wxPoint(50,50), wxSize(800, 600) );
-       frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(""), wxPoint(50,50), wxSize(800, 600) ); 
+       frame = new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600) ); 
        frame1->CreateStatusBar();
 
+
        wxAuiNotebook * parent = frame->createNotebook();
 
-       OutlineModelManager             * modelManager                          = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(),  _builder->getContourEnv() );
+       OutlineModelManager * modelManager   = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(),  _builder->getContourEnv() );
 
-       wxInstantChooserPanel   * instantPanel                          = new wxInstantChooserPanel( parent, "Instant Chooser", true );
-       ImageSourceThing                * imageSource = modelManager->getImageSourceThingByKeyName( "Source Image 1" );
-       wxContourViewPanel              * theViewPanel                          = new wxContourViewPanel( imageSource->getSourceImage(), parent );      
+        std::string xxx1("Instant Chooser");
+       wxInstantChooserPanel * instantPanel = new wxInstantChooserPanel( parent, 
+         xxx1, 
+         true );
+       //ImageSourceThing * imageSource       = modelManager->getImageSourceThingByKeyName( wxT("Source Image 1") );
+       std::string xxx2("Source Image 1");
+       ImageSourceThing * imageSource       = modelManager->getImageSourceThingByKeyName( xxx2);
+       
+       wxContourViewPanel * theViewPanel    = new wxContourViewPanel( imageSource->getSourceImage(), parent ); 
        
        eventHandler = new wxContourEventHandler();
        eventHandler->setModelManager( modelManager );
@@ -82,7 +89,7 @@ void nDimensions::CreateWidget()
        successConfiuration &= frame->configurePanels( parent );
 
 
-       interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler, s+"/Icons");
+       //interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler, s+"/Icons");
 
    bbSetOutputWidget( frame ); 
 
index 8540218..1a18aa3 100644 (file)
@@ -78,4 +78,6 @@ private:
        
 
 };
-#endif // __wxContour_MenuBar_HEADER_FILE__
\ No newline at end of file
+#endif // __wxContour_MenuBar_HEADER_FILE__
+ 
+ 
index 7110e43..31ccd72 100644 (file)
@@ -35,7 +35,6 @@
 
 //------------------------------------------------------------------------------------------------------------
 // Methods
-//------------------------------------------------------------------------------------------------------------
-
-       
-       
\ No newline at end of file
+//--------------------------------------------------------------------------------------------
+ 
+  
index 2085a22..1e9b2a7 100644 (file)
@@ -26,7 +26,7 @@ public:
        /*
        * Destroys the command
        */
-       ~CommandObject( );
+       virtual ~CommandObject( );
 //------------------------------------------------------------------------------------------------------------
 // Methods
 //------------------------------------------------------------------------------------------------------------
index 7a0d620..4e48893 100644 (file)
@@ -22,7 +22,7 @@ public:
 
        ComposedCommand( );
 
-       ~ComposedCommand( );
+       virtual ~ComposedCommand( );
 //------------------------------------------------------------------------------------------------------------
 // Methods
 //------------------------------------------------------------------------------------------------------------
index bc609a0..8a21ab4 100644 (file)
@@ -26,7 +26,7 @@ public:
        /*
        * Destroys the command
        */
-       ~ExecutableCommand( );
+       virtual ~ExecutableCommand( );
 //------------------------------------------------------------------------------------------------------------
 // Methods
 //------------------------------------------------------------------------------------------------------------
index 4c7763a..dcf3185 100644 (file)
@@ -16,6 +16,7 @@ class ICommandsUser{
 // Constructors & Destructors
 //------------------------------------------------------------------------------------------------------------
 public:
+   virtual ~ICommandsUser() {};
 
        
 //------------------------------------------------------------------------------------------------------------