aboutsummaryrefslogtreecommitdiff
path: root/colormap.cpp
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2016-03-02 15:47:24 -0300
committerSamuel Fadel <samuelfadel@gmail.com>2016-03-02 15:47:24 -0300
commit3ce49858c6859fccc2e4d35839c34685348790d1 (patch)
tree9919729ae2d094ab3bed9fb45184c027713d9127 /colormap.cpp
parent00efaedf4e328604598975a07a497d1ce769bb19 (diff)
Improvements related to ColorScale and screenshots.
* ColorScale: now a pointer whenever needed. main() takes care of updating extents * New class DivergentColorScale: works specifically for divergent scales, always has 3 colors as input: negative values, 0, positive values * ManipulationHandler: ProjectionHistory no longer needed
Diffstat (limited to 'colormap.cpp')
-rw-r--r--colormap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/colormap.cpp b/colormap.cpp
index 3ebf5c8..961f475 100644
--- a/colormap.cpp
+++ b/colormap.cpp
@@ -129,10 +129,10 @@ void Colormap::setOrientation(Colormap::Orientation orientation)
update();
}
-void Colormap::setColorScale(const ColorScale &scale)
+void Colormap::setColorScale(const ColorScale *scale)
{
- m_cmap.resize(scale.numColors() * 3);
- scale.sample(scale.numColors(), m_cmap.data());
+ m_cmap.resize(SAMPLES * 3);
+ scale->sample(SAMPLES, m_cmap.data());
if (m_orientation == Colormap::Vertical) {
reverseCMap(m_cmap);
}