Changeset 5406 for nanovis/branches


Ignore:
Timestamp:
May 4, 2015, 4:31:25 AM (9 years ago)
Author:
ldelgass
Message:

backport from trunk: remove unused ctor params

Location:
nanovis/branches/1.2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • nanovis/branches/1.2/Volume.cpp

    r4904 r5406  
    3131double Volume::valueMax = 1.0;
    3232
    33 Volume::Volume(float x, float y, float z,
    34                int width, int height, int depth,
     33Volume::Volume(int width, int height, int depth,
    3534               int numComponents, float *data,
    3635               double vmin, double vmax, double nonZeroMin) :
    … …  
    5150    _cutplanesVisible(true),
    5251    _tex(NULL),
    53     _position(x, y, z),
     52    _position(0, 0, 0),
    5453    _scale(1, 1, 1),
    5554    _numSlices(512),

  • nanovis/branches/1.2/Volume.h

    r4904 r5406  
    5858     * each axis.  Sample spacing may differ between X, Y and Z
    5959     *
    60      * \param x X location
    61      * \param y Y location
    62      * \param z Z location
    6360     * \param width Number of samples in X
    6461     * \param height Number of samples in Y
    … …  
    7067     * \param nonZeroMin Scalar minimum which is greater than zero
    7168     */
    72     Volume(float x, float y, float z,
    73            int width, int height, int depth,
     69    Volume(int width, int height, int depth,
    7470           int numComponents,
    7571           float *data,

  • nanovis/branches/1.2/VolumeInterpolator.cpp

    r4908 r5406  
    136136        _numComponents = volume->numComponents();
    137137        _numBytes = _dataCount * _numComponents * sizeof(float);
    138         Vector3f pos = volume->getPosition();
    139         _volume = new Volume(pos.x, pos.y, pos.z,
    140                              volume->width(),
     138        _volume = new Volume(volume->width(),
    141139                             volume->height(),
    142140                             volume->depth(),

  • nanovis/branches/1.2/ZincBlendeReconstructor.cpp

    r4904 r5406  
    260260    cellSize.z = 0.25 / depth;
    261261
    262     zincBlendeVolume = new ZincBlendeVolume(origin.x, origin.y, origin.z,
    263                                             width, height, depth, 4,
     262    zincBlendeVolume = new ZincBlendeVolume(width, height, depth, 4,
    264263                                            fourAnionVolume, fourCationVolume,
    265264                                            vmin, vmax, nzero_min, cellSize);
     265
     266    zincBlendeVolume->xAxis.setRange(origin.x, origin.x + delta.x * (width-1));
     267    zincBlendeVolume->yAxis.setRange(origin.y, origin.y + delta.y * (height-1));
     268    zincBlendeVolume->zAxis.setRange(origin.z, origin.z + delta.z * (depth-1));
    266269
    267270    return zincBlendeVolume;
    … …  
    338341    cellSize.z = 0.25 / depth;
    339342
    340     zincBlendeVolume = new ZincBlendeVolume(origin.x, origin.y, origin.z,
    341                                             width, height, depth, 4,
     343    zincBlendeVolume = new ZincBlendeVolume(width, height, depth, 4,
    342344                                            fourAnionVolume, fourCationVolume,
    343345                                            vmin, vmax, nzero_min, cellSize);
     346
     347    zincBlendeVolume->xAxis.setRange(origin.x, origin.x + delta.x * (width-1));
     348    zincBlendeVolume->yAxis.setRange(origin.y, origin.y + delta.y * (height-1));
     349    zincBlendeVolume->zAxis.setRange(origin.z, origin.z + delta.z * (depth-1));
    344350
    345351    return zincBlendeVolume;

  • nanovis/branches/1.2/ZincBlendeVolume.cpp

    r4904 r5406  
    2424using namespace vrmath;
    2525
    26 ZincBlendeVolume::ZincBlendeVolume(float x, float y, float z,
    27                                    int width, int height, int depth,
     26ZincBlendeVolume::ZincBlendeVolume(int width, int height, int depth,
    2827                                   int numComponents,
    2928                                   float *dataVolumeA, float *dataVolumeB,
    3029                                   double vmin, double vmax, double nonZeroMin,
    3130                                   const Vector3f& cellSz) :
    32     Volume(x, y, z, width, height, depth, numComponents, dataVolumeA, vmin, vmax, nonZeroMin),
     31    Volume(width, height, depth, numComponents, dataVolumeA, vmin, vmax, nonZeroMin),
    3332    cellSize(cellSz)
    3433{

  • nanovis/branches/1.2/ZincBlendeVolume.h

    r4923 r5406  
    2121{
    2222public:
    23     ZincBlendeVolume(float x, float y, float z,
    24                      int width, int height, int depth, int numComponents,
     23    ZincBlendeVolume(int width, int height, int depth, int numComponents,
    2524                     float *dataVolumeA, float *dataVolumeB,
    2625                     double vmin, double vmax, double nonZeroMin,

  • nanovis/branches/1.2/nanovis.cpp

    r5405 r5406  
    255255    }
    256256
    257     Volume *volume = new Volume(0.f, 0.f, 0.f,
    258                                 width, height, depth,
     257    Volume *volume = new Volume(width, height, depth,
    259258                                numComponents,
    260259                                data, vmin, vmax, nonZeroMin);
Note: See TracChangeset for help on using the changeset viewer.