Salome HOME
projects
/
modules
/
visu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Join modifications from branch BR_DEBUG_3_2_0b1
[modules/visu.git]
/
src
/
VISU_I
/
VISU_Result_i.hh
diff --git
a/src/VISU_I/VISU_Result_i.hh
b/src/VISU_I/VISU_Result_i.hh
index ee903de6aafb7f295de17dd07032c7f7d1e65bf2..b04fc0d5c85809b58eb3c68fabcb807562159daf 100644
(file)
--- a/
src/VISU_I/VISU_Result_i.hh
+++ b/
src/VISU_I/VISU_Result_i.hh
@@
-17,7
+17,7
@@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-//
See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// File : VISU_Result_i.hh
//
//
// File : VISU_Result_i.hh
@@
-28,10
+28,10
@@
#define __VISU_RESULT_I_H__
#include "VISUConfig.hh"
#define __VISU_RESULT_I_H__
#include "VISUConfig.hh"
+#include "VISU_BoostSignals.h"
#include "SALOME_GenericObj_i.hh"
#include "SALOME_GenericObj_i.hh"
-#include <boost/signals/trackable.hpp>
-#include <boost/signals/signal0.hpp>
+#include "VTKViewer.h"
#include <gp_Dir.hxx>
#include <vector>
#include <gp_Dir.hxx>
#include <vector>
@@
-41,7
+41,7
@@
class VISU_Convertor;
namespace VISU
{
//----------------------------------------------------------------------------
namespace VISU
{
//----------------------------------------------------------------------------
- class MinMaxCunsomer: public virtual boost::
bsignals
::trackable
+ class MinMaxCunsomer: public virtual boost::
signalslib
::trackable
{
protected:
bool myMinMaxIsInitilized;
{
protected:
bool myMinMaxIsInitilized;
@@
-73,7
+73,10
@@
namespace VISU
Result_i(SALOMEDS::Study_ptr theStudy,
const ESourceId& theSourceId,
const ECreationId& theCreationId,
Result_i(SALOMEDS::Study_ptr theStudy,
const ESourceId& theSourceId,
const ECreationId& theCreationId,
- CORBA::Boolean theIsBuildImmediately = true);
+ CORBA::Boolean theIsBuildImmediately = true,
+ CORBA::Boolean theIsBuildFields = true,
+ CORBA::Boolean theIsBuildMinMax = true,
+ CORBA::Boolean theIsBuildGroups = true);
virtual ~Result_i();
virtual void RemoveFromStudy();
virtual ~Result_i();
virtual void RemoveFromStudy();
@@
-174,17
+177,18
@@
namespace VISU
// Info on structured mesh contained in TInput
public:
typedef enum { AXIS_X = 0, AXIS_Y, AXIS_Z } TAxis;
// Info on structured mesh contained in TInput
public:
typedef enum { AXIS_X = 0, AXIS_Y, AXIS_Z } TAxis;
- const std::vector< float >* GetAxisInfo(const std::string& theMeshName,
- TAxis theAxis,
- gp_Dir& thePlaneNormal);
+ typedef std::vector< vtkFloatingPointType > TAxisInfo;
+ const TAxisInfo* GetAxisInfo(const std::string& theMeshName,
+ TAxis theAxis,
+ gp_Dir& thePlaneNormal);
// Return i,j or k values and cutting plane normal for theAxis.
// In the case of any problems, return NULL pointer
private:
struct TGridInfo {
// Return i,j or k values and cutting plane normal for theAxis.
// In the case of any problems, return NULL pointer
private:
struct TGridInfo {
-
std::vector< float >
myComponets[ 3 ];
- gp_Dir
myAxis [ 3 ];
+
TAxisInfo
myComponets[ 3 ];
+ gp_Dir myAxis [ 3 ];
};
};
-
map<
string, TGridInfo > myMeshName2GridInfoMap;
+
std::map< std::
string, TGridInfo > myMeshName2GridInfoMap;
};
Result_var FindResult(SALOMEDS::SObject_ptr theSObject);
};
Result_var FindResult(SALOMEDS::SObject_ptr theSObject);