Remove some warnings

diff --git a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
index d566f3e76b268b0fcc6804cd0a768d958757700b..ff8516bb836f8a744de9bb5864afd879c940938a 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
@@ -33,8 +33,8 @@ void interfEditMenu::initButtons(wxEvtHandler* evtHandler) {
     this->addButtons(path, nom);
        this->setVectorFunction(funct);
 
-       this->setButtonName(0, wxContour_ActionCommnadsID::COPY_TOOL);
-       this->setButtonName(1, wxContour_ActionCommnadsID::PASTE_TOOL);
+       this->setButtonName(0, wxContour_ActionComman\13dsID::COPY_TOOL);
+       this->setButtonName(1, wxContour_ActionComman\13dsID::PASTE_TOOL);
        this->setButtonName(2, '-');
        this->setButtonName(3, '-');
 

diff --git a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
index 4884a6ac9e80b2d0b9a796554be8c66aef073c5c..ddf20f993059ce07b9688649b5a584a45314c6d6 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
@@ -24,8 +24,8 @@ void interfIOMenu::initButtons(wxEvtHandler* evtHandler) {
        this->addButtons(path, nom);
        this->setVectorFunction(funct);
 
-       this->setButtonName(0, wxContour_ActionCommnadsID::OPEN_TOOL);
-       this->setButtonName(1, wxContour_ActionCommnadsID::SAVE_TOOL);
+       this->setButtonName(0, wxContour_ActionCommandsID::OPEN_TOOL);
+       this->setButtonName(1, wxContour_ActionCommandsID::SAVE_TOOL);
 
        this->connectEvents(evtHandler);
 

diff --git a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx
index 66712690984f6bfd4f8fba1dc450c7c9bc11fc6c..d92b5a5737e154b36b3cf9e6d9d97834543d1b9f 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx
@@ -42,7 +42,7 @@ void interfToolsMenu::initButtons(wxEvtHandler* evtHandler) {
        this->addButtons(path, nom);    
        this->setVectorFunction(funct);
 
-       this->setButtonName(0, wxContour_ActionCommnadsID::CHANGE_TOOL);
+       this->setButtonName(0, wxContour_ActionCommandsID::CHANGE_TOOL);
 
        this->connectEvents(evtHandler);
           
@@ -149,4 +149,4 @@ void interfToolsMenu::hideAxis(){
                axisshown = false;
                contourevent->showAxis(axisshown);
        }
-}
\ No newline at end of file
+}

diff --git a/lib/Interface_ManagerContour_NDimensions/__wxContourEventHandler.cxx__ b/lib/Interface_ManagerContour_NDimensions/__wxContourEventHandler.cxx__
index a78be789d7753f4053e8dcd6a0cae7553a24965b..0a2ad3bc8c943eae716e651df392ca25ee2c6d7e 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/__wxContourEventHandler.cxx__
+++ b/lib/Interface_ManagerContour_NDimensions/__wxContourEventHandler.cxx__
@@ -84,7 +84,7 @@ digraph example_0 {
 // Includes
 //------------------------------------------------------------------------------------------------------------
 
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
 #include "NameWrapper.h"
 #include "ConceptDataWrap.h"
 #include "OutlineGroup.h"
@@ -1791,7 +1791,7 @@ myfile.close();
                std::vector<int> tempVector;
                _instantPanel->getInstant( tempVector );
         _performingOperation->reset();
-               _performingOperation->setStartCommand( (char)wxContour_ActionCommnadsID::COPY_TOOL );
+               _performingOperation->setStartCommand( (char)wxContour_ActionCommandsID::COPY_TOOL );
                _performingOperation->setStartOperationInstantVector( tempVector );
                _performingOperation->setKeyNamesOperationElems( keyNamesVector );
 
@@ -1800,7 +1800,7 @@ myfile.close();
        void wxContourEventHandler :: onPasteOutlines( )
        {
                char theStartCommand = _performingOperation->getStartCommand();
-               if (  theStartCommand == wxContour_ActionCommnadsID::COPY_TOOL )
+               if (  theStartCommand == wxContour_ActionCommandsID::COPY_TOOL )
                {
                        std::vector<int> tempVector;
                        _instantPanel->getInstant( tempVector );
@@ -2638,35 +2638,35 @@ void wxContourEventHandler::OnInterpolation(wxCommandEvent& event)
        {
                std::vector<std::string> currentSelection = _sceneManager->getSelectedObjects();
                int elementsSelected = currentSelection.size();
-               if( toolCommand == (wxContour_ActionCommnadsID::CREATE_TOOL) )
+               if( toolCommand == (wxContour_ActionCommandsID::CREATE_TOOL) )
                {
                        onCreateContourFrame();
                }
-               if( toolCommand == (wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY) )
+               if( toolCommand == (wxContour_ActionCommandsID::CREATE_CONTOUR_KEY) )
                {
                        createContour();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::DELETE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::DELETE_TOOL )
                {
                        onDeleteFrame( );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::DELETE_KEY )
+               else if( toolCommand == wxContour_ActionCommandsID::DELETE_KEY )
                {
                        deleteContours( currentSelection );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SAVE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SAVE_TOOL )
                {
                        saveFileWithContours(  );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SAVE_KEY )
+               else if( toolCommand == wxContour_ActionCommandsID::SAVE_KEY )
                {
                        saveFileWithContoursAutomatique(  );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::OPEN_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::OPEN_TOOL )
                {
                        openFileWithContours(  );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::CHANGE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::CHANGE_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
@@ -2674,69 +2674,69 @@ void wxContourEventHandler::OnInterpolation(wxCommandEvent& event)
                        }
 
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::HIDE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::HIDE_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onHideOutlines( currentSelection );
                        }                       
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SHOW_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SHOW_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onShowOutlines( currentSelection );
                        }
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::COPY_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::COPY_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onCopyOutlines( currentSelection );
                        }
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::PASTE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::PASTE_TOOL )
                {
                        onPasteOutlines(  );                    
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SPREAD_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SPREAD_TOOL )
                {
                                onSpread();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::AUTOMATIQUESEGMENTATION_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL )
                {
                        onAutomatiqueSegmentation(  );                  
                }
 
-               else if( toolCommand == wxContour_ActionCommnadsID::SELECT_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SELECT_TOOL )
                {
                        onSelectOutlines( currentSelection );
                        
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::EDIT_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::EDIT_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onEditOutlines( currentSelection );
                        }
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::UNDO_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::UNDO_TOOL )
                {
                        onUNDO();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::REDO_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::REDO_TOOL )
                {
                        onREDO();
                }               
