Optimization of filter.

diff --git a/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx b/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx
index 74645d1d363a204ccfb78591790e7a02bf2369b1..404180ed0b16dd84a134308ccef34d1f24a32184 100644 (file)
--- a/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx
+++ b/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx
@@ -192,14 +192,14 @@ vtkUnstructuredGrid *ExtractInfo1(vtkInformationVector *inputVector)
   return usgIn;
 }
 
-void ExtractInfo(vtkInformationVector *inputVector, vtkUnstructuredGrid *& usgIn, const std::string& arrName, vtkDoubleArray *& arr)
+void ExtractInfo3(vtkDataSet *ds, const std::string& arrName, vtkDataArray *& arr, int& idx)
 {
-  usgIn=ExtractInfo1(inputVector);
-  vtkPointData *att(usgIn->GetPointData());
+  vtkPointData *att(ds->GetPointData());
   if(!att)
     throw MZCException("Input dataset has no point data attribute ! Impossible to move mesh !");
   vtkDataArray *zeArr(0);
-  for(int i=0;i<att->GetNumberOfArrays();i++)
+  int i(0);
+  for(;i<att->GetNumberOfArrays();i++)
     {
       vtkDataArray *locArr(att->GetArray(i));
       std::string s(locArr->GetName());
@@ -215,6 +215,16 @@ void ExtractInfo(vtkInformationVector *inputVector, vtkUnstructuredGrid *& usgIn
       oss << "Impossible to locate the array called \"" << arrName << "\" used to move mesh !";
       throw MZCException(oss.str());
     }
+  arr=zeArr;
+  idx=i;
+}
+
+  
+void ExtractInfo2(vtkDataSet *ds, const std::string& arrName, vtkDoubleArray *& arr)
+{
+  vtkDataArray *zeArr(0);
+  int dummy;
+  ExtractInfo3(ds,arrName,zeArr,dummy);
   arr=vtkDoubleArray::SafeDownCast(zeArr);
   if(!arr)
     {
@@ -228,10 +238,10 @@ void ExtractInfo(vtkInformationVector *inputVector, vtkUnstructuredGrid *& usgIn
       oss << "Float64 array called \"" << arrName << "\" has been located but this array has not exactly 3 or 6 components as it should !";
       throw MZCException(oss.str());
     }
-  if(arr->GetNumberOfTuples()!=usgIn->GetNumberOfPoints())
+  if(arr->GetNumberOfTuples()!=ds->GetNumberOfPoints())
     {
       std::ostringstream oss;
-      oss << "Float64-1 components array called \"" << arrName << "\" has been located but the number of tuples is invalid ! Should be " << usgIn->GetNumberOfPoints() << " instead of " << arr->GetNumberOfTuples() << " !";
+      oss << "Float64-1 components array called \"" << arrName << "\" has been located but the number of tuples is invalid ! Should be " << ds->GetNumberOfPoints() << " instead of " << arr->GetNumberOfTuples() << " !";
       throw MZCException(oss.str());
     }
 }
@@ -241,12 +251,34 @@ void ExtractInfo(vtkInformationVector *inputVector, vtkUnstructuredGrid *& usgIn
 class vtkSimpleMode::vtkSimpleModeInternal
 {
 public:
+  vtkSimpleModeInternal():_surface(0) { }
+  vtkPolyData *performConnection(vtkDataSet *ds);
   void setFieldForReal(const std::string& st) { _real=st; }
   std::string getFieldForReal() const { return _real; }
+  ~vtkSimpleModeInternal();
+private:
+  vtkDataSetSurfaceFilter *_surface;
 private:
   std::string _real;
 };
 
+vtkPolyData *vtkSimpleMode::vtkSimpleModeInternal::performConnection(vtkDataSet *ds)
+{
+  if(!_surface)
+    {
+      _surface=vtkDataSetSurfaceFilter::New();
+      _surface->SetInputData(ds);
+    }
+  _surface->Update();
+  return _surface->GetOutput();
+}
+
+vtkSimpleMode::vtkSimpleModeInternal::~vtkSimpleModeInternal()
+{
+  if(_surface)
+    _surface->Delete();
+}
+
 vtkSimpleMode::vtkSimpleMode():Factor(1.),AnimationTime(0.),Internal(new vtkSimpleMode::vtkSimpleModeInternal)
 {
   //this->SetInputArrayToProcess(0,0,0,vtkDataObject::FIELD_ASSOCIATION_POINTS,vtkDataSetAttributes::VECTORS);
@@ -304,14 +336,14 @@ int vtkSimpleMode::RequestInformation(vtkInformation *request, vtkInformationVec
     {
       if(this->Internal->getFieldForReal().empty())
         return 1;
-      vtkUnstructuredGrid *usgIn(0);
+      /*vtkUnstructuredGrid *usgIn(0);
       vtkDoubleArray *arr(0);
       ExtractInfo(inputVector[0],usgIn,this->Internal->getFieldForReal(),arr);
       std::vector<std::string> candidatesArrName(GetPossibleArrayNames(usgIn));
       //
       double ratio(GetOptimalRatioFrom(usgIn,arr));
       std::string optArrNameForReal(FindBestRealAmong(candidatesArrName));
-      std::string optArrNameForImag(FindBestImagAmong(candidatesArrName));
+      std::string optArrNameForImag(FindBestImagAmong(candidatesArrName));*/
       //std::cerr << ratio << std::endl;
       //std::cerr << optArrNameForReal << " * " << optArrNameForImag << std::endl;
     }
@@ -335,13 +367,13 @@ int vtkSimpleMode::RequestData(vtkInformation *request, vtkInformationVector **i
   try
     {
       vtkUnstructuredGrid *usgIn(0);
-      vtkDoubleArray *arrRealBase(0),*arrImagBase(0);
-      ExtractInfo(inputVector[0],usgIn,this->Internal->getFieldForReal(),arrRealBase);
-      vtkSmartPointer<vtkDoubleArray> arrReal(ForceTo3Compo(arrRealBase));
+      usgIn=ExtractInfo1(inputVector[0]);
       //
       int nbPts(usgIn->GetNumberOfPoints());
-      vtkSmartPointer<vtkUnstructuredGrid> step1(vtkSmartPointer<vtkUnstructuredGrid>::New());
-      step1->DeepCopy(usgIn);
+      vtkPolyData *outSurface(this->Internal->performConnection(usgIn));
+      vtkDoubleArray *arrRealBase(0);
+      ExtractInfo2(outSurface,this->Internal->getFieldForReal(),arrRealBase);
+      vtkSmartPointer<vtkDoubleArray> arrReal(ForceTo3Compo(arrRealBase));
       vtkSmartPointer<vtkDoubleArray> arr1(vtkSmartPointer<vtkDoubleArray>::New());
       arr1->SetName(ZE_DISPLACEMENT_NAME1);
       arr1->SetNumberOfComponents(3);
@@ -350,23 +382,29 @@ int vtkSimpleMode::RequestData(vtkInformation *request, vtkInformationVector **i
       const double *srcPt1(arrReal->Begin());
       double cst1(Factor*sin(AnimationTime*2*M_PI));
       std::transform(srcPt1,srcPt1+3*nbPts,ptToFeed1,std::bind2nd(std::multiplies<double>(),cst1));
+      int idx1(outSurface->GetPointData()->AddArray(arr1));
+      outSurface->GetPointData()->SetActiveAttribute(idx1,vtkDataSetAttributes::VECTORS);
       //
-      int idx1(step1->GetPointData()->AddArray(arr1));
-      step1->GetPointData()->SetActiveAttribute(idx1,vtkDataSetAttributes::VECTORS);
-      //
-      vtkSmartPointer<vtkDataSetSurfaceFilter> surface(vtkSmartPointer<vtkDataSetSurfaceFilter>::New());
-      surface->SetInputData(step1);
       //
       vtkSmartPointer<vtkWarpVector> ws(vtkSmartPointer<vtkWarpVector>::New());//vtkNew
-      ws->SetInputConnection(surface->GetOutputPort());
+      ws->SetInputData(outSurface);
       ws->SetScaleFactor(1.);
       ws->SetInputArrayToProcess(idx1,0,0,"vtkDataObject::FIELD_ASSOCIATION_POINTS",ZE_DISPLACEMENT_NAME1);
       ws->Update();
       vtkSmartPointer<vtkDataSet> ds(ws->GetOutput());
       ds->GetPointData()->RemoveArray(idx1);
+      //
+      int idx2(0);
+      {
+        vtkDataArray *dummy(0);
+        ExtractInfo3(ds,this->Internal->getFieldForReal(),dummy,idx2);
+      }
+      ds->GetPointData()->SetActiveAttribute(idx2,vtkDataSetAttributes::SCALARS);
+      //
       vtkInformation *outInfo(outputVector->GetInformationObject(0));
       vtkPolyData *output(vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())));
       output->ShallowCopy(ds);
+      
     }
   catch(MZCException& e)
     {

diff --git a/src/Plugins/SimpleMode/ParaViewPlugin/Resources/SimpleModeServer.xml b/src/Plugins/SimpleMode/ParaViewPlugin/Resources/SimpleModeServer.xml
index 93bcd3487fb1e3dfc57e306ea38f7bdd47b92412..bd762afad23674ec3781b01bfe0dd4b1fc864fee 100644 (file)
--- a/src/Plugins/SimpleMode/ParaViewPlugin/Resources/SimpleModeServer.xml
+++ b/src/Plugins/SimpleMode/ParaViewPlugin/Resources/SimpleModeServer.xml
@@ -21,7 +21,7 @@
                             default_values="0;0;0;3"
                             default_values_delimiter=";"
                             element_types="0 0 0 0 2"
-                            name="Real"
+                            name="Mode Array Selection"
                             number_of_elements="5">
         <!-- default value=1 so normals go to the right place -->
         <ArrayListDomain attribute_type="Vectors"
@@ -39,7 +39,7 @@
           </RequiredProperties>
         </FieldDataDomain>
         <Documentation>
-Select the array that represent the real part of the complex mode.
+Select the array that represents the requested mode.
         </Documentation>
       </StringVectorProperty>
 
@@ -51,7 +51,7 @@ Select the array that represent the real part of the complex mode.
         <BoundsDomain name="range" mode="array_scaled_extent">
           <RequiredProperties>
             <Property function="Input" name="Input" />
-            <Property function="ArraySelection" name="Real" />
+            <Property function="ArraySelection" name="Mode Array Selection" />
           </RequiredProperties>
         </BoundsDomain>
         <Documentation>The value of this property sets the scale factor applied for all nodes displacement.</Documentation>