Changeset 236

Timestamp:

06/28/11 07:36:13 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src4/xmlio

Files:

• main_server.cpp (modified) (1 diff)
• vtk/lscereader.cpp (modified) (10 diffs)
• vtk/lscereader.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src4/xmlio/main_server.cpp

@@ -84 +84 @@
        
        //vtkLSCEReader::ShowVariable("test/vtk/file_coslatgrid.nc4", "NTEMP");
-       //vtkLSCEReader::ShowVariable("test/vtk/ucov.nc4", "ucov");
-       vtkLSCEReader::ShowVariable("test/vtk/sampleCurveGrid4.nc4", "sample");
+       vtkLSCEReader::ShowVariable("test/vtk/ucov.nc4", "ucov");
+       //vtkLSCEReader::ShowVariable("test/vtk/sampleCurveGrid4.nc4", "sample");
        //vtkLSCEReader::ShowVariable("test/vtk/sampleGenGrid3.nc4", "sample");
        //vtkLSCEReader::ShowVariable("test/vtk/file_xboundsybounds.nc4", "A");

XMLIO_V2/dev/dev_rv/src4/xmlio/vtk/lscereader.cpp

@@ -12 +12 @@
 #include "vtkInformationVector.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
+
+#include "vtkPointLocator.h"
 
 #include <vtkProperty.h>
@@ -82 +84 @@
       {
          this->RemoveAllSelectedVariables();
-         this->AddVariableToSelection(variable);
+         if (Reader->hasVariable(variable))
+            this->AddVariableToSelection(variable);
          this->Modified();
       }
@@ -457 +460 @@
 
       //----------------------------------------------------------------
+      
+      void vtkLSCEReader::GetDimensions(const vtkStdString & xcoordinate,
+                                        const vtkStdString & ycoordinate,
+                                        const vtkStdString & zcoordinate,
+                                        vtkIntArray * dimensions, bool bounds)
+      {
+         int a = (bounds) ? 1 : 0;
+         dimensions->InsertNextValue
+            ((Reader->getDimensions(&xcoordinate).begin())->second + a);
+         dimensions->InsertNextValue
+            ((Reader->getDimensions(&ycoordinate).begin())->second + a);
+         if (zcoordinate.size() > 0)
+         {
+            dimensions->InsertNextValue
+               ((Reader->getDimensions(&zcoordinate).begin())->second + a);
+         }
+         else
+         {
+            dimensions->InsertNextValue(1);
+         }
+      }
+      
+      void vtkLSCEReader::GetDimensions(const vtkStdString & xcoordinate,
+                                        const vtkStdString & zcoordinate,
+                                        vtkIntArray * dimensions, bool bounds)
+      {
+         int a = (bounds) ? 1 : 0;
+         dimensions->InsertNextValue
+            (Reader->getDimensions(&xcoordinate)[Reader->getLonCoordName(xcoordinate)] + a);
+         dimensions->InsertNextValue
+            (Reader->getDimensions(&xcoordinate)[Reader->getLatCoordName(xcoordinate)] + a);
+         if (zcoordinate.size() > 0)
+         {
+            dimensions->InsertNextValue
+               ((Reader->getDimensions(&zcoordinate).begin())->second + a);
+         }
+         else
+         {
+            dimensions->InsertNextValue(1);
+         }
+      }
+
+      //----------------------------------------------------------------
       void vtkLSCEReader::GetPoints(const vtkStdString & xcoordinate,
                                     const vtkStdString & ycoordinate,
@@ -656 +702 @@
 
       //----------------------------------------------------------------
-
+      
       int vtkLSCEReader::RequestData
                            (vtkInformation       *  vtkNotUsed(request),
@@ -665 +711 @@
          vtkDataSet     *  output  = vtkDataSet::GetData(outInfo);
          
-         std::cout << this->CurGridType << std::endl;
-
          if (!output)
          {
@@ -689 +733 @@
          vtkStructuredGrid   * soutput  = vtkStructuredGrid::SafeDownCast(output);
 
-         if (routput)
+         if (routput && !this->VarNames.empty())
          { // Grille rectiliniéaire
             vtkSmartPointer<vtkFloatArray>
@@ -711 +755 @@
          }
 
-         if (soutput)
+         if (soutput && !this->VarNames.empty())
          { // Grille structurée
              
@@ -720 +764 @@
             GetPoints(Reader->getLonCoordName(*VarNames.begin()),
                       Reader->getLatCoordName(*VarNames.begin()),
-                      Reader->getVertCoordName(*VarNames.begin()), false, true, pts, dims);
-
-            AddScalarData(soutput, *VarNames.begin(), 0, false);
+                      Reader->getVertCoordName(*VarNames.begin()), true, true, pts, dims);
+
+            AddScalarData(soutput, *VarNames.begin(), 0, true);
             CreateStructuredGrid(soutput, outInfo, pts, dims);
          }
 
-         if (uoutput)
+         if (uoutput  && !this->VarNames.empty())
          { // Grille non-structurée
 
@@ -735 +779 @@
             //CreateSimpleGrid (0, 12, 0, 12, 0, 12, pts, cells, dims);
             //std::cout << Reader->getVertCoordName(*VarNames.begin()) << std::endl;
+            
+            std::cout << Reader->getNbVertex(*VarNames.begin()) << std::endl;
+            
             GetCellsAndPoints(Reader->getLonCoordName(*VarNames.begin()),
                               Reader->getLatCoordName(*VarNames.begin()),
@@ -773 +820 @@
             output->Delete();
          }
+
+         vtkRectilinearGrid  * routput  = vtkRectilinearGrid::SafeDownCast(output);
+         vtkStructuredGrid   * soutput  = vtkStructuredGrid::SafeDownCast(output);
+         
+         if (routput && !this->VarNames.empty())
+         { // Grille rectiliniéaire
+            vtkSmartPointer<vtkIntArray> dims = vtkSmartPointer<vtkIntArray>::New();
+            this->GetDimensions(Reader->getLonCoordName(*VarNames.begin()),
+                                Reader->getLatCoordName(*VarNames.begin()),
+                                Reader->getVertCoordName(*VarNames.begin()),
+                                dims, true);
+            
+            int extent[6] = { 0, dims->GetValue(0) - 1
+                            , 0, dims->GetValue(1) - 1
+                            , 0, dims->GetValue(2) - 1};
+            outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),extent,6);
+         }
+         
+         if (soutput && !this->VarNames.empty())
+         { // Grille structurée
+            
+            vtkSmartPointer<vtkIntArray> dims = vtkSmartPointer<vtkIntArray>::New();
+            this->GetDimensions(Reader->getLonCoordName(*VarNames.begin()),
+                                Reader->getVertCoordName(*VarNames.begin()),
+                                dims, true);
+            
+            int extent[6] = { 0, dims->GetValue(0) - 1
+                            , 0, dims->GetValue(1) - 1
+                            , 0, dims->GetValue(2) - 1};
+            outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),extent,6);
+         }
+            
          return (1);
       }

XMLIO_V2/dev/dev_rv/src4/xmlio/vtk/lscereader.hpp

@@ -162 +162 @@
                                std::size_t record, bool bounds);
             
+            void GetDimensions(const vtkStdString & xcoordinate,
+                               const vtkStdString & ycoordinate,
+                               const vtkStdString & zcoordinate,
+                              vtkIntArray * dimensions, bool bounds);
+            
+            void GetDimensions(const vtkStdString & xcoordinate,
+                               const vtkStdString & zcoordinate,
+                               vtkIntArray * dimensions, bool bounds);
+             
             //ETX