-               else if( toolCommand == wxContour_ActionCommnadsID::INFORMATIONCONTOUR_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL )
                {
                        onInformationContourFrame();
                }               
-               else if( toolCommand == wxContour_ActionCommnadsID::INTERFACECONFIGURATION_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL )
                {
                        onInterfaceConfigurationFrame();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::TEST_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::TEST_TOOL )
                {
                        onInterfaceTestFrame();
                }               

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
index 2f1083117b6e2236fda37977a617ce18c1343133..36ff6c8d937276ac184139905641c80302a58f6f 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
@@ -84,7 +84,7 @@ digraph example_0 {
 // Includes
 //------------------------------------------------------------------------------------------------------------
 
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
 #include "NameWrapper.h"
 #include "ConceptDataWrap.h"
 #include "OutlineGroup.h"
@@ -2068,7 +2068,7 @@ myfile.close();
                std::vector<int> tempVector;
                _instantPanel->getInstant( tempVector );
         _performingOperation->reset();
-               _performingOperation->setStartCommand( (char)wxContour_ActionCommnadsID::COPY_TOOL );
+               _performingOperation->setStartCommand( (char)wxContour_ActionCommandsID::COPY_TOOL );
                _performingOperation->setStartOperationInstantVector( tempVector );
                _performingOperation->setKeyNamesOperationElems( keyNamesVector );
 
@@ -2077,7 +2077,7 @@ myfile.close();
        void wxContourEventHandler :: onPasteOutlines( )
        {
                char theStartCommand = _performingOperation->getStartCommand();
-               if (  theStartCommand == wxContour_ActionCommnadsID::COPY_TOOL )
+               if (  theStartCommand == wxContour_ActionCommandsID::COPY_TOOL )
                {
                        //JCP 20-10-08 Undo redo implementation
                        saveState();
@@ -3101,35 +3101,35 @@ void wxContourEventHandler::OnInterpolation(wxCommandEvent& event)
        {
                std::vector<std::string> currentSelection = _sceneManager->getSelectedObjects();
                int elementsSelected = currentSelection.size();
-               if( toolCommand == (wxContour_ActionCommnadsID::CREATE_TOOL) )
+               if( toolCommand == (wxContour_ActionCommandsID::CREATE_TOOL) )
                {
                        onCreateContourFrame();
                }
-               if( toolCommand == (wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY) )
+               if( toolCommand == (wxContour_ActionCommandsID::CREATE_CONTOUR_KEY) )
                {
                        createContour();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::DELETE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::DELETE_TOOL )
                {
                        onDeleteFrame( );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::DELETE_KEY )
+               else if( toolCommand == wxContour_ActionCommandsID::DELETE_KEY )
                {
                        deleteContours( currentSelection );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SAVE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SAVE_TOOL )
                {
                        saveFileWithContours(  );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SAVE_KEY )
+               else if( toolCommand == wxContour_ActionCommandsID::SAVE_KEY )
                {
                        saveFileWithContoursAutomatique(  );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::OPEN_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::OPEN_TOOL )
                {
                        openFileWithContours(  );
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::CHANGE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::CHANGE_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
@@ -3137,69 +3137,69 @@ void wxContourEventHandler::OnInterpolation(wxCommandEvent& event)
                        }
 
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::HIDE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::HIDE_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onHideOutlines( currentSelection );
                        }                       
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SHOW_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SHOW_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onShowOutlines( currentSelection );
                        }
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::COPY_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::COPY_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onCopyOutlines( currentSelection );
                        }
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::PASTE_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::PASTE_TOOL )
                {
                        onPasteOutlines(  );                    
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::SPREAD_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SPREAD_TOOL )
                {
                                onSpread();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::AUTOMATIQUESEGMENTATION_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL )
                {
                        onAutomatiqueSegmentation(  );                  
                }
 
