From 3652c84094ade944a792d2ac78b1765e406e1ea7 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 16 Dec 2015 15:38:04 +0100
Subject: [PATCH] [DE] Rename SetTableValueRGBA avoiding name clash.
There is a function with same name in the base class
but with different parameters hiding the overload
virtual function:
VtkColorLookupTable.h:79:7: warning: 'VtkColorLookupTable::SetTableValue' hides overloaded virtual functions
---
Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp | 6 +++---
Applications/DataExplorer/VtkVis/VtkColorLookupTable.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
index 818d881aa78..8a59a9bacf1 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
@@ -71,7 +71,7 @@ void VtkColorLookupTable::Build()
double val = (it->first < range[0]) ? range[0] : ((it->first > range[1]) ? range[1] : it->first);
nextIndex = static_cast<std::size_t>( std::floor(val-range[0]) );
- this->SetTableValue(nextIndex, it->second);
+ this->SetTableValueRGBA(nextIndex, it->second);
if ( nextIndex - lastValue.first > 0 )
for (std::size_t i = lastValue.first + 1; i < nextIndex; i++)
@@ -89,7 +89,7 @@ void VtkColorLookupTable::Build()
for (std::size_t j = 0; j < 4; j++)
int_rgba[j] = (lastValue.second)[j];
- this->SetTableValue(i, int_rgba);
+ this->SetTableValueRGBA(i, int_rgba);
}
lastValue.first = nextIndex;
@@ -119,7 +119,7 @@ void VtkColorLookupTable::writeToFile(const std::string &filename)
out.close();
}
-void VtkColorLookupTable::SetTableValue(vtkIdType idx, unsigned char rgba[4])
+void VtkColorLookupTable::SetTableValueRGBA(vtkIdType idx, unsigned char rgba[4])
{
double value[4];
diff --git a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
index ebbfc9a8350..adf56d829b3 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
+++ b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
@@ -76,7 +76,7 @@ public:
void writeToFile(const std::string &filename);
/// Set a value within the LUT
- void SetTableValue(vtkIdType idx, unsigned char rgba[4]);
+ void SetTableValueRGBA(vtkIdType idx, unsigned char rgba[4]);
/// Get a value from the LUT
void GetTableValue(vtkIdType idx, unsigned char rgba[4]);
--
GitLab