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 #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_VisualStateOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
index 37f9c27f81c0183dcf2a3bc05140cf30df9e0b69..ea61932778d854da71352aae2eb593d12d408dce 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_VisualStateOp.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
@@
-59,7
+55,8
@@
void HYDROGUI_VisualStateOp::startOperation()
{
HYDROGUI_Operation::startOperation();
{
HYDROGUI_Operation::startOperation();
- startDocOperation();
+ if( !myIsLoad )
+ startDocOperation();
bool aResult = false;
if( myIsLoad )
bool aResult = false;
if( myIsLoad )
@@
-69,13
+66,15
@@
void HYDROGUI_VisualStateOp::startOperation()
if( aResult )
{
if( aResult )
{
- commitDocOperation();
+ if( !myIsLoad )
+ commitDocOperation();
commit();
}
else
{
commit();
}
else
{
- abortDocOperation();
- abort(); // do not commit the document command
+ if( !myIsLoad )
+ abortDocOperation();
+ abort();
}
}
}
}
@@
-92,7
+91,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 );
}
@@
-134,13
+133,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 );
@@
-166,7
+165,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 );
@@
-182,7
+181,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" );
@@
-240,7
+239,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();
@@
-255,7
+254,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 );
}
}
}
}
}
}