-               else if( toolCommand == wxContour_ActionCommnadsID::SELECT_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::SELECT_TOOL )
                {
                        onSelectOutlines( currentSelection );
                        
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::EDIT_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::EDIT_TOOL )
                {
                        if ( elementsSelected >= 1 )
                        {
                                onEditOutlines( currentSelection );
                        }
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::UNDO_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::UNDO_TOOL )
                {
                        onUNDO();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::REDO_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::REDO_TOOL )
                {
                        onREDO();
                }               
-               else if( toolCommand == wxContour_ActionCommnadsID::INFORMATIONCONTOUR_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL )
                {
                        onInformationContourFrame();
                }               
-               else if( toolCommand == wxContour_ActionCommnadsID::INTERFACECONFIGURATION_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL )
                {
                        onInterfaceConfigurationFrame();
                }
-               else if( toolCommand == wxContour_ActionCommnadsID::TEST_TOOL )
+               else if( toolCommand == wxContour_ActionCommandsID::TEST_TOOL )
                {
                        onInterfaceTestFrame();
                }               
@@ -3678,4 +3678,4 @@ void wxContourEventHandler :: onREDO()
                        _InformationContourFrame->Show(false);
                }               
        }
-//JCP 21 - 10 - 09
\ No newline at end of file
+//JCP 21 - 10 - 09

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h
index eaabde7a4f5e7d420c87a64f5b17a178e40a7b75..61b122a1363484cdb96dc65acd01951d2c31f2b3 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.h
@@ -32,7 +32,7 @@
 #include "wxContour_StandardToolsPanel.h"
 #include "wxContour_EdtionToolsPanel.h"
 #include "wxContour_ListViewPanel.h"
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
 #include "PerformingOperation.h"
 
 #include "ContourThing.h"
@@ -351,4 +351,4 @@ private:
        void                                            saveState();
        void                                            loadState(std::string filename);
 };
-#endif // __wxContourEventHandler_HEADER_FILE__
\ No newline at end of file
+#endif // __wxContourEventHandler_HEADER_FILE__

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommnadsID.h b/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommandsID.h
similarity index 91%
rename from lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommnadsID.h
rename to lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommandsID.h
index b837306016bc8f20ce37a21be0cd9effb162a9ed..aa03ac1fc92a59fe2c1d1ea18715622a9cd61c04 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommnadsID.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommandsID.h
@@ -1,5 +1,5 @@
-#ifndef __wxContour_ActionCommnadsID_h_INCLUDED_H__
-#define __wxContour_ActionCommnadsID_h_INCLUDED_H__
+#ifndef __wxContour_ActionCommandsID_h_INCLUDED_H__
+#define __wxContour_ActionCommandsID_h_INCLUDED_H__
 
 //---------------------------------------------------------------------------------------------------------
 // Includes
@@ -8,7 +8,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Class definition
 //------------------------------------------------------------------------------------------------------------
-class wxContour_ActionCommnadsID {
+class wxContour_ActionCommandsID {
 
        public:
 
@@ -44,4 +44,6 @@ class wxContour_ActionCommnadsID {
 
        
 };
-#endif // __wxContour_ActionCommnadsID_HEADER_FILE__
\ No newline at end of file
+#endif // __wxContour_ActionCommandsID_HEADER_FILE__
+ 
+ 

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx
index add11a022b026b7ce4e0671ab701763c74c5a5dd..a305d1dc206e74f38bf393d67334ccc59e122ddf 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx
@@ -13,7 +13,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------------------------------------
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
 
 #include "wx/toolbar.h"
 #include "wx/log.h"
@@ -36,79 +36,87 @@
        {
                //SetToolBitmapSize(wxSize(16,16));
                
-        _createContour_Button = new wxButton( this, -1, _T("+ New Contour"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::CREATE_TOOL );
+        _createContour_Button = new wxButton( this, 
+       -1, 
+       _T("+ New Contour"), 
+       wxDefaultPosition, 
+       wxDefaultSize, 
+       0, 
+       wxDefaultValidator, 
+       wxContour_ActionCommandsID::CREATE_TOOL );
+       
 //             _createContour_Button->SetToolTip(_T("CTRL-N"));
                Connect( _createContour_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _delete_Button = new wxButton( this, -1, _T("+ Delete"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::DELETE_TOOL );
+               _delete_Button = new wxButton( this, -1, _T("+ Delete"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::DELETE_TOOL );
                _delete_Button->SetToolTip(_T("BACK SPACE or DELETE key"));
                Connect( _delete_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
 /*             
-               _hideContour_Button = new wxButton( this, -1, "Hide Contour", wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::HIDE_TOOL );
+               _hideContour_Button = new wxButton( this, -1, "Hide Contour", wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::HIDE_TOOL );
                Connect( _hideContour_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _show_Button = new wxButton( this, -1, _T("Show"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SHOW_TOOL );
+               _show_Button = new wxButton( this, -1, _T("Show"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SHOW_TOOL );
                Connect( _show_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 */
-               _copy_Button = new wxButton( this, -1, _T("Copy"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::COPY_TOOL );
+               _copy_Button = new wxButton( this, -1, _T("Copy"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::COPY_TOOL );
                _copy_Button->SetToolTip(_T("CTRL-C"));
                Connect( _copy_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _paste_Button = new wxButton( this, -1, _T("Paste"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::PASTE_TOOL );
+               _paste_Button = new wxButton( this, -1, _T("Paste"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::PASTE_TOOL );
                _paste_Button->SetToolTip(_T("CTRL-V"));
                Connect( _paste_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _change_Button = new wxButton( this, -1, _T("    <-->  "), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::CHANGE_TOOL );
+               _change_Button = new wxButton( this, -1, _T("    <-->  "), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::CHANGE_TOOL );
                _change_Button->SetToolTip(_T("CTRL-K"));
                Connect( _change_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _save_Button = new wxButton( this, -1, _T("Save"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SAVE_TOOL );
+               _save_Button = new wxButton( this, -1, _T("Save"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::SAVE_TOOL );
                _save_Button->SetToolTip(_T("CTRL-S"));
                Connect( _save_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _open_Button = new wxButton( this, -1, _T("Open"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::OPEN_TOOL );
+               _open_Button = new wxButton( this, -1, _T("Open"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::OPEN_TOOL );
                _open_Button->SetToolTip(_T("CTRL-O"));
                Connect( _open_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
 
-               _spread_Button = new wxButton( this, -1, _T("+ Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SPREAD_TOOL );
+               _spread_Button = new wxButton( this, -1, _T("+ Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SPREAD_TOOL );
 //             _spread_Button->SetToolTip(_T("CTRL-XXXXXXX"));
                Connect( _spread_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _automatiqueSegmentation_Button = new wxButton( this, -1, _T("+ Segmentation"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::AUTOMATIQUESEGMENTATION_TOOL );
+               _automatiqueSegmentation_Button = new wxButton( this, -1, _T("+ Segmentation"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL );
 //             _automatiqueSegmentation_Button->SetToolTip(_T("CTRL-XXXXXXX"));
                Connect( _automatiqueSegmentation_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
 
-               _informationContour_Button = new wxButton( this, -1, _T("+ Information"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::INFORMATIONCONTOUR_TOOL );
+               _informationContour_Button = new wxButton( this, -1, _T("+ Information"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL );
 //             _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX"));
                Connect( _informationContour_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _interfaceConfiguration_Button = new wxButton( this, -1, _T("+ Configuration"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::INTERFACECONFIGURATION_TOOL );
+               _interfaceConfiguration_Button = new wxButton( this, -1, _T("+ Configuration"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL );
 //             _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX"));
                Connect( _interfaceConfiguration_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
 
 //Test button Methods A-B-C in  Juan Carlos Prieto 22-09-08
-               _interfaceTest_Button = new wxButton( this, -1, _T("+ Test"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::TEST_TOOL );
+               _interfaceTest_Button = new wxButton( this, -1, _T("+ Test"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::TEST_TOOL );
 //             _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX"));
                Connect( _interfaceTest_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
 
 /*
-               _spread_Button = new wxButton( this, -1, _T("Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SPREAD_TOOL );
+               _spread_Button = new wxButton( this, -1, _T("Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SPREAD_TOOL );
                Connect( _spread_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
-               _select_Button = new wxButton( this, -1, _T("Select"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SELECT_TOOL );
+               _select_Button = new wxButton( this, -1, _T("Select"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SELECT_TOOL );
                Connect( _select_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _edit_Button = new wxButton( this, -1, _T("Edit"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::EDIT_TOOL );
+               _edit_Button = new wxButton( this, -1, _T("Edit"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::EDIT_TOOL );
                Connect( _edit_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _undo_Button = new wxButton( this, -1, _T("Undo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::UNDO_TOOL );
+               _undo_Button = new wxButton( this, -1, _T("Undo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::UNDO_TOOL );
                Connect( _undo_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 
-               _redo_Button = new wxButton( this, -1, _T("Redo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::REDO_TOOL );
+               _redo_Button = new wxButton( this, -1, _T("Redo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::REDO_TOOL );
                Connect( _redo_Button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); 
 */
                wxFlexGridSizer * panelSizer = new wxFlexGridSizer(9);

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index ab12a96d29cc91c288422fe7953b654cc7136ce9..6f0ff37384dca4a28095563667b012464d18d99f 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -13,7 +13,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------------------------------------
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
 
 //------------------------------------------------------------------------------------------------------------
 // Generated events declaration and definition
@@ -674,27 +674,27 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
                        if ( _lastKeyCode == 3 && ctrlKey ) //'C' || 'c' 
                        {
-                               toolCommand = &(wxContour_ActionCommnadsID::COPY_TOOL);
+                               toolCommand = &(wxContour_ActionCommandsID::COPY_TOOL);
                        }
                        else if(  _lastKeyCode == 22 && ctrlKey ) //'V' || 'v' 
                        {
-                               toolCommand = &(wxContour_ActionCommnadsID::PASTE_TOOL);
+                               toolCommand = &(wxContour_ActionCommandsID::PASTE_TOOL);
                        }
                        else if(  _lastKeyCode == 8 || (_lastKeyCode==127) ) // Delete 
                        {
-                               toolCommand = &(wxContour_ActionCommnadsID::DELETE_KEY);
+                               toolCommand = &(wxContour_ActionCommandsID::DELETE_KEY);
                        }
                        else if(  _lastKeyCode == 14 && ctrlKey ) //'N' || 'n' 
                        {
-                               toolCommand = &(wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY);
+                               toolCommand = &(wxContour_ActionCommandsID::CREATE_CONTOUR_KEY);
                        }
                        else if(  _lastKeyCode == 15 && ctrlKey ) //'O' || 'o' 
                        {
-                               toolCommand = &(wxContour_ActionCommnadsID::OPEN_TOOL);
+                               toolCommand = &(wxContour_ActionCommandsID::OPEN_TOOL);
                        }
                        else if(  _lastKeyCode == 19 && ctrlKey ) //'S' || 's' 
                        {
-                               toolCommand = &(wxContour_ActionCommnadsID::SAVE_KEY);
+                               toolCommand = &(wxContour_ActionCommandsID::SAVE_KEY);
                        }
 
                        if ( toolCommand!=NULL )