#include "HYDROGUI_ImportObstacleFromFileOp.h"
-#include "HYDROGUI_ObstacleDlg.h"
+#include "HYDROGUI_GeomObjectDlg.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
HYDROGUI_Operation::startOperation();
// Get panel
- HYDROGUI_ObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_ObstacleDlg*>( inputPanel() );
+ HYDROGUI_GeomObjectDlg* aPanel = ::qobject_cast<HYDROGUI_GeomObjectDlg*>( inputPanel() );
if ( aPanel ) {
// Reset the panel state
aPanel->reset();
// Pass the existing obstacle names to the panel
- QStringList anObstacles =
+ QStringList anObstacleNames =
HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_OBSTACLE );
- aPanel->setObstacleNames( anObstacles );
+ aPanel->setObjectNames( anObstacleNames );
} else {
myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
myFileDlg->setWindowTitle( getName() );
Handle(HYDROData_Obstacle) anObstacle;
// Get panel
- HYDROGUI_ObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_ObstacleDlg*>( inputPanel() );
+ HYDROGUI_GeomObjectDlg* aPanel = ::qobject_cast<HYDROGUI_GeomObjectDlg*>( inputPanel() );
if ( aPanel ) {
// Get file name and obstacle name defined by the user
aFileName = aPanel->getFileName();
- QString anEditedName = aPanel->getEditedObstacleName().simplified();
+ QString anEditedName = aPanel->getEditedObjectName().simplified();
// Get obstacle to edit
if ( !anEditedName.isEmpty() ) {
}
// Check obstacle name
- anObstacleName = aPanel->getObstacleName().simplified();
+ anObstacleName = aPanel->getObjectName().simplified();
if ( anObstacleName.isEmpty() ) {
theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
return false;
anObstacle->SetName( anObstacleName );
}
+ anObstacle->Update();
+
// Set operation status
anIsOk = true;
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;;
{
HYDROGUI_InputPanel* aPanel = 0;
if ( myIsToShowPanel ) {
- aPanel = new HYDROGUI_ObstacleDlg( module(), getName(), true );
+ aPanel = new HYDROGUI_GeomObjectDlg( module(), getName(),
+ tr( "DEFAULT_OBSTACLE_NAME" ), true );
}
return aPanel;