adds IDs mapping

diff --git a/src/CONVERTOR/VISU_Convertor.hxx b/src/CONVERTOR/VISU_Convertor.hxx
index a08fef2b68c09bd50fb7dce9f6941d2c84fb9e74..f788a3e581185ebf27a65029a7544fd50abae721 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor.hxx
+++ b/src/CONVERTOR/VISU_Convertor.hxx
@@ -40,7 +40,9 @@
 #include "MED_Vector.hxx"
 
 #include <vtkSystemIncludes.h>
-
+//pkv f
+class vtkCell;
+//pkv t
 class vtkUnstructuredGrid;
 
 namespace VISU
@@ -142,6 +144,16 @@ namespace VISU
     virtual 
     vtkIdType 
     GetElemObjID(int theVtkI) const = 0;
+
+    //pkv f
+    virtual
+    vtkCell* 
+    GetElemCell(int theObjID) = 0;
+
+    virtual
+    float* 
+    GetNodeCoord(int theObjID) = 0;
+    //pkv t
   };
 
 

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 072cd704be0b3d00be8525613e4c03db64c20e9c..263500f041978acbd1a1a6912172446c2fc176fc 100644 (file)
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -216,9 +216,9 @@ void VISU_Actor::ShallowCopy(vtkProp *prop){
 int VISU_Actor::GetNodeObjId(int theVtkID){
   vtkIdType aID;
   //
-  aID=theVtkID;
+  aID=myGeomFilter->GetNodeObjId(theVtkID);
   if (myIsShrunk) {
-   aID= myShrinkFilter->GetNodeObjId(theVtkID);
+   aID= myShrinkFilter->GetNodeObjId(aID);
   }
   if (myPipeLine) {
     aID=myPipeLine->GetNodeObjID(aID);
@@ -230,13 +230,24 @@ int VISU_Actor::GetNodeObjId(int theVtkID){
 int VISU_Actor::GetElemObjId(int theVtkID){
   vtkIdType aID;
   //
-  aID=theVtkID;
-  
+  aID=myGeomFilter->GetElemObjId(theVtkID);
   if (myIsShrunk) {
-   aID= myShrinkFilter->GetElemObjId(theVtkID);
+   aID= myShrinkFilter->GetElemObjId(aID);
   }
   if (myPipeLine) {
     aID=myPipeLine->GetElemObjID(aID);
   }
   return aID;
 }
+//modified by NIZNHY-PKV Tue Aug 30 12:46:15 2005f
+//----------------------------------------------------------------------------
+vtkCell* VISU_Actor::GetElemCell(int theObjID)
+{
+  return myPipeLine->GetElemCell(theObjID);
+}
+//----------------------------------------------------------------------------
+float* VISU_Actor::GetNodeCoord(int theObjID)
+{
+  return myPipeLine->GetNodeCoord(theObjID);
+}
+//modified by NIZNHY-PKV Tue Aug 30 12:46:19 2005t

diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h
index 01cf5c67baa6aae216c1a3ccd49320731dfede90..e750b174b7f709b5ede099fc83caf95bd0690cd6 100644 (file)
--- a/src/OBJECT/VISU_Actor.h
+++ b/src/OBJECT/VISU_Actor.h
@@ -90,7 +90,10 @@ class VTKOCC_EXPORT VISU_Actor : public SALOME_Actor {
  
   virtual int GetNodeObjId(int theVtkID);
   virtual int GetElemObjId(int theVtkID);
-
+  //pkv f
+  virtual vtkCell* GetElemCell(int theObjID);
+  virtual float* GetNodeCoord(int theObjID);
+  //pkv t
  protected:
   VISU_Actor();
  

diff --git a/src/PIPELINE/VISU_PipeLine.cxx b/src/PIPELINE/VISU_PipeLine.cxx
index 0baaae335b6d08a936edf5021282338211d27ea7..68812380299ef5850e550f12ab64a7c844bc8b41 100644 (file)
--- a/src/PIPELINE/VISU_PipeLine.cxx
+++ b/src/PIPELINE/VISU_PipeLine.cxx
@@ -322,3 +322,14 @@ vtkIdType VISU_PipeLine::GetElemObjID(vtkIdType theVtkID)
 {
   return  myExtractGeometry->GetElemObjId(theVtkID);
 }
+//modified by NIZNHY-PKV Tue Aug 30 12:53:58 2005f
+vtkCell* VISU_PipeLine::GetElemCell(int )
+{
+  return NULL;
+}
+
+float* VISU_PipeLine::GetNodeCoord(int )
+{
+  return NULL;
+}
+//modified by NIZNHY-PKV Tue Aug 30 12:54:01 2005t

diff --git a/src/PIPELINE/VISU_PipeLine.hxx b/src/PIPELINE/VISU_PipeLine.hxx
index c2d6a25f42cfc90ea313bac41d6e50fb27d78724..396925b8b70b3f170c73cb4eae07b779f81cbb3a 100644 (file)
--- a/src/PIPELINE/VISU_PipeLine.hxx
+++ b/src/PIPELINE/VISU_PipeLine.hxx
@@ -32,6 +32,9 @@
 
 #include <vector>
 
+//pkv f
+class vtkCell;
+//pkv t
 template <class T>
 class TVTKSmartPtr: public vtkSmartPointer<T>
 {
@@ -104,7 +107,10 @@ public:
 
   virtual vtkIdType GetNodeObjID(vtkIdType theVtkID);
   virtual vtkIdType GetElemObjID(vtkIdType theVtkID);
-
+  //pkv f
+  virtual vtkCell* GetElemCell(int theObjID);
+  virtual float* GetNodeCoord(int theObjID);
+  //pkv t
 protected:
   VISU_PipeLine();
   VISU_PipeLine(const VISU_PipeLine&);

diff --git a/src/PIPELINE/VISU_ScalarMapPL.cxx b/src/PIPELINE/VISU_ScalarMapPL.cxx
index 5cc88197c09ae331dda5114ecd6f37eb069380e5..56af5b4415e96b46420968ac6dc7bafbd1e0033a 100644 (file)
--- a/src/PIPELINE/VISU_ScalarMapPL.cxx
+++ b/src/PIPELINE/VISU_ScalarMapPL.cxx
@@ -165,6 +165,17 @@ vtkIdType VISU_ScalarMapPL::GetElemObjID(vtkIdType theVtkID)
   aIDx=myProfile->GetElemObjID(aIDx);
   return aIDx;
 }
+//modified by NIZNHY-PKV Tue Aug 30 12:13:53 2005f
+vtkCell* VISU_ScalarMapPL::GetElemCell(int theObjID)
+{
+  return GetProfile()->GetElemCell(theObjID);
+}
+float*  VISU_ScalarMapPL::GetNodeCoord(int theObjID)
+{
+  return GetProfile()->GetNodeCoord(theObjID);
+}
+//modified by NIZNHY-PKV Tue Aug 30 12:13:55 2005t
+
 
 void VISU_ScalarMapPL::Build() {
   myExtractor->SetInput(GetInput2());

diff --git a/src/PIPELINE/VISU_ScalarMapPL.hxx b/src/PIPELINE/VISU_ScalarMapPL.hxx
index bfdffb22977c665c60d725e2f2ce9affeb50310f..7f6e379c8a9859868b247996296b784ec3b3c154 100644 (file)
--- a/src/PIPELINE/VISU_ScalarMapPL.hxx
+++ b/src/PIPELINE/VISU_ScalarMapPL.hxx
@@ -34,7 +34,9 @@
 #include <VISU_Convertor.hxx>
 
 class vtkDataSet;
-
+//pkv f
+class vtkCell;
+//pkv t
 class VISU_Extractor;
 class VISU_FieldTransform;
 
@@ -81,7 +83,10 @@ public:
 
   void SetProfile(const VISU::PProfile& theProfile);
   const VISU::PProfile& GetProfile()const;
-
+  //pkv f
+  vtkCell* GetElemCell(int theObjID);
+  float*  GetNodeCoord(int theObjID);
+  //pkv t
 protected:
   typedef vtkDataSet THook;
   virtual THook* DoHook();