Commit 2f743ad2 authored by Sebastien Jourdain's avatar Sebastien Jourdain
Browse files

Fix windows.h mangling issue and header tests

Change-Id: Idb3eff8fba9e9c897363f03bcd73bfb7b4765cda
parent 5a67ef78
......@@ -179,7 +179,7 @@ vtkTypeUInt32 vtkObjectIdMap::GetGlobalId(vtkObject* obj)
}
//----------------------------------------------------------------------------
vtkObject* vtkObjectIdMap::GetObject(vtkTypeUInt32 globalId)
vtkObject* vtkObjectIdMap::GetVTKObject(vtkTypeUInt32 globalId)
{
ObjectId key(globalId);
std::set<ObjectId>::iterator iter = this->Internals->RegisteredObjects.find(key);
......
......@@ -35,7 +35,7 @@ public:
// Description:
// Retreive a vtkObject based on its global id. If not found return NULL
vtkObject* GetObject(vtkTypeUInt32 globalId);
vtkObject* GetVTKObject(vtkTypeUInt32 globalId);
// Description:
// Assign an active key (string) to an existing object.
......
......@@ -349,7 +349,7 @@ const char* vtkWebApplication::GetWebGLSceneMetaData(vtkRenderWindow* view)
vtkInternals::WebGLObjId2IndexMap webglMap;
for(int i=0; i<webglExporter->GetNumberOfObjects(); ++i)
{
vtkWebGLObject* wObj = webglExporter->GetObject(i);
vtkWebGLObject* wObj = webglExporter->GetWebGLObject(i);
if(wObj && wObj->isVisible())
{
vtkInternals::WebGLObjCacheValue val;
......@@ -401,7 +401,7 @@ const char* vtkWebApplication::GetWebGLBinaryData(
{
if(cachedVal->BinaryParts[part].empty())
{
vtkWebGLObject* obj = webglExporter->GetObject(cachedVal->ObjIndex);
vtkWebGLObject* obj = webglExporter->GetWebGLObject(cachedVal->ObjIndex);
if(obj && obj->isVisible())
{
// Manage Base64
......
......@@ -36,7 +36,7 @@ class vtkWebProtocol(object):
id = int(id)
if id <= 0:
return None
return self.Application.GetObjectIdMap().GetObject(id)
return self.Application.GetObjectIdMap().GetVTKObject(id)
def getGlobalId(self, obj):
"""
......
......@@ -84,7 +84,7 @@ void vtkPVWebGLExporter::WriteData()
int nbObjects = exporter->GetNumberOfObjects();
for(int idx=0; idx < nbObjects; ++idx)
{
vtkWebGLObject* obj = exporter->GetObject(idx);
vtkWebGLObject* obj = exporter->GetWebGLObject(idx);
if(obj->isVisible())
{
int nbParts = obj->GetNumberOfParts();
......
......@@ -20,10 +20,10 @@
#define __vtkWebGLDataSet_h
#include "vtkObject.h"
#include "vtkWebGLObject.h"
#include "vtkWebGLExporterModule.h" // needed for export macro
#include <string>
#include "vtkWebGLObject.h" // Needed for the enum
#include <string> // needed for md5
class VTKWEBGLEXPORTER_EXPORT vtkWebGLDataSet : public vtkObject
{
......
......@@ -605,7 +605,7 @@ const char* vtkWebGLExporter::GenerateExportMetadata()
return this->Internal->LastMetaData.c_str();
}
vtkWebGLObject* vtkWebGLExporter::GetObject(int index)
vtkWebGLObject* vtkWebGLExporter::GetWebGLObject(int index)
{
return this->Internal->Objects[index];
}
......@@ -693,7 +693,7 @@ void vtkWebGLExporter::exportStaticScene(vtkRendererCollection *renderers, int w
std::string test;
int size = 0;
vtkWebGLObject* obj = this->GetObject(i);
vtkWebGLObject* obj = this->GetWebGLObject(i);
if (obj->isVisible())
{
for(int j=0; j<obj->GetNumberOfParts(); j++)
......
......@@ -34,8 +34,7 @@ class vtkWebGLPolyData;
#include "vtkObject.h"
#include "vtkWebGLExporterModule.h" // needed for export macro
#include <map>
#include <string>
#include <string> // needed for internal structure
typedef enum {
VTK_ONLYCAMERA = 0,
......@@ -57,7 +56,7 @@ public:
void exportStaticScene(vtkRendererCollection* renderers, int width, int height, std::string path);
const char* GenerateMetadata();
const char* GetId();
vtkWebGLObject* GetObject(int index);
vtkWebGLObject* GetWebGLObject(int index);
int GetNumberOfObjects();
bool hasChanged();
void SetCenterOfRotation(float a1, float a2, float a3);
......
......@@ -22,7 +22,7 @@
#include "vtkObject.h"
#include "vtkWebGLExporterModule.h" // needed for export macro
#include <string>
#include <string> // needed for ID and md5 storing
class vtkMatrix4x4;
class vtkUnsignedCharArray;
......
......@@ -22,7 +22,7 @@
#include "vtkWebGLObject.h"
#include "vtkWebGLExporterModule.h" // needed for export macro
#include <vector>
#include <vector> // Needed to store colors
class vtkActor2D;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment