From: rnv <rnv@opencascade.com>
Date: Thu, 14 Jun 2018 11:40:52 +0000 (+0300)
Subject: Merge V9_dev branch into master
X-Git-Tag: SHAPER_V9_1_0RC1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=106f0c3862bebc3bb3d60cc4261aed7591029f80;p=plugins%2Fghs3dplugin.git

Merge V9_dev branch into master
---

106f0c3862bebc3bb3d60cc4261aed7591029f80
diff --cc src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
index ab47494,f3dbdfd..6b6cc25
--- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
@@@ -40,35 -40,34 +40,35 @@@ using namespace std
  //function : GHS3DPlugin_Hypothesis
  //=======================================================================
  
- GHS3DPlugin_Hypothesis::GHS3DPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen * gen)
-   : SMESH_Hypothesis(hypId, studyId, gen),
+ GHS3DPlugin_Hypothesis::GHS3DPlugin_Hypothesis(int hypId, SMESH_Gen * gen)
+   : SMESH_Hypothesis(hypId, gen),
 -  myToMeshHoles(DefaultMeshHoles()),
 -  myToMakeGroupsOfDomains(DefaultToMakeGroupsOfDomains()),
 -  myMaximumMemory(-1),
 -  myInitialMemory(-1),
 -  myOptimizationLevel(DefaultOptimizationLevel()),
 -  myKeepFiles(DefaultKeepFiles()),
 -  myWorkingDirectory(DefaultWorkingDirectory()),
 -  myVerboseLevel(DefaultVerboseLevel()),
 -  myToCreateNewNodes(DefaultToCreateNewNodes()),
 -  myToUseBoundaryRecoveryVersion(DefaultToUseBoundaryRecoveryVersion()),
 -  myToUseFemCorrection(DefaultToUseFEMCorrection()),
 -  myToRemoveCentralPoint(DefaultToRemoveCentralPoint()),
 -  myLogInStandardOutput(DefaultStandardOutputLog()),
 -  myGradation(DefaultGradation()),
 -  _enfVertexList(DefaultGHS3DEnforcedVertexList()),
 -  _enfVertexCoordsSizeList(DefaultGHS3DEnforcedVertexCoordsValues()),
 -  _enfVertexEntrySizeList(DefaultGHS3DEnforcedVertexEntryValues()),
 -  _coordsEnfVertexMap(DefaultCoordsGHS3DEnforcedVertexMap()),
 -  _geomEntryEnfVertexMap(DefaultGeomEntryGHS3DEnforcedVertexMap()),
 -  _enfMeshList(DefaultGHS3DEnforcedMeshList()),
 -  _entryEnfMeshMap(DefaultEntryGHS3DEnforcedMeshListMap()),
 -  _enfNodes(TIDSortedNodeGroupMap()),
 -  _enfEdges(TIDSortedElemGroupMap()),
 -  _enfTriangles(TIDSortedElemGroupMap()),
 -  _nodeIDToSizeMap(DefaultID2SizeMap()),
 -  _groupsToRemove(DefaultGroupsToRemove())
 +    myToMeshHoles(DefaultMeshHoles()),
 +    myToMakeGroupsOfDomains(DefaultToMakeGroupsOfDomains()),
 +    myMaximumMemory(-1),
 +    myInitialMemory(-1),
 +    myOptimizationLevel(DefaultOptimizationLevel()),
 +    myKeepFiles(DefaultKeepFiles()),
 +    myWorkingDirectory(DefaultWorkingDirectory()),
 +    myVerboseLevel(DefaultVerboseLevel()),
 +    myToCreateNewNodes(DefaultToCreateNewNodes()),
 +    myToUseBoundaryRecoveryVersion(DefaultToUseBoundaryRecoveryVersion()),
 +    myToUseFemCorrection(DefaultToUseFEMCorrection()),
 +    myToRemoveCentralPoint(DefaultToRemoveCentralPoint()),
 +    myLogInStandardOutput(DefaultStandardOutputLog()),
 +    myRemoveLogOnSuccess( DefaultRemoveLogOnSuccess() ),
 +    myGradation(DefaultGradation()),
 +    _enfVertexList(DefaultGHS3DEnforcedVertexList()),
 +    _enfVertexCoordsSizeList(DefaultGHS3DEnforcedVertexCoordsValues()),
 +    _enfVertexEntrySizeList(DefaultGHS3DEnforcedVertexEntryValues()),
 +    _coordsEnfVertexMap(DefaultCoordsGHS3DEnforcedVertexMap()),
 +    _geomEntryEnfVertexMap(DefaultGeomEntryGHS3DEnforcedVertexMap()),
 +    _enfMeshList(DefaultGHS3DEnforcedMeshList()),
 +    _entryEnfMeshMap(DefaultEntryGHS3DEnforcedMeshListMap()),
 +    _enfNodes(TIDSortedNodeGroupMap()),
 +    _enfEdges(TIDSortedElemGroupMap()),
 +    _enfTriangles(TIDSortedElemGroupMap()),
 +    _nodeIDToSizeMap(DefaultID2SizeMap()),
 +    _groupsToRemove(DefaultGroupsToRemove())
  {
    _name = GetHypType();
    _param_algo_dim = 3;