Changeset 4236


Ignore:
Timestamp:
Mar 11, 2014 11:31:16 AM (10 years ago)
Author:
ldelgass
Message:

merge r3991:3995 from trunk

Location:
branches/1.3
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/packages/vizservers/vtkvis/Image.cpp

    r4234 r4236  
    102102
    103103    mapper->Update();
     104
     105    TRACE("Window: %g Level: %g", getWindow(), getLevel());
    104106}
    105107

  • branches/1.3/packages/vizservers/vtkvis/Image.h

    r4234 r4236  
    8484    }
    8585
     86    double getWindow()
     87    {
     88        vtkImageProperty *property = getImageProperty();
     89        if (property == NULL)
     90            return 0.0;
     91
     92        return property->GetColorWindow();
     93    }
     94
    8695    void setWindow(double window)
    8796    {
    … …  
    91100
    92101        property->SetColorWindow(window);
     102    }
     103
     104    double getLevel()
     105    {
     106        vtkImageProperty *property = getImageProperty();
     107        if (property == NULL)
     108            return 0.0;
     109
     110        return property->GetColorLevel();
    93111    }
    94112

  • branches/1.3/packages/vizservers/vtkvis/Makefile.in

    r4232 r4236  
    118118DEFINES         += -DUSE_THREADS
    119119endif
    120 VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="5(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeFontConfig,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)"
     120VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)"
    121121DEFINES         += -DUSE_VTK6 $(VTK_MOD_DEFS)
    122122ifdef NEW_SCALAR_BAR

  • branches/1.3/packages/vizservers/vtkvis/PPMWriter.cpp

    r3615 r4236  
    8080    unsigned char *destRowPtr = mesg + length - bytesPerRow;
    8181    int y;
    82     unsigned char *srcRowPtr = const_cast<unsigned char *>(data);
     82    const unsigned char *srcRowPtr = data;
    8383    for (y = 0; y < height; y++) {
    8484        memcpy(destRowPtr, srcRowPtr, bytesPerRow);
    … …  
    155155    size_t bytesPerRow = width * 3;
    156156    int y;
    157     unsigned char *srcRowPtr = const_cast<unsigned char *>(data);
     157    const unsigned char *srcRowPtr = data;
    158158    for (y = height + 1; y >= 2; y--) {
    159159        iov[y].iov_base = srcRowPtr;

  • branches/1.3/packages/vizservers/vtkvis/RenderServer.cpp

    r3844 r4236  
    467467        if (response == NULL)
    468468            continue;
    469         if (fwrite(response->message(), sizeof(char), response->length(),
     469        if (fwrite(response->message(), sizeof(unsigned char), response->length(),
    470470                   g_fOut) != response->length()) {
    471471            ERROR("short write while trying to write %ld bytes",

  • branches/1.3/packages/vizservers/vtkvis/Renderer.cpp

    r4219 r4236  
    169169    setViewAngle(_windowHeight);
    170170    initAxes();
     171    //initOrientationMarkers();
    171172    initCamera();
    172173    addColorMap("default", ColorMap::getDefault());
    … …  
    811812
    812813    _needsRedraw = true;
     814}
     815
     816
     817void Renderer::initOrientationMarkers()
     818{
     819    if (_axesActor == NULL) {
     820        _axesActor = vtkSmartPointer<vtkAxesActor>::New();
     821    }
     822    if (_annotatedCubeActor == NULL) {
     823        _annotatedCubeActor = vtkSmartPointer<vtkAnnotatedCubeActor>::New();
     824    }
     825    _renderer->AddViewProp(_axesActor);
    813826}
    814827
    … …  
    46034616
    46044617/**
     4618 * \brief Control parameters of depth peeling algorithm
     4619 *
     4620 * \param occlusionRatio define the threshold under which the algorithm
     4621 * stops to iterate over peel layers. This is the ratio of the number of
     4622 * pixels that have been touched by the last layer over the total number
     4623 * of pixels of the viewport area. Initial value is 0.0, meaning rendering
     4624 * have to be exact. Greater values may speed-up the rendering with small
     4625 * impact on the quality.
     4626 * \param maxPeels define the maximum number of peeling layers. Initial
     4627 * value is 100. A special value of 0 means no maximum limit. It has to be
     4628 * a positive value.
     4629 */
     4630void Renderer::setDepthPeelingParams(double occlusionRatio, int maxPeels)
     4631{
     4632    _renderer->SetOcclusionRatio(occlusionRatio);
     4633    _renderer->SetMaximumNumberOfPeels(maxPeels);
     4634    _needsRedraw = true;
     4635}
     4636
     4637/**
    46054638 * \brief Control the use of the depth peeling algorithm for transparency
    46064639 */

  • branches/1.3/packages/vizservers/vtkvis/Renderer.h

    r4231 r4236  
    2020#include <vtkCubeAxesActor.h>
    2121#endif
     22#include <vtkAxesActor.h>
     23#include <vtkAnnotatedCubeActor.h>
    2224#include <vtkScalarBarActor.h>
    2325#include <vtkRenderer.h>
    … …  
    276278    void setUseDepthPeeling(bool state);
    277279
     280    void setDepthPeelingParams(double occlusionRatio = 0.0, int maxPeels = 0);
     281
    278282    void eventuallyRender();
    279283
    … …  
    10431047
    10441048    void sceneBoundsChanged();
     1049
     1050    void initOrientationMarkers();
    10451051
    10461052    void initAxes();
    … …  
    11411147    vtkSmartPointer<vtkCubeAxesActor> _cubeAxesActor;
    11421148#endif
     1149    vtkSmartPointer<vtkAxesActor> _axesActor;
     1150    vtkSmartPointer<vtkAnnotatedCubeActor> _annotatedCubeActor;
    11431151    vtkSmartPointer<vtkScalarBarActor> _scalarBarActor;
    11441152    vtkSmartPointer<vtkRenderer> _renderer;

  • branches/1.3/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

    r4231 r4236  
    15331533 * n-th point (ratio) or by random sample
    15341534 *
     1535 * \param id DataSet ID
    15351536 * \param max Maximum number of glyphs to display, negative means display all
    15361537 * \param random Flag to enable/disable random sampling

  • branches/1.3/packages/vizservers/vtkvis/TGAWriter.cpp

    r3615 r4236  
    7373    memcpy(mesg, command, cmdLength);
    7474    memcpy(mesg + cmdLength, header, headerLength);
    75     memcpy(mesg + cmdLength + headerLength,
    76            const_cast<unsigned char *>(data), dataLength);
     75    memcpy(mesg + cmdLength + headerLength, data, dataLength);
    7776
    7877    Response *response = NULL;
    … …  
    139138    iov[1].iov_len = headerLength;
    140139    // Image data **must be BGR(A)!**
    141     iov[2].iov_base = const_cast<unsigned char *>(data);
     140    iov[2].iov_base = data;
    142141    iov[2].iov_len = dataLength;
    143142
Note: See TracChangeset for help on using the changeset viewer.