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
quick optimization patch (bytearray for images)
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportObstacleFromFileOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
index 0fc2e3e58fd7a0720cd868538cea38ee472a1b71..9c0743c0b3fcfd68c5f119daad92b4a5ca1bcdce 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,11
+18,12
@@
#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"
+#include "HYDROGUI_Tool2.h"
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.h>
#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Obstacle.h>
@@
-61,23
+58,23
@@
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() );
- myFileDlg->setFilter( tr("OBSTACLE_FILTER") );
+ myFileDlg->set
Name
Filter( tr("OBSTACLE_FILTER") );
if ( !lastUsedFilter.isEmpty() ) {
if ( !lastUsedFilter.isEmpty() ) {
- myFileDlg->selectFilter( lastUsedFilter );
+ myFileDlg->select
Name
Filter( lastUsedFilter );
}
connect( myFileDlg, SIGNAL( accepted() ), this, SLOT( onApply() ) );
}
connect( myFileDlg, SIGNAL( accepted() ), this, SLOT( onApply() ) );
@@
-98,19
+95,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() ) {
@@
-120,7
+118,7
@@
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
} else if ( myFileDlg ) {
// Get file name and file filter defined by the user
aFileName = myFileDlg->selectedFile();
} else if ( myFileDlg ) {
// Get file name and file filter defined by the user
aFileName = myFileDlg->selectedFile();
- lastUsedFilter = myFileDlg->selectedFilter();
+ lastUsedFilter = myFileDlg->selected
Name
Filter();
}
// Check the file name
}
// Check the file name
@@
-134,7
+132,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;
@@
-154,6
+152,9
@@
bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
// If the obstacle for edit is null - create new obstacle object
if ( anObstacle.IsNull() ) {
anObstacle = Handle(HYDROData_Obstacle)::DownCast( doc()->CreateObject(KIND_OBSTACLE) );
// 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( anObstacle->DefaultFillingColor() );
+ anObstacle->SetBorderColor( anObstacle->DefaultBorderColor() );
}
if ( !anObstacle.IsNull() ) {
}
if ( !anObstacle.IsNull() ) {
@@
-167,9
+168,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 );
}
@@
-182,8
+190,9
@@
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;
-}
\ No newline at end of file
+}