Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
23315: [CEA 1929] Too much memory used to display a mesh in shading and wireframe
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Hypotheses.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index 504607da543b8e70bdf7004f2e04a889f38568c1..b1f0e20faa9e2ea3b49b1ec29bca6b58c9ef6349 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-29,6
+29,8
@@
#include "SMESHGUI_HypothesesUtils.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_SpinBox.h"
#include "SMESHGUI_HypothesesUtils.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_SpinBox.h"
+#include "SMESHGUI_VTKUtils.h"
+#include "SMESH_Actor.h"
// SALOME KERNEL includes
#include <SALOMEDSClient_Study.hxx>
// SALOME KERNEL includes
#include <SALOMEDSClient_Study.hxx>
@@
-42,6
+44,7
@@
#include <SUIT_Session.h>
#include <SalomeApp_IntSpinBox.h>
#include <SalomeApp_Tools.h>
#include <SUIT_Session.h>
#include <SalomeApp_IntSpinBox.h>
#include <SalomeApp_Tools.h>
+#include <SVTK_ViewWindow.h>
// Qt includes
#include <QFrame>
// Qt includes
#include <QFrame>
@@
-85,7
+88,6
@@
void SMESHGUI_GenericHypothesisCreator::create( SMESH::SMESH_Hypothesis_ptr init
const QString& theHypName,
QWidget* parent, QObject* obj, const QString& slot )
{
const QString& theHypName,
QWidget* parent, QObject* obj, const QString& slot )
{
- MESSAGE( "Creation of hypothesis with initial params" );
setInitParamsHypothesis( initParamsHyp );
create( false, theHypName, parent, obj, slot );
}
setInitParamsHypothesis( initParamsHyp );
create( false, theHypName, parent, obj, slot );
}
@@
-94,8
+96,6
@@
void SMESHGUI_GenericHypothesisCreator::create( bool isAlgo,
const QString& theHypName,
QWidget* theParent, QObject* obj, const QString& slot )
{
const QString& theHypName,
QWidget* theParent, QObject* obj, const QString& slot )
{
- MESSAGE( "Creation of hypothesis" );
-
myIsCreate = true;
// Create hypothesis/algorithm
myIsCreate = true;
// Create hypothesis/algorithm
@@
-316,6
+316,10
@@
void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
aMesh = aSubMesh->GetFather();
_PTR(SObject) meshSO = SMESH::FindSObject( aMesh );
SMESH::ModifiedMesh( meshSO, false, aMesh->NbNodes()==0);
aMesh = aSubMesh->GetFather();
_PTR(SObject) meshSO = SMESH::FindSObject( aMesh );
SMESH::ModifiedMesh( meshSO, false, aMesh->NbNodes()==0);
+ SMESH_Actor* actor = SMESH::FindActorByEntry( meshSO->GetID().c_str() );
+ if( actor ) {
+ actor->Update();
+ }
}
}
SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
}
}
SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
@@
-327,6
+331,9
@@
void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
myDlg->close();
//delete myDlg; since WA_DeleteOnClose==true
myDlg = 0;
myDlg->close();
//delete myDlg; since WA_DeleteOnClose==true
myDlg = 0;
+ if (SVTK_ViewWindow* vf = SMESH::GetCurrentVtkView()) {
+ vf->Repaint();
+ }
emit finished( result );
}
emit finished( result );
}
@@
-742,6
+749,8
@@
HypothesisData::HypothesisData( const QString& theTypeName,
const QString& theLabel,
const QString& theIconId,
const QString& theContext,
const QString& theLabel,
const QString& theIconId,
const QString& theContext,
+ const int theGroupID,
+ const int thePriority,
const QList<int>& theDim,
const bool theIsAuxOrNeedHyp,
const QStringList& theBasicHypos,
const QList<int>& theDim,
const bool theIsAuxOrNeedHyp,
const QStringList& theBasicHypos,
@@
-757,6
+766,8
@@
HypothesisData::HypothesisData( const QString& theTypeName,
Label( theLabel ),
IconId( theIconId ),
Context( theContext ),
Label( theLabel ),
IconId( theIconId ),
Context( theContext ),
+ GroupID( theGroupID ),
+ Priority( thePriority ),
Dim( theDim ),
IsAuxOrNeedHyp( theIsAuxOrNeedHyp ),
IsNeedGeometry( theIsNeedGeometry ),
Dim( theDim ),
IsAuxOrNeedHyp( theIsAuxOrNeedHyp ),
IsNeedGeometry( theIsNeedGeometry ),