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
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_VisualStateOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
index 326b5ab8fe7dfa64148906ebabec7f2cb432dc00..d2d87f776334fbc9f396f007aaae5e10b7ed6e71 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
@@
-41,7
+41,7
@@
#include <SUIT_ViewManager.h>
#include <SUIT_ViewWindow.h>
#include <SUIT_ViewManager.h>
#include <SUIT_ViewWindow.h>
-#include <QApplication
.h
>
+#include <QApplication>
HYDROGUI_VisualStateOp::HYDROGUI_VisualStateOp( HYDROGUI_Module* theModule,
const bool theIsLoad )
HYDROGUI_VisualStateOp::HYDROGUI_VisualStateOp( HYDROGUI_Module* theModule,
const bool theIsLoad )
@@
-59,6
+59,9
@@
void HYDROGUI_VisualStateOp::startOperation()
{
HYDROGUI_Operation::startOperation();
{
HYDROGUI_Operation::startOperation();
+ if( !myIsLoad )
+ startDocOperation();
+
bool aResult = false;
if( myIsLoad )
aResult = loadVisualState();
bool aResult = false;
if( myIsLoad )
aResult = loadVisualState();
@@
-66,9
+69,17
@@
void HYDROGUI_VisualStateOp::startOperation()
aResult = saveVisualState();
if( aResult )
aResult = saveVisualState();
if( aResult )
+ {
+ if( !myIsLoad )
+ commitDocOperation();
commit();
commit();
+ }
else
else
- abort(); // do not commit the document command
+ {
+ if( !myIsLoad )
+ abortDocOperation();
+ abort();
+ }
}
bool HYDROGUI_VisualStateOp::saveVisualState()
}
bool HYDROGUI_VisualStateOp::saveVisualState()
@@
-84,7
+95,7
@@
bool HYDROGUI_VisualStateOp::saveVisualState()
if( aVisualState.IsNull() )
return false;
if( aVisualState.IsNull() )
return false;
- QString aName = HYDROGUI_Tool::GenerateObjectName( module(),
"VisualState"
);
+ QString aName = HYDROGUI_Tool::GenerateObjectName( module(),
tr( "DEFAULT_VISUAL_STATE_NAME" )
);
aVisualState->SetName( aName );
}
aVisualState->SetName( aName );
}
@@
-109,7
+120,7
@@
bool HYDROGUI_VisualStateOp::saveVisualState()
{
if( SUIT_ViewManager* aViewManager = anIter.next() )
{
{
if( SUIT_ViewManager* aViewManager = anIter.next() )
{
-
int aViewId = (in
t)aViewManager->getViewModel();
+
size_t aViewId = (size_
t)aViewManager->getViewModel();
if( SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView() )
{
QString aType = aViewManager->getType();
if( SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView() )
{
QString aType = aViewManager->getType();
@@
-126,13
+137,13
@@
bool HYDROGUI_VisualStateOp::saveVisualState()
for( int anObjIndex = 1, aLength = aSeq.Length(); anObjIndex <= aLength; anObjIndex++ )
{
for( int anObjIndex = 1, aLength = aSeq.Length(); anObjIndex <= aLength; anObjIndex++ )
{
- Handle(HYDROData_
Object
) anObject = aSeq.Value( anObjIndex );
+ Handle(HYDROData_
Entity
) anObject = aSeq.Value( anObjIndex );
if( !anObject.IsNull() )
{
// Format: "Name|Visibility[|CoordX|CoordY]"
QString aParameters = anObject->GetName();
if( !anObject.IsNull() )
{
// Format: "Name|Visibility[|CoordX|CoordY]"
QString aParameters = anObject->GetName();
- int aVisibility = (int)
anObject->IsVisible( aViewId
);
+ int aVisibility = (int)
( module()->isObjectVisible( aViewId, anObject )
);
aParameters.append( QString( "|%1" ).arg( aVisibility ) );
setVisualProperty( aPropertyMap, aViewerEntry, aParameters, true );
aParameters.append( QString( "|%1" ).arg( aVisibility ) );
setVisualProperty( aPropertyMap, aViewerEntry, aParameters, true );
@@
-158,7
+169,7
@@
bool HYDROGUI_VisualStateOp::saveVisualState()
//printf( "--- SetState -----------\n" );
//printf( "%s\n", qPrintable( aState ) );
//printf( "------------------------\n" );
//printf( "--- SetState -----------\n" );
//printf( "%s\n", qPrintable( aState ) );
//printf( "------------------------\n" );
- aVisualState->SetState( aState );
+ aVisualState->SetState( aState
.toStdString()
);
module()->update( UF_Model );
module()->update( UF_Model );
@@
-174,7
+185,7
@@
bool HYDROGUI_VisualStateOp::loadVisualState()
if( aVisualState.IsNull() )
return false;
if( aVisualState.IsNull() )
return false;
- QString aState =
aVisualState->GetState(
);
+ QString aState =
QString::fromStdString( aVisualState->GetState()
);
//printf( "--- GetState -----------\n" );
//printf( "%s\n", qPrintable( aState ) );
//printf( "------------------------\n" );
//printf( "--- GetState -----------\n" );
//printf( "%s\n", qPrintable( aState ) );
//printf( "------------------------\n" );
@@
-198,7
+209,7
@@
bool HYDROGUI_VisualStateOp::loadVisualState()
QString aViewerId = aViewerEntry.section( '_', -1 ); // unused
if( SUIT_ViewManager* aViewManager = anApp->createViewManager( aType ) )
{
QString aViewerId = aViewerEntry.section( '_', -1 ); // unused
if( SUIT_ViewManager* aViewManager = anApp->createViewManager( aType ) )
{
-
int aViewId = (in
t)aViewManager->getViewModel();
+
size_t aViewId = (size_
t)aViewManager->getViewModel();
if( SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView() )
{
// Wait until the window is really shown. This step fixes MANY bugs.
if( SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView() )
{
// Wait until the window is really shown. This step fixes MANY bugs.
@@
-232,7
+243,7
@@
bool HYDROGUI_VisualStateOp::loadVisualState()
for( int anObjIndex = 1, aLength = aSeq.Length(); anObjIndex <= aLength; anObjIndex++ )
{
for( int anObjIndex = 1, aLength = aSeq.Length(); anObjIndex <= aLength; anObjIndex++ )
{
- Handle(HYDROData_
Object
) anObject = aSeq.Value( anObjIndex );
+ Handle(HYDROData_
Entity
) anObject = aSeq.Value( anObjIndex );
if( !anObject.IsNull() )
{
QString aName = anObject->GetName();
if( !anObject.IsNull() )
{
QString aName = anObject->GetName();
@@
-247,7
+258,7
@@
bool HYDROGUI_VisualStateOp::loadVisualState()
{
bool anIsVisible = aParameters[ aParamIndex ].toInt( &anIsOk[ ++aParamIndex ] );
if( anIsOk[ 0 ] )
{
bool anIsVisible = aParameters[ aParamIndex ].toInt( &anIsOk[ ++aParamIndex ] );
if( anIsOk[ 0 ] )
-
anObject->SetVisible( aViewId
, anIsVisible );
+
module()->setObjectVisible( aViewId, anObject
, anIsVisible );
}
}
}
}
}
}