]> SALOME platform Git repositories - modules/visu.git/commitdiff
Salome HOME
A patch by Nicolas GEIMER for Gcc 4.3.2 compatibility.
authorjfa <jfa@opencascade.com>
Tue, 3 Feb 2009 15:38:51 +0000 (15:38 +0000)
committerjfa <jfa@opencascade.com>
Tue, 3 Feb 2009 15:38:51 +0000 (15:38 +0000)
src/PIPELINE/VISU_PipeLine.cxx
src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
src/VISUGUI/VisuGUI_VectorsDlg.cxx
src/VISU_I/VISU_ColoredPrs3d_i.cc

index 9a7d2e2ee7cb53606d2ee8f92ee56b7e9397921e..d9519403bc48c7aa69ab2d9b38428a3587c6436a 100644 (file)
 #include <vtkObjectFactory.h>
 #include <vtkPlane.h>
 
-#include <climits>
 #include <float.h>
 #include <algorithm>
+#include <climits>
+#include <limits>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
index d5828be4c578eb17e5067f56394746cc560706cb..482514dd72252a71239c02a50f90cb7c824934b0 100644 (file)
@@ -78,6 +78,8 @@
 #include <vtkDataSetMapper.h>
 #include <vtkDataSet.h>
 
+#include <limits>
+
 using namespace std;
 
 //extern VisuGUI *visuGUI;
index b7acd57f3349e651a77877b94b906eb0ebdbfdbb..3d57aa320cbb31451a58c711d57205c2fdf51b12 100644 (file)
@@ -60,6 +60,8 @@
 #include <QPushButton>
 #include <QLabel>
 
+#include <limits>
+
 #define MYDEBUG 0
 
 /*!
index edbb24813e66e536225969267237eeef2cf6ce85..b7e41e4d3afa4d91b87d61873eff4fb376edecfa 100644 (file)
@@ -53,6 +53,7 @@
 #include <QKeyEvent>
 
 #include <math.h>
+#include <limits>
 
 using namespace std;
 
index 894305dcfe1f9871bdea73d76cbe5a814a7f4159..e46f4498dd4dce86124b50e23ccfb22d079e5213 100644 (file)
@@ -55,6 +55,8 @@
 #include <QPushButton>
 #include <QKeyEvent>
 
+#include <limits>
+
 using namespace std;
 
 /*!
index d82c7d7c681489bb23c50617b58f918c3212387b..a09c1cc1e15f14416097039dbb82d6b7fa51bab0 100644 (file)
@@ -171,18 +171,24 @@ namespace VISU
 //---------------------------------------------------------------
 VISU::ColoredPrs3d_i::
 ColoredPrs3d_i(EPublishInStudyMode thePublishInStudyMode) :
-  myPublishInStudyMode(thePublishInStudyMode),
-  myIsTimeStampFixed(thePublishInStudyMode == EPublishUnderTimeStamp),
+  myIsRestored(true),
+  myRestoringSObject( SALOMEDS::SObject::_nil() ),
   myEntity( VISU::Entity( -1 ) ),
   myPreviousEntity( VISU::Entity( -1 ) ),
   myTimeStampNumber( -1 ),
   myPreviousTimeStampNumber( -1 ),
+  myIsTimeStampFixed(thePublishInStudyMode == EPublishUnderTimeStamp),
+  myPublishInStudyMode(thePublishInStudyMode),
   myIsUnits( true ),
+  myNumberOfLabels( -1 ),
   myOrientation( VISU::ColoredPrs3dBase::HORIZONTAL ),
+  //myPosition[2], myWidth, myHeight, myTitleWidth, myTitleHeight,
+  //myLabelWidth, myLabelHeight, myBarWidth, myBarHeight,
+  //myIsBoldTitle, myIsItalicTitle, myIsShadowTitle, myTitFontType, myTitleColor[3],
+  //myIsBoldLabel, myIsItalicLabel, myIsShadowLabel, myLblFontType, myLabelColor[3],
   myColoredPL(NULL),
   myIsFixedRange(false),
-  myIsRestored(true)/* RKV : Begin*/,
-  myIsDistributionVisible(false)/* RKV : End*/
+  myIsDistributionVisible(false)
 {}
 
 //---------------------------------------------------------------