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
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_UpdateObjectOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_UpdateObjectOp.h
b/src/HYDROGUI/HYDROGUI_UpdateObjectOp.h
index 735b01bfe94aa625ecc60a602d14c839bfaa0a2b..70f1157f13866e14978c11bd83e0a14cdca71cf3 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_UpdateObjectOp.h
+++ b/
src/HYDROGUI/HYDROGUI_UpdateObjectOp.h
@@
-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
@@
-27,22
+23,26
@@
#include <NCollection_Map.hxx>
#include <NCollection_Map.hxx>
-class H
andle_H
YDROData_Entity;
+class HYDROData_Entity;
class HYDROGUI_UpdateObjectOp : public HYDROGUI_Operation
{
Q_OBJECT
public:
class HYDROGUI_UpdateObjectOp : public HYDROGUI_Operation
{
Q_OBJECT
public:
- HYDROGUI_UpdateObjectOp( HYDROGUI_Module* theModule );
+ HYDROGUI_UpdateObjectOp( HYDROGUI_Module* theModule,
+ const bool theIsForced );
virtual ~HYDROGUI_UpdateObjectOp();
protected:
virtual void startOperation();
virtual ~HYDROGUI_UpdateObjectOp();
protected:
virtual void startOperation();
- virtual void updateObject( const Handle
_HYDROData_Entity
& theObject,
+ virtual void updateObject( const Handle
(HYDROData_Entity)
& theObject,
NCollection_Map<Handle(HYDROData_Entity)>& theMapOfTreated ) const;
NCollection_Map<Handle(HYDROData_Entity)>& theMapOfTreated ) const;
+
+private:
+ bool myIsForced;
};
#endif
};
#endif