ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-29 07:40:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

22359: Body Fitting algorithm: grid orientation

Browse Source 
Fix a crash in the release mode

+  // Creation of this class disables vtkMatplotlibMathTextUtilities
+  struct MPLMathText_Disabler : protected vtkMatplotlibMathTextUtilities
This commit is contained in:
eap 2014-02-05 09:13:00 +00:00
parent 5c9a9bf940
commit 74a891c6f3
1 changed files with 193 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/SMESHGUI/SMESHGUI.cxx
View File

@ -181,7 +181,23 @@
// of auto-color picking up // of auto-color picking up
#define SIMPLE_AUTOCOLOR #define SIMPLE_AUTOCOLOR
//namespace{ // REMOVE the code about MPLMathText_Disabler if it does not complite at porting to ParaView-4.1
#include <vtkMatplotlibMathTextUtilities.h>
namespace
{
// Creation of this class disables vtkMatplotlibMathTextUtilities
struct MPLMathText_Disabler : protected vtkMatplotlibMathTextUtilities
{
MPLMathText_Disabler()
{
vtkMatplotlibMathTextUtilities::MPLMathTextAvailable =
vtkMatplotlibMathTextUtilities::UNAVAILABLE;
}
};
}
namespace
{
// Declarations // Declarations
//============================================================= //=============================================================
void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh, void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh,
@ -195,7 +211,6 @@
void Control( int theCommandID ); void Control( int theCommandID );
// Definitions // Definitions
//============================================================= //=============================================================
void ImportMeshesFromFile( SMESH::SMESH_Gen_ptr theComponentMesh, void ImportMeshesFromFile( SMESH::SMESH_Gen_ptr theComponentMesh,
@ -1708,9 +1723,10 @@
return RefType; return RefType;
} }
} //namespace
void SMESHGUI::OnEditDelete() void SMESHGUI::OnEditDelete()
{ {
// VSR 17/11/04: check if all objects selected belong to SMESH component --> start // VSR 17/11/04: check if all objects selected belong to SMESH component --> start
LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr(); LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected; aSel->selectedObjects( selected, QString::null, false ); SALOME_ListIO selected; aSel->selectedObjects( selected, QString::null, false );
@ -1880,8 +1896,7 @@
aSel->setSelectedObjects( l1 ); aSel->setSelectedObjects( l1 );
SMESHGUI::GetSMESHGUI()->updateObjBrowser(); SMESHGUI::GetSMESHGUI()->updateObjBrowser();
} }
//} namespace
extern "C" { extern "C" {
SMESHGUI_EXPORT CAM_Module* createModule() SMESHGUI_EXPORT CAM_Module* createModule()
@ -1939,6 +1954,8 @@ SalomeApp_Module( "SMESH" )
/* load resources for all available meshers */ /* load resources for all available meshers */
SMESH::InitAvailableHypotheses(); SMESH::InitAvailableHypotheses();
MPLMathText_Disabler d; // disable vtkMatplotlibMathTextUtilities
} }
//============================================================================= //=============================================================================