From f551c53280ca65caaf32cd9c052a059c4064d030 Mon Sep 17 00:00:00 2001 From: enk Date: Wed, 18 Oct 2006 12:24:21 +0000 Subject: [PATCH] Added prsmerger --- src/VISU_I/VISU_Gen_i.cc | 12 ++++++++++++ src/VISU_I/VISU_Gen_i.hh | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index 0070b912..1fd83ec3 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -43,6 +43,7 @@ #include "VISU_Table_i.hh" #include "VISU_TimeAnimation.h" #include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_PrsMerger_i.hh" #include "VISU_Actor.h" @@ -215,6 +216,7 @@ namespace VISU Storable::Registry(Curve_i::myComment.c_str(),&(Curve_i::Restore)); Storable::Registry(Container_i::myComment.c_str(),&(Container_i::Restore)); Storable::Registry(ScalarMapOnDeformedShape_i::myComment.c_str(),&(Restore)); + Storable::Registry(PrsMerger_i::myComment.c_str(),&(Restore)); } @@ -329,6 +331,7 @@ namespace VISU else if ( !aComment.compare(QString("CONTAINER")) ) aVISUType = VISU::TCONTAINER; else if ( !aComment.compare(QString("MESH")) ) aVISUType = VISU::TMESH; else if ( !aComment.compare(QString("SCALARMAP")) ) aVISUType = VISU::TSCALARMAP; + else if ( !aComment.compare(QString("PRSMERGER")) ) aVISUType = VISU::TPRSMERGER; else if ( !aComment.compare(QString("ISOSURFACE")) ) aVISUType = VISU::TISOSURFACE; else if ( !aComment.compare(QString("DEFORMEDSHAPE")) ) aVISUType = VISU::TDEFORMEDSHAPE; else if ( !aComment.compare(QString("SCALARMAPONDEFORMEDSHAPE")) ) aVISUType = VISU::TSCALARMAPONDEFORMEDSHAPE; @@ -941,6 +944,15 @@ namespace VISU return Prs3dOnField(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn(); } + PrsMerger_ptr VISU_Gen_i::PrsMergerOnField(Result_ptr theResult, + const char* theMeshName, + VISU::Entity theEntity, + const char* theFieldName, + CORBA::Double theIteration) + { + return Prs3dOnField(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn(); + } + Table_ptr VISU_Gen_i::CreateTable(const char* theTableEntry){ if(myStudyDocument->GetProperties()->IsLocked()) return Table::_nil(); diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh index 1a5f6f82..f1f109c2 100644 --- a/src/VISU_I/VISU_Gen_i.hh +++ b/src/VISU_I/VISU_Gen_i.hh @@ -275,6 +275,14 @@ namespace VISU const char* theFieldName, CORBA::Double theIteration); + virtual + PrsMerger_ptr + PrsMergerOnField(Result_ptr theResult, + const char* theMeshName, + VISU::Entity theEntity, + const char* theFieldName, + CORBA::Double theIteration); + //Create Digital Presentation virtual Table_ptr -- 2.39.2