Changeset 3613


Ignore:
Timestamp:
Apr 3, 2013, 2:47:13 AM (7 years ago)
Author:
ldelgass
Message:

Include namespace in header guard defines

Location:
trunk/packages/vizservers/nanovis
Files:
46 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/Axis.h

    r3611 r3613  
    55 * Authors: George A. Howlett <gah@purdue.edu>
    66 */
    7 #ifndef AXIS_H
    8 #define AXIS_H
     7#ifndef NV_AXIS_H
     8#define NV_AXIS_H
    99
    1010#include <stdlib.h>
  • trunk/packages/vizservers/nanovis/AxisRange.h

    r3611 r3613  
    55 * Authors: George A. Howlett <gah@purdue.edu>
    66 */
    7 #ifndef AXIS_RANGE_H
    8 #define AXIS_RANGE_H
     7#ifndef NV_AXIS_RANGE_H
     8#define NV_AXIS_RANGE_H
    99
    1010#include <string.h>
  • trunk/packages/vizservers/nanovis/BucketSort.h

    r3502 r3613  
    44 *
    55 */
    6 #ifndef BUCKETSORT_H
    7 #define BUCKETSORT_H
     6#ifndef PCA_BUCKETSORT_H
     7#define PCA_BUCKETSORT_H
    88
    99#include <vector>
  • trunk/packages/vizservers/nanovis/Chain.h

    r3611 r3613  
    2222 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    2323 */
    24 #ifndef CHAIN_H
    25 #define CHAIN_H
     24#ifndef NV_CHAIN_H
     25#define NV_CHAIN_H
    2626
    2727namespace nv {
  • trunk/packages/vizservers/nanovis/CircularQueue.h

    r2877 r3613  
    1414* @author Kjell Hedström, hedstrom@kjellkod.cc */
    1515
    16 #ifndef CIRCULARFIFO_H_
    17 #define CIRCULARFIFO_H_
     16#ifndef CIRCULARFIFO_H
     17#define CIRCULARFIFO_H
    1818
    1919/** Circular Fifo (a.k.a. Circular Buffer)
     
    181181}
    182182
    183 #endif /* CIRCULARFIFO_H_ */
     183#endif
  • trunk/packages/vizservers/nanovis/CmdProc.h

    r3502 r3613  
    44 *
    55 */
    6 /*
    7  *-------------------------------------------------------------------------------
    8  *
    9  * CmdSpec.h --
    10  *
    11  *      Generic function prototype of CmdOptions.
    12  *
    13  *-------------------------------------------------------------------------------
    14  */
    15 
    16 #ifndef CMDSPEC_H
    17 #define CMDSPEC_H
     6#ifndef RAPPTURE_CMDPROC_H
     7#define RAPPTURE_CMDPROC_H
    188
    199namespace Rappture {
    2010
    21 /*
    22  *-------------------------------------------------------------------------------
    23  *
    24  * CmdSpec --
    25  *
    26  *      Structure to specify a set of operations for a Tcl command.
    27  *      This is passed to the Blt_GetOp procedure to look
    28  *      for a function pointer associated with the operation name.
    29  *
    30  *-------------------------------------------------------------------------------
     11/**
     12 * Structure to specify a set of operations for a Tcl command.
     13 * This is passed to the Blt_GetOp procedure to look
     14 * for a function pointer associated with the operation name.
    3115 */
    3216typedef struct {
    33     const char *name;           /* Name of operation */
    34     int minChars;               /* Minimum # characters to disambiguate */
     17    const char *name;           /**< Name of operation */
     18    int minChars;               /**< Minimum # characters to disambiguate */
    3519    Tcl_ObjCmdProc *proc;
    36     int minArgs;                /* Minimum # args required */
    37     int maxArgs;                /* Maximum # args required */
    38     const char *usage;          /* Usage message */
     20    int minArgs;                /**< Minimum # args required */
     21    int maxArgs;                /**< Maximum # args required */
     22    const char *usage;          /**< Usage message */
    3923} CmdSpec;
    4024
    4125typedef enum {
    42     CMDSPEC_ARG0,               /* Op is the first argument. */
    43     CMDSPEC_ARG1,               /* Op is the second argument. */
    44     CMDSPEC_ARG2,               /* Op is the third argument. */
    45     CMDSPEC_ARG3,               /* Op is the fourth argument. */
    46     CMDSPEC_ARG4                /* Op is the fifth argument. */
     26    CMDSPEC_ARG0,               /**< Op is the first argument. */
     27    CMDSPEC_ARG1,               /**< Op is the second argument. */
     28    CMDSPEC_ARG2,               /**< Op is the third argument. */
     29    CMDSPEC_ARG3,               /**< Op is the fourth argument. */
     30    CMDSPEC_ARG4                /**< Op is the fifth argument. */
    4731} CmdSpecIndex;
    4832
     
    5842}
    5943
    60 #endif /* CMDSPEC_H */
     44#endif
  • trunk/packages/vizservers/nanovis/Command.h

    r3611 r3613  
    99 *   Leif Delgass <ldelgass@purdue.edu>
    1010 */
    11 #ifndef COMMAND_H
    12 #define COMMAND_H
     11#ifndef NV_COMMAND_H
     12#define NV_COMMAND_H
    1313
    1414#include <tcl.h>
  • trunk/packages/vizservers/nanovis/ContourLineFilter.h

    r3611 r3613  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    2 #ifndef CONTOURLINEFILTER_H
    3 #define CONTOURLINEFILTER_H
     2#ifndef NV_CONTOURLINEFILTER_H
     3#define NV_CONTOURLINEFILTER_H
    44
    55#include <list>
  • trunk/packages/vizservers/nanovis/ConvexPolygon.h

    r3611 r3613  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * ConvexPolygon.h: convex polygon class
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    54 *
    6  * ======================================================================
    7  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    8  *           Purdue Rendering and Perceptualization Lab (PURPL)
    9  *
    10  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    11  *
    12  *  See the file "license.terms" for information on usage and
    13  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    14  * ======================================================================
     5 * Authors:
     6 *   Wei Qiao <qiaow@purdue.edu>
    157 */
    16 #ifndef _CONVEX_POLYGON_H_
    17 #define _CONVEX_POLYGON_H_
     8#ifndef NV_CONVEX_POLYGON_H
     9#define NV_CONVEX_POLYGON_H
    1810
    1911#include <assert.h>
  • trunk/packages/vizservers/nanovis/Flow.h

    r3611 r3613  
    99 *   Leif Delgass <ldelgass@purdue.edu>
    1010 */
    11 
    12 #ifndef FLOW_H
    13 #define FLOW_H
     11#ifndef NV_FLOW_H
     12#define NV_FLOW_H
    1413
    1514#include <tr1/unordered_map>
  • trunk/packages/vizservers/nanovis/FlowBox.h

    r3611 r3613  
    99 *   Leif Delgass <ldelgass@purdue.edu>
    1010 */
    11 #ifndef FLOWBOX_H
    12 #define FLOWBOX_H
     11#ifndef NV_FLOWBOX_H
     12#define NV_FLOWBOX_H
    1313
    1414#include <string>
  • trunk/packages/vizservers/nanovis/FlowCmd.h

    r3611 r3613  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * FlowCmd.h
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    54 *
    6  *      This modules creates the Tcl interface to the nanovis server.  The
    7  *      communication protocol of the server is the Tcl language.  Commands
    8  *      given to the server by clients are executed in a safe interpreter and
    9  *      the resulting image rendered offscreen is returned as BMP-formatted
    10  *      image data.
    11  *
    12  * ======================================================================
    13  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    14  *           Insoo Woo <iwoo@purdue.edu>
    15  *           Michael McLennan <mmclennan@purdue.edu>
    16  *           Purdue Rendering and Perceptualization Lab (PURPL)
    17  *
    18  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    19  *
    20  *  See the file "license.terms" for information on usage and
    21  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    22  * ======================================================================
     5 * Authors:
     6 *   Wei Qiao <qiaow@purdue.edu>
     7 *   Insoo Woo <iwoo@purdue.edu>
     8 *   Michael McLennan <mmclennan@purdue.edu>
    239 */
    24 #ifndef FLOWCMD_H
    25 #define FLOWCMD_H
     10#ifndef NV_FLOWCMD_H
     11#define NV_FLOWCMD_H
    2612
    2713#include <tcl.h>
  • trunk/packages/vizservers/nanovis/FlowParticles.h

    r3611 r3613  
    99 *   Leif Delgass <ldelgass@purdue.edu>
    1010 */
    11 #ifndef _FLOWPARTICLES_H
    12 #define _FLOWPARTICLES_H
     11#ifndef NV_FLOWPARTICLES_H
     12#define NV_FLOWPARTICLES_H
    1313
    1414#include <cassert>
  • trunk/packages/vizservers/nanovis/FlowTypes.h

    r3611 r3613  
    99 *   Leif Delgass <ldelgass@purdue.edu>
    1010 */
    11 #ifndef FLOWTYPES_H
    12 #define FLOWTYPES_H
     11#ifndef NV_FLOWTYPES_H
     12#define NV_FLOWTYPES_H
    1313
    1414namespace nv {
  • trunk/packages/vizservers/nanovis/GradientFilter.cpp

    r3559 r3613  
    1414#include "GradientFilter.h"
    1515
     16using namespace nv;
     17
    1618#ifndef SQR
    1719#define SQR(a) ((a) * (a))
     
    9597#endif
    9698
    97 int
    98 getNextPowerOfTwo(int n)
    99 {
    100     int i;
    101 
    102     i = 1;
    103     while (i < n) {
    104         i *= 2;
    105     }
    106 
    107     return i;
    108 }
    109 
    110 static unsigned char getVoxel8(int x, int y, int z)
     99static unsigned char
     100getVoxel8(int x, int y, int z)
    111101{
    112102    return ((unsigned char*)g_volData)[z * g_numOfSlices[0] * g_numOfSlices[1] +
     
    115105}
    116106
    117 static unsigned short getVoxel16(int x, int y, int z)
     107static unsigned short
     108getVoxel16(int x, int y, int z)
    118109{
    119110    return ((unsigned short*)g_volData)[z * g_numOfSlices[0] * g_numOfSlices[1] +
     
    122113}
    123114
    124 static float getVoxelFloat(int x, int y, int z)
     115static float
     116getVoxelFloat(int x, int y, int z)
    125117{
    126118    return ((float*)g_volData)[z * g_numOfSlices[0] * g_numOfSlices[1] +
     
    129121}
    130122
    131 static float getVoxel(int x, int y, int z, DataType dataType)
     123static float
     124getVoxel(int x, int y, int z, nv::DataType dataType)
    132125{
    133126    switch (dataType) {
    134         case DATRAW_UCHAR:
    135             return (float)getVoxel8(x, y, z);
    136             break;
    137         case DATRAW_USHORT:
    138             return (float)getVoxel16(x, y, z);
    139             break;
    140         case DATRAW_FLOAT :
    141             return (float)getVoxelFloat(x, y, z);
    142             break;
    143         default:
    144             ERROR("Unsupported data type");
    145             exit(1);
    146             break;
     127    case nv::DATRAW_UCHAR:
     128        return (float)getVoxel8(x, y, z);
     129        break;
     130    case nv::DATRAW_USHORT:
     131        return (float)getVoxel16(x, y, z);
     132        break;
     133    case nv::DATRAW_FLOAT:
     134        return (float)getVoxelFloat(x, y, z);
     135        break;
     136    default:
     137        ERROR("Unsupported data type");
     138        exit(1);
    147139    }
    148140    return 0.0;
    149141}
    150142
    151 void computeGradients(float *gradients, void *volData, int *sizes,
    152                       float *spacing, DataType dataType)
    153 {
    154     ::g_volData = volData;
     143void
     144nv::computeGradients(float *gradients, void *volData, int *sizes,
     145                     float *spacing, DataType dataType)
     146{
     147    g_volData = volData;
    155148    g_numOfSlices[0] = sizes[0];
    156149    g_numOfSlices[1] = sizes[1];
     
    309302}
    310303
    311 void filterGradients(float *gradients, int *sizes)
     304void
     305nv::filterGradients(float *gradients, int *sizes)
    312306{
    313307    int i, j, k, idz, idy, idx, gi, ogi, filterWidth, n, borderDist[3];
     
    444438}
    445439
    446 void quantize8(float *grad, unsigned char *data)
     440static void
     441quantize8(float *grad, unsigned char *data)
    447442{
    448443    float len;
     
    464459}
    465460
    466 void quantize16(float *grad, unsigned short *data)
     461static void
     462quantize16(float *grad, unsigned short *data)
    467463{
    468464    float len;
     
    484480}
    485481
    486 void quantizeFloat(float *grad, float *data)
     482static void
     483quantizeFloat(float *grad, float *data)
    487484{
    488485    float len;
     
    504501}
    505502
    506 void quantizeGradients(float *gradientsIn, void *gradientsOut,
    507                        int *sizes, DataType dataType)
     503void
     504nv::quantizeGradients(float *gradientsIn, void *gradientsOut,
     505                      int *sizes, DataType dataType)
    508506{
    509507    int idx, idy, idz, di;
  • trunk/packages/vizservers/nanovis/GradientFilter.h

    r3502 r3613  
    44 *
    55 */
    6 #ifndef GRADIENT_FILTER_H
    7 #define GRADIENT_FILTER_H
     6#ifndef NV_GRADIENT_FILTER_H
     7#define NV_GRADIENT_FILTER_H
     8
     9namespace nv {
    810
    911typedef enum {
     
    2123                              int *sizes, DataType dataType);
    2224
     25}
     26
    2327#endif
  • trunk/packages/vizservers/nanovis/Grid.h

    r3611 r3613  
    44 *
    55 */
    6 #ifndef GRID_H
    7 #define GRID_H
     6#ifndef NV_GRID_H
     7#define NV_GRID_H
    88
    99#include <util/Fonts.h>
  • trunk/packages/vizservers/nanovis/OrientationIndicator.h

    r3605 r3613  
    55 * Author: Leif Delgass <ldelgass@purdue.edu>
    66 */
    7 #ifndef ORIENTATION_INDICATOR_H
    8 #define ORIENTATION_INDICATOR_H
     7#ifndef NV_ORIENTATION_INDICATOR_H
     8#define NV_ORIENTATION_INDICATOR_H
    99
    1010namespace nv {
     11
    1112class OrientationIndicator
    1213{
     
    4041    void *_quadric;
    4142};
     43
    4244}
    4345
  • trunk/packages/vizservers/nanovis/PCASplit.h

    r3502 r3613  
    44 *
    55 */
    6 #ifndef PCA_SPLIT_H
    7 #define PCA_SPLIT_H
     6#ifndef PCA_PCASPLIT_H
     7#define PCA_PCASPLIT_H
    88
    99#include <memory.h>
  • trunk/packages/vizservers/nanovis/ParticleAdvectionShader.h

    r3612 r3613  
    44 *
    55 */
    6 #ifndef NV_PARTICLE_ADV_SHADER_H
    7 #define NV_PARTICLE_ADV_SHADER_H
     6#ifndef NV_PARTICLE_ADVECTION_SHADER_H
     7#define NV_PARTICLE_ADVECTION_SHADER_H
    88
    99#include <vrmath/Vector3f.h>
  • trunk/packages/vizservers/nanovis/ParticleEmitter.h

    r3502 r3613  
    44 *
    55 */
    6 #ifndef PARTICLEEMITTER_H
    7 #define PARTICLEEMITTER_H
     6#ifndef NV_PARTICLEEMITTER_H
     7#define NV_PARTICLEEMITTER_H
    88
    99#include <string>
    1010
    1111#include <vrmath/Vector3f.h>
     12
     13namespace nv {
    1214
    1315class ParticleEmitter
     
    8486}
    8587
     88}
     89
    8690#endif
  • trunk/packages/vizservers/nanovis/ParticleSystem.h

    r3502 r3613  
    44 *
    55 */
    6 #ifndef PARTICLESYSTEM_H
    7 #define PARTICLESYSTEM_H
     6#ifndef NV_PARTICLESYSTEM_H
     7#define NV_PARTICLESYSTEM_H
    88
    99#include <vector>
     
    2323
    2424#include "CircularQueue.h"
     25
     26namespace nv {
    2527
    2628struct NewParticle {
     
    409411}
    410412
     413}
     414
    411415#endif
  • trunk/packages/vizservers/nanovis/ParticleSystemFactory.h

    r3502 r3613  
    44 *
    55 */
    6 #ifndef PARTICLESYSTEMFACTORY_H
    7 #define PARTICLESYSTEMFACTORY_H
     6#ifndef NV_PARTICLESYSTEMFACTORY_H
     7#define NV_PARTICLESYSTEMFACTORY_H
    88
    99#include <string>
    1010
    1111#include <expat.h>
     12
     13namespace nv {
    1214
    1315class ParticleSystem;
     
    3234};
    3335
     36}
     37
    3438#endif
  • trunk/packages/vizservers/nanovis/PerfQuery.h

    r3611 r3613  
    1616 * ======================================================================
    1717 */
    18 #ifndef PERFQUERY_H
    19 #define PERFQUERY_H
     18#ifndef NV_PERFQUERY_H
     19#define NV_PERFQUERY_H
    2020
    2121#include <stdio.h>
  • trunk/packages/vizservers/nanovis/Plane.h

    r3502 r3613  
    1414 * ======================================================================
    1515 */
    16 #ifndef PLANE_H
    17 #define PLANE_H
     16#ifndef NV_PLANE_H
     17#define NV_PLANE_H
    1818
    1919#include <vrmath/Vector3f.h>
  • trunk/packages/vizservers/nanovis/PlaneRenderer.h

    r3612 r3613  
    66 *    Wei Qiao <qiaow@purdue.edu>
    77 */
    8 #ifndef PLANE_RENDERER_H
    9 #define PLANE_RENDERER_H
     8#ifndef NV_PLANE_RENDERER_H
     9#define NV_PLANE_RENDERER_H
    1010
    1111#include <vector>
  • trunk/packages/vizservers/nanovis/PointSet.h

    r3612 r3613  
    44 *
    55 */
    6 #ifndef POINT_SET_H
    7 #define POINT_SET_H
     6#ifndef NV_POINT_SET_H
     7#define NV_POINT_SET_H
    88
    99#include <vrmath/Vector3f.h>
  • trunk/packages/vizservers/nanovis/PointSetRenderer.h

    r3612 r3613  
    44 *
    55 */
    6 #ifndef POINT_SET_RENDERER_H
    7 #define POINT_SET_RENDERER_H
     6#ifndef NV_POINT_SET_RENDERER_H
     7#define NV_POINT_SET_RENDERER_H
    88
    99#include <vrmath/Vector3f.h>
  • trunk/packages/vizservers/nanovis/PointShader.h

    r3612 r3613  
    44 *
    55 */
    6 #ifndef POINTSHADER_H
    7 #define POINTSHADER_H
     6#ifndef NV_POINTSHADER_H
     7#define NV_POINTSHADER_H
    88
    99#include "Shader.h"
  • trunk/packages/vizservers/nanovis/ReaderCommon.h

    r3611 r3613  
    44 *
    55 */
    6 #ifndef DX_READER_COMMON_H
    7 #define DX_READER_COMMON_H
     6#ifndef NV_READER_COMMON_H
     7#define NV_READER_COMMON_H
    88
    99namespace nv {
  • trunk/packages/vizservers/nanovis/RegularVolumeShader.h

    r3612 r3613  
    44 *
    55 */
    6 #ifndef NV_REGULAR_SHADER_H
    7 #define NV_REGULAR_SHADER_H
     6#ifndef NV_REGULAR_VOLUME_SHADER_H
     7#define NV_REGULAR_VOLUME_SHADER_H
    88
    99#include "Volume.h"
  • trunk/packages/vizservers/nanovis/RenderVertexArray.h

    r3611 r3613  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * Render to vertex array class
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    54 *
    6  * ======================================================================
    7  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    8  *           Purdue Rendering and Perceptualization Lab (PURPL)
    9  *
    10  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    11  *
    12  *  See the file "license.terms" for information on usage and
    13  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    14  * ======================================================================
     5 * Author:
     6 *   Wei Qiao <qiaow@purdue.edu>
    157 */
    16 #ifndef RENDERVERTEXARRAY_H
    17 #define RENDERVERTEXARRAY_H
     8#ifndef NV_RENDERVERTEXARRAY_H
     9#define NV_RENDERVERTEXARRAY_H
    1810
    1911#include <GL/glew.h>
  • trunk/packages/vizservers/nanovis/ResponseQueue.h

    r3605 r3613  
    55 * Author: George A. Howlett <gah@purdue.edu>
    66 */
     7#ifndef NV_RESPONSE_QUEUE_H
     8#define NV_RESPONSE_QUEUE_H
    79
    810#include <pthread.h>
     
    1113#include <cstring>
    1214#include <list>
    13 
    14 #ifndef NV_RESPONSE_QUEUE_H
    15 #define NV_RESPONSE_QUEUE_H
    1615
    1716namespace nv {
  • trunk/packages/vizservers/nanovis/Switch.h

    r2877 r3613  
    2828 */
    2929
    30 #ifndef SWITCH_H
    31 #define SWITCH_H
     30#ifndef RAPPTURE_SWITCH_H
     31#define RAPPTURE_SWITCH_H
    3232
    3333#ifdef HAVE_STDDEF_H
     
    133133}
    134134
    135 #endif /* BLT_SWITCH_H */
     135#endif
  • trunk/packages/vizservers/nanovis/Texture1D.h

    r3611 r3613  
    1414 * ======================================================================
    1515 */
    16 #ifndef TEXTURE1D_H
    17 #define TEXTURE1D_H
     16#ifndef NV_TEXTURE1D_H
     17#define NV_TEXTURE1D_H
    1818
    1919#include <GL/glew.h>
  • trunk/packages/vizservers/nanovis/Texture2D.h

    r3611 r3613  
    1414 * ======================================================================
    1515 */
    16 #ifndef TEXTURE2D_H
    17 #define TEXTURE2D_H
     16#ifndef NV_TEXTURE2D_H
     17#define NV_TEXTURE2D_H
    1818
    1919#include <GL/glew.h>
  • trunk/packages/vizservers/nanovis/Texture3D.h

    r3611 r3613  
    1414 * ======================================================================
    1515 */
    16 #ifndef TEXTURE3D_H
    17 #define TEXTURE3D_H
     16#ifndef NV_TEXTURE3D_H
     17#define NV_TEXTURE3D_H
    1818
    1919#include <GL/glew.h>
  • trunk/packages/vizservers/nanovis/Trace.h

    r3605 r3613  
    66 */
    77
    8 #ifndef __TRACE_H__
    9 #define __TRACE_H__
     8#ifndef NV_TRACE_H
     9#define NV_TRACE_H
    1010
    1111#include <GL/glew.h>
  • trunk/packages/vizservers/nanovis/TransferFunction.h

    r3611 r3613  
    1414 * ======================================================================
    1515 */
    16 #ifndef TRANSFER_FUNCTION_H
    17 #define TRANSFER_FUNCTION_H
     16#ifndef NV_TRANSFER_FUNCTION_H
     17#define NV_TRANSFER_FUNCTION_H
    1818
    1919#include <string>
  • trunk/packages/vizservers/nanovis/Unirect.h

    r3605 r3613  
    55 * Author: George A. Howlett <gah@purdue.edu>
    66 */
    7 #ifndef UNIRECT_H
    8 #define UNIRECT_H
     7#ifndef RAPPTURE_UNIRECT_H
     8#define RAPPTURE_UNIRECT_H
    99
    1010#include <float.h>
  • trunk/packages/vizservers/nanovis/VelocityArrowsSlice.h

    r3612 r3613  
    44 *
    55 */
    6 #ifndef VELOCITY_ARROW_SLICE_H
    7 #define VELOCITY_ARROW_SLICE_H
     6#ifndef NV_VELOCITY_ARROW_SLICE_H
     7#define NV_VELOCITY_ARROW_SLICE_H
    88
    99#include <vector>
  • trunk/packages/vizservers/nanovis/Volume.h

    r3611 r3613  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * Volume.h: 3d volume class
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    54 *
    6  * ======================================================================
    7  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    8  *           Purdue Rendering and Perceptualization Lab (PURPL)
    9  *
    10  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    11  *
    12  *  See the file "license.terms" for information on usage and
    13  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    14  * ======================================================================
     5 * Author:
     6 *   Wei Qiao <qiaow@purdue.edu>
    157 */
    16 #ifndef VOLUME_H
    17 #define VOLUME_H
     8#ifndef NV_VOLUME_H
     9#define NV_VOLUME_H
    1810
    1911#include <cstring>
  • trunk/packages/vizservers/nanovis/VolumeInterpolator.h

    r3611 r3613  
    44 *
    55 */
    6 #ifndef VOLUME_INTERPOLATOR_H
    7 #define VOLUME_INTERPOLATOR_H
     6#ifndef NV_VOLUME_INTERPOLATOR_H
     7#define NV_VOLUME_INTERPOLATOR_H
    88
    99#include <vector>
  • trunk/packages/vizservers/nanovis/VolumeRenderer.h

    r3612 r3613  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * VolumeRenderer.h : VolumeRenderer class for volume visualization
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    54 *
    6  * ======================================================================
    7  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    8  *           Purdue Rendering and Perceptualization Lab (PURPL)
    9  *
    10  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    11  *
    12  *  See the file "license.terms" for information on usage and
    13  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    14  * ======================================================================
     5 * Authors:
     6 *   Wei Qiao <qiaow@purdue.edu>
    157 */
    16 #ifndef _VOLUME_RENDERER_H_
    17 #define _VOLUME_RENDERER_H_
     8#ifndef NV_VOLUME_RENDERER_H
     9#define NV_VOLUME_RENDERER_H
    1810
    1911#include <vrmath/Matrix4x4d.h>
  • trunk/packages/vizservers/nanovis/VtkReader.h

    r3611 r3613  
    44 *
    55 */
    6 #ifndef VTKREADER_H
    7 #define VTKREADER_H
     6#ifndef NV_VTKREADER_H
     7#define NV_VTKREADER_H
    88
    99#include <iostream>
  • trunk/packages/vizservers/nanovis/ZincBlendeVolume.h

    r3611 r3613  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
    22/*
    3  * ----------------------------------------------------------------------
    4  * ZincBlendeVolume.h: 3d zincblende volume class, a subclass of Volume.
    5  *                      It contains two cubic volumes.
     3 * Copyright (c) 2004-2013  HUBzero Foundation, LLC
    64 *
    7  * ======================================================================
    8  *  AUTHOR:  Wei Qiao <qiaow@purdue.edu>
    9  *           Purdue Rendering and Perceptualization Lab (PURPL)
    10  *
    11  *  Copyright (c) 2004-2013  HUBzero Foundation, LLC
    12  *
    13  *  See the file "license.terms" for information on usage and
    14  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    15  * ======================================================================
     5 * Authors:
     6 *   Wei Qiao <qiaow@purdue.edu>
    167 */
    178#ifndef NV_ZINCBLENDE_VOLUME_H
     
    2415namespace nv {
    2516
     17/**
     18 * \brief 3D ZincBlende volume, contains two cubic volumes
     19 */
    2620class ZincBlendeVolume : public Volume
    2721{
Note: See TracChangeset for help on using the changeset viewer.