Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_11_BR'
[modules/geom.git]
/
src
/
GEOM
/
GEOM_IOperations.cxx
diff --git
a/src/GEOM/GEOM_IOperations.cxx
b/src/GEOM/GEOM_IOperations.cxx
index d7a381c16a946faca18fa63a320143cfdfdcbfc1..185c8701e87eb38a3f97acf9c3ee7023a7a593c9 100644
(file)
--- a/
src/GEOM/GEOM_IOperations.cxx
+++ b/
src/GEOM/GEOM_IOperations.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 CEA, EDF
, 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
@@
-25,7
+25,6
@@
#include <GEOM_IOperations.hxx>
#include "utilities.h"
#include <GEOM_IOperations.hxx>
#include "utilities.h"
-#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <TDataStd_TreeNode.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <TDataStd_TreeNode.hxx>
@@
-38,8
+37,8
@@
*/
//=============================================================================
*/
//=============================================================================
-GEOM_IOperations::GEOM_IOperations(GEOM_Engine* theEngine
, int theDocID
)
-: _engine(theEngine)
, _docID(theDocID)
+GEOM_IOperations::GEOM_IOperations(GEOM_Engine* theEngine)
+: _engine(theEngine)
{
_solver = new GEOM_Solver(theEngine);
}
{
_solver = new GEOM_Solver(theEngine);
}
@@
-64,7
+63,7
@@
GEOM_IOperations::~GEOM_IOperations()
//=============================================================================
void GEOM_IOperations::StartOperation()
{
//=============================================================================
void GEOM_IOperations::StartOperation()
{
- Handle(TDocStd_Document) aDoc = _engine->GetDocument(
_docID
);
+ Handle(TDocStd_Document) aDoc = _engine->GetDocument();
if(aDoc->GetUndoLimit() > 0)
aDoc->NewCommand();
}
if(aDoc->GetUndoLimit() > 0)
aDoc->NewCommand();
}
@@
-76,7
+75,7
@@
void GEOM_IOperations::StartOperation()
//=============================================================================
void GEOM_IOperations::FinishOperation()
{
//=============================================================================
void GEOM_IOperations::FinishOperation()
{
- Handle(TDocStd_Document) aDoc = _engine->GetDocument(
_docID
);
+ Handle(TDocStd_Document) aDoc = _engine->GetDocument();
if(aDoc->GetUndoLimit() > 0)
aDoc->CommitCommand();
}
if(aDoc->GetUndoLimit() > 0)
aDoc->CommitCommand();
}
@@
-88,7
+87,7
@@
void GEOM_IOperations::FinishOperation()
//=============================================================================
void GEOM_IOperations::AbortOperation()
{
//=============================================================================
void GEOM_IOperations::AbortOperation()
{
- Handle(TDocStd_Document) aDoc = _engine->GetDocument(
_docID
);
+ Handle(TDocStd_Document) aDoc = _engine->GetDocument();
aDoc->AbortCommand();
}
aDoc->AbortCommand();
}