-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "HYDROGUI_ImportObstacleFromFileOp.h"
-#include "HYDROGUI_ObstacleDlg.h"
-
+#include "HYDROGUI_GeomObjectDlg.h"
+#include <HYDROGUI_DataObject.h>
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.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()->application()->desktop(), true );
+ myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
myFileDlg->setWindowTitle( getName() );
myFileDlg->setFilter( tr("OBSTACLE_FILTER") );
if ( !lastUsedFilter.isEmpty() ) {
}
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
QString aFileName;
QString anObstacleName;
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() ) {
anObstacle = Handle(HYDROData_Obstacle)::DownCast(
HYDROGUI_Tool::FindObjectByName( module(), anEditedName, KIND_OBSTACLE ) );
}
-
- anObstacleName = anEditedName; //TODO: aPanel->getObstacleName();
} else if ( myFileDlg ) {
// Get file name and file filter defined by the user
aFileName = myFileDlg->selectedFile();
}
// Check the file name
+ if ( aFileName.isEmpty() ) {
+ return false;
+ }
QFileInfo aFileInfo( aFileName );
if ( !aFileInfo.exists() || !aFileInfo.isReadable() ) {
theErrorMsg = tr( "FILE_NOT_EXISTS_OR_CANT_BE_READ" ).arg( aFileName );
return false;
}
+ // Check obstacle name
+ anObstacleName = aPanel->getObjectName().simplified();
+ if ( anObstacleName.isEmpty() ) {
+ theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
+ return false;
+ }
+
+ if( anObstacle.IsNull() || anObstacle->GetName() != anObstacleName ) {
+ // check that there are no other objects with the same name in the document
+ Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anObstacleName );
+ if( !anObject.IsNull() ) {
+ theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anObstacleName );
+ return false;
+ }
+ }
+
bool anIsOk = false;
// If the obstacle for edit is null - create new obstacle object
if ( anObstacle.IsNull() ) {
anObstacle = Handle(HYDROData_Obstacle)::DownCast( doc()->CreateObject(KIND_OBSTACLE) );
+
+ anObstacle->SetFillingColor( HYDROData_Obstacle::DefaultFillingColor() );
+ anObstacle->SetBorderColor( HYDROData_Obstacle::DefaultBorderColor() );
}
if ( !anObstacle.IsNull() ) {
if ( anObstacle->ImportFromFile( aFileName ) ) {
// Set name
if ( anObstacleName.isEmpty() ) {
- anObstacleName = HYDROGUI_Tool::GenerateObjectName( module(), aFileInfo.baseName() );
+ anObstacleName = HYDROGUI_Tool::GenerateObjectName(
+ module(), aFileInfo.baseName(), QStringList(), true );
}
if ( anObstacle->GetName() != anObstacleName ) {
anObstacle->SetName( anObstacleName );
}
+ anObstacle->Update();
+
// Set operation status
anIsOk = true;
- theUpdateFlags = UF_Model;
+ module()->setIsToUpdate( anObstacle );
+ theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( anObstacle );
+ theBrowseObjectsEntries.append( anEntry );
+
+
} else {
theErrorMsg = tr( "BAD_IMPORTED_OBSTACLE_FILE" ).arg( aFileName );
}
{
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;
