Ignore:
Timestamp:
Apr 3, 2013 12:34:50 AM (10 years ago)
Author:
ldelgass
Message:

Remove enclosing Rappture namespace from vtkvis. Remove outline and outline
color subcommands from dataset in vtkvis protocol -- they are replaced by the
outline object. Translate heightmap to dataset z plane (client is doing this
right now).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/vtkvis/Trace.h

    r3360 r3615  
    66 */
    77
    8 #ifndef __TRACE_H__
    9 #define __TRACE_H__
     8#ifndef VTKVIS_TRACE_H
     9#define VTKVIS_TRACE_H
    1010
    1111#include <syslog.h>
    1212
    13 namespace Rappture {
    1413namespace VtkVis {
    1514
     
    2726                       int lineNum, const char* format, ...);
    2827
    29 #define ERROR(...)      Rappture::VtkVis::logMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
     28#define ERROR(...)      VtkVis::logMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    3029#ifdef WANT_TRACE
    31 #define TRACE(...)      Rappture::VtkVis::logMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
     30#define TRACE(...)      VtkVis::logMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    3231#else
    3332#define TRACE(...)
    3433#endif  /*WANT_TRACE*/
    35 #define WARN(...)       Rappture::VtkVis::logMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    36 #define INFO(...)       Rappture::VtkVis::logMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
     34#define WARN(...)       VtkVis::logMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
     35#define INFO(...)       VtkVis::logMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    3736
    38 #define USER_ERROR(...) Rappture::VtkVis::logUserMessage(__VA_ARGS__)
     37#define USER_ERROR(...) VtkVis::logUserMessage(__VA_ARGS__)
    3938
    40 }
    4139}
    4240
Note: See TracChangeset for help on using the changeset viewer.