Changeset 6162


Ignore:
Timestamp:
Mar 20, 2016 10:00:11 PM (8 years ago)
Author:
ldelgass
Message:

merge r5843:5844 from 1.8 branch

Location:
vtkvis/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • vtkvis/trunk

  • vtkvis/trunk/Contour2D.cpp

    r5835 r6162  
    1212#include <vtkPointData.h>
    1313#include <vtkCellData.h>
    14 #include <vtkTrivialProducer.h>
    1514#include <vtkCellDataToPointData.h>
    1615#include <vtkContourFilter.h>
    … …  
    127126        vtkAlgorithmOutput *dsOutput = NULL;
    128127        vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
    129         vtkSmartPointer<vtkTrivialProducer> prod;
    130128
    131129        if (ds->GetPointData() == NULL ||
    … …  
    143141            }
    144142        } else {
    145             prod = vtkSmartPointer<vtkTrivialProducer>::New();
    146             prod->SetOutput(ds);
    147             dsOutput = prod->GetOutputPort();
     143            dsOutput = _dataSet->getProducerPort();
    148144        }
    149145

  • vtkvis/trunk/Contour3D.cpp

    r5835 r6162  
    1212#include <vtkPointData.h>
    1313#include <vtkCellData.h>
    14 #include <vtkTrivialProducer.h>
    1514#include <vtkCellDataToPointData.h>
    1615#include <vtkContourFilter.h>
    … …  
    122121        vtkAlgorithmOutput *dsOutput = NULL;
    123122        vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
    124         vtkSmartPointer<vtkTrivialProducer> prod;
    125123
    126124        if (ds->GetPointData() == NULL ||
    … …  
    138136            }
    139137        } else {
    140             prod = vtkSmartPointer<vtkTrivialProducer>::New();
    141             prod->SetOutput(ds);
    142             dsOutput = prod->GetOutputPort();
     138            dsOutput = _dataSet->getProducerPort();
    143139        }
    144140

  • vtkvis/trunk/DataSet.h

    r4739 r6162  
    1212#include <vtkDataSet.h>
    1313#include <vtkDataSetReader.h>
     14#include <vtkAlgorithmOutput.h>
     15#include <vtkTrivialProducer.h>
    1416
    1517#include <string>
    … …  
    6163
    6264    vtkDataSet *getVtkDataSet();
     65
     66    vtkAlgorithmOutput *getProducerPort()
     67    {
     68        if (_producer == NULL) {
     69            _producer = vtkSmartPointer<vtkTrivialProducer>::New();
     70            _producer->SetOutput(_dataSet);
     71        }
     72        return _producer->GetOutputPort();
     73    }
    6374
    6475    const char *getVtkType() const;
    … …  
    137148    std::string _name;
    138149    vtkSmartPointer<vtkDataSet> _dataSet;
     150    vtkSmartPointer<vtkTrivialProducer> _producer;
    139151    bool _visible;
    140152    double _opacity;

  • vtkvis/trunk/HeightMap.cpp

    r5835 r6162  
    1111#include <vtkPointData.h>
    1212#include <vtkCellData.h>
    13 #include <vtkTrivialProducer.h>
    1413#include <vtkCellDataToPointData.h>
    1514#include <vtkPolyDataMapper.h>
    … …  
    230229        vtkAlgorithmOutput *dsOutput = NULL;
    231230        vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
    232         vtkSmartPointer<vtkTrivialProducer> prod;
    233231
    234232        if (ds->GetPointData() == NULL ||
    … …  
    247245            }
    248246        } else {
    249             prod = vtkSmartPointer<vtkTrivialProducer>::New();
    250             prod->SetOutput(ds);
    251             dsOutput = prod->GetOutputPort();
     247            dsOutput = _dataSet->getProducerPort();
    252248        }
    253249

  • vtkvis/trunk/Warp.cpp

    r5835 r6162  
    1313#include <vtkPointData.h>
    1414#include <vtkCellData.h>
    15 #include <vtkTrivialProducer.h>
    1615#include <vtkCellDataToPointData.h>
    1716#include <vtkPolyDataMapper.h>
    … …  
    112111    vtkAlgorithmOutput *dsOutput = NULL;
    113112    vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
    114     vtkSmartPointer<vtkTrivialProducer> prod;
    115113    if (ds->GetPointData() == NULL ||
    116114        ds->GetPointData()->GetVectors() == NULL) {
    … …  
    128126        }
    129127    } else {
    130         prod = vtkSmartPointer<vtkTrivialProducer>::New();
    131         prod->SetOutput(ds);
    132         dsOutput = prod->GetOutputPort();
     128        dsOutput = _dataSet->getProducerPort();
    133129    }
    134130
Note: See TracChangeset for help on using the changeset viewer.