if(isOverPort==false)
{
- _worldState=NOTHING_HAPPENS;
- //int lastId = _controllers.size()-1;
-//EED2Oct2010 GConnectorController *connector = (GConnectorController*)_controllers[_controllers.size()-1];
- GConnectorController *connector = (GConnectorController*)_controllers[_idConnectionInCreation];
-
- connector->removeFromScene();
- unregisterController(connector);
- _controllers.erase(_controllers.size()-1);
-
- for(it = _controllers.begin(); it != _controllers.end(); ++it)
- {
- GObjectController *desc = it->second;
- desc->SetActive(true);
- desc->getView()->setState(NOTHING_HAPPENS);
- desc->getModel()->notifyObservers(_idManager);
- } // for
+ CancelConnection();
+ UnSelectBlackBoxes();
} // isOverPort
} else { //_worldState
}
//=========================================================================
-
- bool wxVtkSceneManager::OnRightButtonUp()
+ void wxVtkSceneManager::CancelConnection()
{
if(_worldState==INIT_CREATION_CONTOUR)
{
_worldState=NOTHING_HAPPENS;
//int lastId = _controllers.size()-1;
-
+
GConnectorController *connector = (GConnectorController*)_controllers[_idConnectionInCreation];
connector->removeFromScene();
unregisterController(connector);
_controllers.erase(_idConnectionInCreation);
-
+
std::map<int, GObjectController*>::iterator it;
for(it = _controllers.begin(); it != _controllers.end(); ++it)
{
desc->SetActive(true);
desc->getView()->setState(NOTHING_HAPPENS);
desc->getModel()->notifyObservers(_idManager);
- }
- }
-
+ } // for
+ }// if
+ }
+
+
+ //=========================================================================
- for (int i = 0; i < (int)_selectedObjects.size(); i++)
+ bool wxVtkSceneManager::OnRightButtonUp()
+ {
+ if(_worldState==INIT_CREATION_CONTOUR)
{
- int id = _selectedObjects[i];
- GObjectController* cont = _controllers[id];
- cont->SetActive(true);
- cont->getView()->setState(NOTHING_HAPPENS);
- cont->getModel()->notifyObservers(_idManager);
+ CancelConnection();
}
-
- _selectedObjects.clear();
-
+ UnSelectBlackBoxes();
return true;
}