Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #568: use ordered list view with selection synchronized with object browser...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportObstacleFromFileOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
index 350c6d66cffd7688193f732fc680ac80f4ab710b..b330b3b0a63c67ba7b1f55fb1027546b7903b2d8 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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
-//
+// Copyright (C) 2014-2015 EDF-R&D
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-22,8
+18,8
@@
#include "HYDROGUI_ImportObstacleFromFileOp.h"
#include "HYDROGUI_ImportObstacleFromFileOp.h"
-#include "HYDROGUI_
Obstacle
Dlg.h"
-
+#include "HYDROGUI_
GeomObject
Dlg.h"
+#include <HYDROGUI_DataObject.h>
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
@@
-61,17
+57,17
@@
void HYDROGUI_ImportObstacleFromFileOp::startOperation()
HYDROGUI_Operation::startOperation();
// Get panel
HYDROGUI_Operation::startOperation();
// Get panel
- HYDROGUI_
ObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_Obstacle
Dlg*>( inputPanel() );
+ HYDROGUI_
GeomObjectDlg* aPanel = ::qobject_cast<HYDROGUI_GeomObject
Dlg*>( inputPanel() );
if ( aPanel ) {
// Reset the panel state
aPanel->reset();
// Pass the existing obstacle names to the panel
if ( aPanel ) {
// Reset the panel state
aPanel->reset();
// Pass the existing obstacle names to the panel
- QStringList anObstacles =
+ QStringList anObstacle
Name
s =
HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_OBSTACLE );
HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_OBSTACLE );
- aPanel->setOb
stacleNames( anObstacl
es );
+ aPanel->setOb
jectNames( anObstacleNam
es );
} else {
myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
myFileDlg->setWindowTitle( getName() );
} else {
myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
myFileDlg->setWindowTitle( getName() );
@@
-98,19
+94,20
@@
void HYDROGUI_ImportObstacleFromFileOp::commitOperation()
}
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
QString aFileName;
QString anObstacleName;
Handle(HYDROData_Obstacle) anObstacle;
// Get panel
{
QString aFileName;
QString anObstacleName;
Handle(HYDROData_Obstacle) anObstacle;
// Get panel
- HYDROGUI_
ObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_Obstacle
Dlg*>( inputPanel() );
+ HYDROGUI_
GeomObjectDlg* aPanel = ::qobject_cast<HYDROGUI_GeomObject
Dlg*>( inputPanel() );
if ( aPanel ) {
// Get file name and obstacle name defined by the user
aFileName = aPanel->getFileName();
if ( aPanel ) {
// Get file name and obstacle name defined by the user
aFileName = aPanel->getFileName();
- QString anEditedName = aPanel->getEditedOb
stacle
Name().simplified();
+ QString anEditedName = aPanel->getEditedOb
ject
Name().simplified();
// Get obstacle to edit
if ( !anEditedName.isEmpty() ) {
// Get obstacle to edit
if ( !anEditedName.isEmpty() ) {
@@
-134,7
+131,7
@@
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
}
// Check obstacle name
}
// Check obstacle name
- anObstacleName = aPanel->getOb
stacle
Name().simplified();
+ anObstacleName = aPanel->getOb
ject
Name().simplified();
if ( anObstacleName.isEmpty() ) {
theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
return false;
if ( anObstacleName.isEmpty() ) {
theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
return false;
@@
-170,9
+167,16
@@
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
anObstacle->SetName( anObstacleName );
}
anObstacle->SetName( anObstacleName );
}
+ anObstacle->Update();
+
// Set operation status
anIsOk = true;
// Set operation status
anIsOk = true;
- theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;;
+ 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 );
}
} else {
theErrorMsg = tr( "BAD_IMPORTED_OBSTACLE_FILE" ).arg( aFileName );
}
@@
-185,7
+189,8
@@
HYDROGUI_InputPanel* HYDROGUI_ImportObstacleFromFileOp::createInputPanel() const
{
HYDROGUI_InputPanel* aPanel = 0;
if ( myIsToShowPanel ) {
{
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;
}
return aPanel;