From: eduardo.davila@creatis.insa-lyon.fr Date: Tue, 11 Feb 2025 14:40:59 +0000 (+0100) Subject: 3399 version X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ab37c1be84e03a19b5cb4c6ffbf46137e0302c9a;p=creaContours.git 3399 version --- diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx index c484a8b..907c15b 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx @@ -672,7 +672,7 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string if( iter->first.compare( theExistingObjectsToSelect[i] ) ) { viewer->SelectAllPoints( true ); - viewer->SelectPosibleContour( true ); + viewer->SelectPossibleContour( true ); selected = true; theExistingObjectsToSelect.erase( iterIN ); } @@ -693,7 +693,7 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string viewer->SetSelected( true ); /*viewer->SelectAllPoints( true ); - viewer->SelectPosibleContour( true );*/ + viewer->SelectPossibleContour( true );*/ iter++; } @@ -882,13 +882,13 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string control->SetActive( true ); foundOne = control->OnMouseMove(); - foundOne &= viewer->GetPosibleSelected(); + foundOne &= viewer->GetPossibleSelected(); if ( !foundOne && singleMoving ) { control->SetActive( false ); // _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( control ); - control->SetPosibleToMove( false ); + control->SetPossibleToMove( false ); } else { @@ -901,7 +901,7 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string _lastInteractionName = iter->first; viewer->UpdateColorActor(); - control->SetPosibleToMove( true ); + control->SetPossibleToMove( true ); // viewer->AddCompleteContourActor(); } iter++; @@ -942,11 +942,11 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string { if( _lastInteraction!=NULL && !_toIncludeAtInteractionGroup ) { - if( _lastInteraction->getControler()->GetIfCompleteCreation() && !_lastInteraction->getControler()->IsEditable()&& !_lastInteraction->getViewer()->GetPosibleSelected() ) + if( _lastInteraction->getControler()->GetIfCompleteCreation() && !_lastInteraction->getControler()->IsEditable()&& !_lastInteraction->getViewer()->GetPossibleSelected() ) { _lastInteraction->getControler()->SetEditable( false ); _lastInteraction->getControler()->SetActive( false ); - _lastInteraction->getControler()->SetPosibleToMove( false ); + _lastInteraction->getControler()->SetPossibleToMove( false ); _lastInteraction->getViewer()->Refresh(); _lastInteraction=NULL; } @@ -1043,10 +1043,10 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string if(_lastInteraction!=NULL && !_toIncludeAtInteractionGroup) { manualContourBaseControler * control = _lastInteraction->getControler(); - //_lastInteraction->getControler()->SetPosibleToMove( false ); + //_lastInteraction->getControler()->SetPossibleToMove( false ); control->SetActive( false ); control->SetEditable( false ); - control->SetPosibleToMove( false ); + control->SetPossibleToMove( false ); // _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( control ); _lastInteraction->getViewer()->Refresh(); this->_vtkInteractorStyleBaseView->SetRefresh_waiting(); @@ -1109,7 +1109,7 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string { _lastInteraction->getControler()->SetEditable( false ); _lastInteraction->getControler()->SetActive( false ); - _lastInteraction->getControler()->SetPosibleToMove( false ); + _lastInteraction->getControler()->SetPossibleToMove( false ); _lastInteraction->getViewer()->Refresh(); } std::map::iterator iter = _workingGroup->begin(); @@ -1119,7 +1119,7 @@ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string manualContourBaseControler * control = iter->second->getControler(); control->SetEditable( false ); control->SetActive( false ); - control->SetPosibleToMove( false ); + control->SetPossibleToMove( false ); iter->second->getViewer()->Refresh(); iter++; diff --git a/lib/kernel_ManagerContour_NDimensions/CommandsHandler.cxx b/lib/kernel_ManagerContour_NDimensions/CommandsHandler.cxx index 402c582..e50dcc2 100644 --- a/lib/kernel_ManagerContour_NDimensions/CommandsHandler.cxx +++ b/lib/kernel_ManagerContour_NDimensions/CommandsHandler.cxx @@ -46,8 +46,8 @@ redo_actions = new CommandsRegisterStructure(); unDo_actions = new CommandsRegisterStructure(); - posibleREDO = false; - posibleUNDO = false; + possibleREDO = false; + possibleUNDO = false; isLastREDO_executed = true; isLastUNDO_executed = false; @@ -69,7 +69,7 @@ /* * Registers in the vectors of doneActions and unDoActions the given commands that all ready corresponds each other to the inverse of the otherone. - * If is the first registered action notifies the posibleUNDO avaliability. + * If is the first registered action notifies the possibleUNDO avaliability. * @param doneAction Is the action to register in the redo_actions vector. * @param unDoAction Is the action to register in the unDo_actions vector. */ @@ -81,8 +81,8 @@ redo_actions->registerCommand(doneAction); unDo_actions->registerCommand(unDoAction); - posibleREDO = false; - posibleUNDO = true; + possibleREDO = false; + possibleUNDO = true; isLastREDO_executed = true; isLastUNDO_executed = false; @@ -95,8 +95,8 @@ */ bool CommandsHandler :: undo() { - bool executed = posibleUNDO; - if( posibleUNDO ) + bool executed = possibleUNDO; + if( possibleUNDO ) { validateOperationsAvaliability();//para borrar!!!!!!!!-----------------------------*********************--------------------- executed = theWorksSpaceBoss->executeCommand(getActual_UNDO(), true); @@ -136,12 +136,12 @@ */ bool CommandsHandler :: redo() { - bool executed = posibleREDO; - if( posibleREDO ) + bool executed = possibleREDO; + if( possibleREDO ) { validateOperationsAvaliability();//para borrar!!!!!!!!-----------------------------*********************--------------------- isLastREDO_executed = true; - //isLastUNDO_executed = false; // Posible needed + //isLastUNDO_executed = false; // Possible needed executed = theWorksSpaceBoss->executeCommand(getActual_REDO(), true); if (!unDo_actions->hasActualPrevious() && !redo_actions->hasActualPrevious()) { @@ -182,39 +182,39 @@ } /* - * Notitify if posibleREDO is posible or not. - * @return Returns the state of posibleUNDO + * Notitify if possibleREDO is possible or not. + * @return Returns the state of possibleUNDO */ - bool CommandsHandler :: isPosibleUNDO() + bool CommandsHandler :: isPossibleUNDO() { - return posibleUNDO; + return possibleUNDO; } /* - * Indicates if posibleUNDO is posible or not. - * @return Returns the state of posibleREDO + * Indicates if possibleUNDO is possible or not. + * @return Returns the state of possibleREDO */ - bool CommandsHandler :: isPosibleREDO() + bool CommandsHandler :: isPossibleREDO() { - return posibleREDO; + return possibleREDO; } /* - * Sets posibleREDO state. - * @param UNDOstate The state of posibleUNDO to set + * Sets possibleREDO state. + * @param UNDOstate The state of possibleUNDO to set */ - void CommandsHandler :: setPosibleUNDO( bool UNDOstate ) + void CommandsHandler :: setPossibleUNDO( bool UNDOstate ) { - posibleUNDO = UNDOstate; + possibleUNDO = UNDOstate; } /* - * Sets posibleUNDO state. - * @param REDOstate The state of posibleREDO to set + * Sets possibleUNDO state. + * @param REDOstate The state of possibleREDO to set */ - void CommandsHandler :: setPosibleREDO( bool REDOstate ) + void CommandsHandler :: setPossibleREDO( bool REDOstate ) { - posibleREDO = REDOstate; + possibleREDO = REDOstate; } /* @@ -283,15 +283,15 @@ } /* - * Validates if it is posible of not to do UNDO and/or REDO and sets the corresponding values + * Validates if it is possible of not to do UNDO and/or REDO and sets the corresponding values */ void CommandsHandler :: validateOperationsAvaliability() { - posibleREDO = (redo_actions->hasActualNext() && unDo_actions->hasActualNext() )? true : + possibleREDO = (redo_actions->hasActualNext() && unDo_actions->hasActualNext() )? true : ( (!redo_actions->hasActualNext()&& unDo_actions->hasActualNext() ) ? true : ( !unDo_actions->hasActualNext() && !redo_actions->hasActualNext() )? false : true && !isLastREDO_executed ); - posibleUNDO = (redo_actions->hasActualPrevious() && unDo_actions->hasActualPrevious() )? true : + possibleUNDO = (redo_actions->hasActualPrevious() && unDo_actions->hasActualPrevious() )? true : ( (!unDo_actions->hasActualPrevious()&& redo_actions->hasActualPrevious() ) ? true : ( !unDo_actions->hasActualPrevious() && !redo_actions->hasActualPrevious() )? false : true && !isLastUNDO_executed ); diff --git a/lib/kernel_ManagerContour_NDimensions/CommandsHandler.h b/lib/kernel_ManagerContour_NDimensions/CommandsHandler.h index 05166ea..14bec62 100644 --- a/lib/kernel_ManagerContour_NDimensions/CommandsHandler.h +++ b/lib/kernel_ManagerContour_NDimensions/CommandsHandler.h @@ -60,7 +60,7 @@ public: /* * Registers in the vectors of doneActions and unDoActions the given commands that all ready corresponds each other to the inverse of the otherone. - * If is the first registered action notifies the posibleUNDO avaliability. + * If is the first registered action notifies the possibleUNDO avaliability. * @param doneAction Is the action to register in the redo_actions vector. * @param unDoAction Is the action to register in the unDo_actions vector. */ @@ -79,28 +79,28 @@ public: bool redo(); /* - * Notitify if posibleREDO is posible or not. - * @return Returns the state of posibleUNDO + * Notitify if possibleREDO is possible or not. + * @return Returns the state of possibleUNDO */ - bool isPosibleUNDO(); + bool isPossibleUNDO(); /* - * Indicates if posibleUNDO is posible or not. - * @return Returns the state of posibleREDO + * Indicates if possibleUNDO is possible or not. + * @return Returns the state of possibleREDO */ - bool isPosibleREDO(); + bool isPossibleREDO(); /* - * Sets posibleREDO state. - * @param UNDOstate The state of posibleUNDO to set + * Sets possibleREDO state. + * @param UNDOstate The state of possibleUNDO to set */ - void setPosibleUNDO(bool UNDOstate); + void setPossibleUNDO(bool UNDOstate); /* - * Sets posibleUNDO state. - * @param REDOstate The state of posibleREDO to set + * Sets possibleUNDO state. + * @param REDOstate The state of possibleREDO to set */ - void setPosibleREDO(bool REDOstate); + void setPossibleREDO(bool REDOstate); /* * Clear the registered actions in the DO and UNDO vectors. @@ -139,7 +139,7 @@ public: /* - * Validates if it is posible of not to do UNDO and/or REDO and sets the corresponding values + * Validates if it is possible of not to do UNDO and/or REDO and sets the corresponding values */ void validateOperationsAvaliability(); @@ -162,9 +162,9 @@ private: CommandsRegisterStructure * unDo_actions; - bool posibleUNDO; + bool possibleUNDO; - bool posibleREDO; + bool possibleREDO; ICommandsUser * theWorksSpaceBoss; diff --git a/lib/kernel_ManagerContour_NDimensions/ContourThing.cxx b/lib/kernel_ManagerContour_NDimensions/ContourThing.cxx index 6c1a4cc..d670f10 100644 --- a/lib/kernel_ManagerContour_NDimensions/ContourThing.cxx +++ b/lib/kernel_ManagerContour_NDimensions/ContourThing.cxx @@ -85,7 +85,7 @@ } /* - * Executes the given command if posible and returns is posible or not + * Executes the given command if possible and returns is possible or not * @param theSpecificCommand Is the specific command to execute * @return Returns if the command was successfuly executed */ diff --git a/lib/kernel_ManagerContour_NDimensions/ContourThing.h b/lib/kernel_ManagerContour_NDimensions/ContourThing.h index 37eb8e0..14e8e32 100644 --- a/lib/kernel_ManagerContour_NDimensions/ContourThing.h +++ b/lib/kernel_ManagerContour_NDimensions/ContourThing.h @@ -73,7 +73,7 @@ public: void setModel(manualBaseModel * model); /* - * Executes the given command if posible and returns is posible or not + * Executes the given command if possible and returns is possible or not * @param theSpecificCommand Is the specific command to execute * @return Returns if the command was successfuly executed */ diff --git a/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.cxx b/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.cxx index 63578eb..ada3ada 100644 --- a/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.cxx +++ b/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.cxx @@ -188,7 +188,7 @@ /* * Calls the registration of the given commands (do, undo) in the commands handler - * If is the first registered command notifies the posibleUNDO avaliability. + * If is the first registered command notifies the possibleUNDO avaliability. * @param doCommand Is the command to register in the redo_commands vector. * @param unDoCommand Is the command to register in the unDo_commands vector. */ diff --git a/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.h b/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.h index 7c8293c..75809f5 100644 --- a/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.h +++ b/lib/kernel_ManagerContour_NDimensions/ContourWorkspace.h @@ -146,7 +146,7 @@ public: /* * Calls the registration of the given commands (do, undo) in the commands handler - * If is the first registered command notifies the posibleUNDO avaliability. + * If is the first registered command notifies the possibleUNDO avaliability. * @param doCommand Is the command to register in the redo_commands vector. * @param unDoCommand Is the command to register in the unDo_commands vector. */ diff --git a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx index 9de974e..088129f 100644 --- a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx +++ b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx @@ -196,7 +196,7 @@ /* * Add a concept to all the environments * @param theConceptName Is the name of the new concept - * @param conceptSize Is the size of the concept, that represent the ammount of concept posible instances + * @param conceptSize Is the size of the concept, that represent the ammount of concept possible instances * @return Returns true if successful insert of concept, false otherwise */ bool OutlineModelManager :: addUserConcept(std::string theConceptName, int conceptSize) diff --git a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.h b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.h index 7f9174d..b404c28 100644 --- a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.h +++ b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.h @@ -123,7 +123,7 @@ public: /* * Add a concept to all the environments * @param theConceptName Is the name of the new concept - * @param conceptSize Is the size of the concept, that represent the ammount of concept posible instances + * @param conceptSize Is the size of the concept, that represent the ammount of concept possible instances * @return Returns true if successful insert of concept, false otherwise */ bool addUserConcept( std::string theConceptName, int conceptSize ); diff --git a/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.cxx b/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.cxx index c61cf69..b781140 100644 --- a/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.cxx +++ b/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.cxx @@ -96,18 +96,18 @@ } /* - * Updates the maximum value of a key thing if necesary (posibleMax>theMaxOfKeyThing). If the key thing doesn't exist nothing is done. + * Updates the maximum value of a key thing if necesary (possibleMax>theMaxOfKeyThing). If the key thing doesn't exist nothing is done. * @param theName Is the name of the keyThing to update. - * @param posibleMax Is the number that corresponds to a posible max value of the keyThing to update. + * @param possibleMax Is the number that corresponds to a possible max value of the keyThing to update. */ - void PrefixMaxKeyGenerator :: updateMaxTo( std::string theName, int posibleMax ) + void PrefixMaxKeyGenerator :: updateMaxTo( std::string theName, int possibleMax ) { std::map::iterator iterP = keyThings.find(theName); if ( iterP != keyThings.end() ) { int max = (iterP->second).getValue(); - if ( max < posibleMax ) - (iterP->second).setValue(posibleMax); + if ( max < possibleMax ) + (iterP->second).setValue(possibleMax); } } @@ -136,11 +136,11 @@ /* * Generates a (std::string) key for a given keyThing and updates the max value of it if necesary. If the key thing doesn't exist nothing is done. * @param theName Is the name of the keyThing to search. - * @param posibleMax Is the number that corresponds to a posible max value of the keyThing to update. + * @param possibleMax Is the number that corresponds to a possible max value of the keyThing to update. * @param theInputString Is string to load the generated key formed like * @return Returns true if the key was generated successfully. (If theName is an existent keyThing) */ - bool PrefixMaxKeyGenerator :: generateKeyOf( std::string theName, int posibleMax, std::string &theInputString ) + bool PrefixMaxKeyGenerator :: generateKeyOf( std::string theName, int possibleMax, std::string &theInputString ) { theInputString = ""; std::map::iterator iterP = keyThings.find(theName); @@ -149,9 +149,9 @@ KeyThing kthing = (iterP->second); int max = kthing.getValue(); - if ( max < posibleMax ) + if ( max < possibleMax ) { - kthing.setValue(posibleMax); + kthing.setValue(possibleMax); } diff --git a/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.h b/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.h index bfd61f1..5f079b7 100644 --- a/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.h +++ b/lib/kernel_ManagerContour_NDimensions/PrefixMaxKeyGenerator.h @@ -85,11 +85,11 @@ public: bool existsKeyThing( std::string theName ); /* - * Updates the maximum value of a key thing if necesary (posibleMax>theMaxOfKeyThing). If the key thing doesn't exist nothing is done. + * Updates the maximum value of a key thing if necesary (possibleMax>theMaxOfKeyThing). If the key thing doesn't exist nothing is done. * @param theName Is the name of the keyThing to update. - * @param posibleMax Is the number that corresponds to a posible max value of the keyThing to update. + * @param possibleMax Is the number that corresponds to a possible max value of the keyThing to update. */ - void updateMaxTo( std::string theName, int posibleMax ); + void updateMaxTo( std::string theName, int possibleMax ); /* * Generates a (std::string) key for a given keyThing. If the key thing doesn't exist nothing is done and returns false. @@ -102,11 +102,11 @@ public: /* * Generates a (std::string) key for a given keyThing and updates the max value of it if necesary. If the key thing doesn't exist nothing is done. * @param theName Is the name of the keyThing to search. - * @param posibleMax Is the number that corresponds to a posible max value of the keyThing to update. + * @param possibleMax Is the number that corresponds to a possible max value of the keyThing to update. * @param theInputString Is string to load the generated key formed like * @return Returns true if the key was generated successfully. (If theName is an existent keyThing) */ - bool generateKeyOf( std::string theName, int posibleMax, std::string &theInputString ); + bool generateKeyOf( std::string theName, int possibleMax, std::string &theInputString ); /* * Gets the prefix of a specific keyThing identified with the name in the parameter, if the key thing doesn't exists return false.