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_Poly3DOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
b/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
index 26c9e374f23feb1fecba62e11402c5021aec9681..0c1f2b2f64584e7cdae874becea06c52a625a2b5 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_Poly3DOp.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
@@
-23,6
+19,7
@@
#include "HYDROGUI_Poly3DOp.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Poly3DOp.h"
#include "HYDROGUI_Module.h"
+#include <HYDROGUI_DataObject.h>
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_Poly3DDlg.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_Poly3DDlg.h"
#include "HYDROGUI_UpdateFlags.h"
@@
-64,7
+61,8
@@
void HYDROGUI_Poly3DOp::startOperation()
QString aPoly3DName;
if( myIsEdit )
{
QString aPoly3DName;
if( myIsEdit )
{
- myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if( !myEditedObject.IsNull() )
aPoly3DName = myEditedObject->GetName();
}
if( !myEditedObject.IsNull() )
aPoly3DName = myEditedObject->GetName();
}
@@
-89,9
+87,9
@@
void HYDROGUI_Poly3DOp::startOperation()
if( !aPoly.IsNull() )
aPolyName = aPoly->GetName();
if( !aPoly.IsNull() )
aPolyName = aPoly->GetName();
- Handle(HYDROData_
Bathymetry) aBathymetry = myEditedObject->GetBathymetry
();
- if( !a
Bathymetry
.IsNull() )
- aBathName = a
Bathymetry
->GetName();
+ Handle(HYDROData_
IAltitudeObject) anAltitudeObj = myEditedObject->GetAltitudeObject
();
+ if( !a
nAltitudeObj
.IsNull() )
+ aBathName = a
nAltitudeObj
->GetName();
aPanel->setSelectedObjects( aPolyName, aProfileName, aBathName );
}
aPanel->setSelectedObjects( aPolyName, aProfileName, aBathName );
}
@@
-108,7
+106,8
@@
void HYDROGUI_Poly3DOp::startOperation()
}
bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_Poly3DDlg* aPanel = dynamic_cast<HYDROGUI_Poly3DDlg*>( inputPanel() );
{
HYDROGUI_Poly3DDlg* aPanel = dynamic_cast<HYDROGUI_Poly3DDlg*>( inputPanel() );
@@
-145,13
+144,12
@@
bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
if( myIsEdit )
{
aResult = myEditedObject;
if( myIsEdit )
{
aResult = myEditedObject;
- aResult->RemoveProfileUZ();
- aResult->RemovePolylineXY();
- aResult->RemoveBathymetry();
}
else
{
aResult = Handle(HYDROData_Polyline3D)::DownCast( doc()->CreateObject( KIND_POLYLINE ) );
}
else
{
aResult = Handle(HYDROData_Polyline3D)::DownCast( doc()->CreateObject( KIND_POLYLINE ) );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult );
+ theBrowseObjectsEntries.append( anEntry );
}
if( aResult.IsNull() )
}
if( aResult.IsNull() )
@@
-159,6
+157,7
@@
bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
aResult->SetName( aResultName );
aResult->SetName( aResultName );
+ aResult->SetPolylineXY( aPolyline, false );
if ( !aProfile.IsNull() )
{
Handle(HYDROData_ProfileUZ) aProfileUZ = aProfile->GetProfileUZ();
if ( !aProfile.IsNull() )
{
Handle(HYDROData_ProfileUZ) aProfileUZ = aProfile->GetProfileUZ();
@@
-169,11
+168,9
@@
bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
}
else
{
}
else
{
- aResult->Set
Bathymetry
( aBath );
+ aResult->Set
AltitudeObject
( aBath );
}
}
- aResult->SetPolylineXY( aPolyline );
-
if( !myIsEdit )
{
aResult->SetBorderColor( HYDROData_Polyline3D::DefaultBorderColor() );
if( !myIsEdit )
{
aResult->SetBorderColor( HYDROData_Polyline3D::DefaultBorderColor() );
@@
-188,7
+185,8
@@
bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
module()->setObjectVisible( aViewId, aProfile, false );
module()->setObjectVisible( aViewId, aResult, true );
}
module()->setObjectVisible( aViewId, aProfile, false );
module()->setObjectVisible( aViewId, aResult, true );
}
+ module()->setIsToUpdate( aResult );
- theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
+ theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced
| UF_VTKViewer
;
return true;
}
return true;
}