Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 93349908 authored by schultezub's avatar schultezub
Browse files

added Geometry2DtransferFunctionEditor stub

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@325 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent dbad14c0
......@@ -32,6 +32,7 @@ SET(TUMVIS_APPLICATION_TO_BE_MOCCED
gui/properties/intpropertywidget.h
gui/properties/floatpropertywidget.h
gui/properties/geometry1dtransferfunctioneditor.h
gui/properties/geometry2dtransferfunctioneditor.h
gui/properties/propertycollectionwidget.h
gui/properties/simpletransferfunctioneditor.h
gui/properties/stringpropertywidget.h
......
......@@ -271,14 +271,14 @@ namespace TUMVis {
const std::vector<TFGeometry1D*>& geometries = gtf->getGeometries();
for (std::vector<TFGeometry1D*>::const_iterator git = geometries.begin(); git != geometries.end(); ++git) {
// Add manipulator for the whole geometry and register it as event handler:
WholeTFGeometryManipulator* wtf = new WholeTFGeometryManipulator(_canvas->getSize(), gtf, *git);
WholeTFGeometryManipulator* wtf = new WholeTFGeometryManipulator(_canvas->getSize(), *git);
_manipulators.push_back(wtf);
_canvas->getEventHandler()->addListenerToFront(wtf);
wtf->s_selected.connect(this, &Geometry1DTransferFunctionEditor::onWholeTFGeometryManipulatorSelected);
// Add a manipulator for each KeyPoint and register it as event handler:
for (std::vector<TFGeometry1D::KeyPoint>::iterator kpit = (*git)->getKeyPoints().begin(); kpit != (*git)->getKeyPoints().end(); ++kpit) {
_manipulators.push_back(new KeyPointManipulator(_canvas->getSize(), gtf, *git, kpit));
_manipulators.push_back(new KeyPointManipulator(_canvas->getSize(), *git, kpit));
_canvas->getEventHandler()->addListenerToFront(_manipulators.back());
}
}
......
// ================================================================================================
//
// This file is part of the TUMVis Visualization Framework.
//
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de)
// Chair for Computer Aided Medical Procedures
// Technische Universitt Mnchen
// Boltzmannstr. 3, 85748 Garching b. Mnchen, Germany
//
// The licensing of this softare is not yet resolved. Until then, redistribution in source or
// binary forms outside the CAMP chair is not permitted, unless explicitly stated in legal form.
// However, the names of the original authors and the above copyright notice must retain in its
// original state in any case.
//
// Legal disclaimer provided by the BSD license:
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// ================================================================================================
#include "geometry2dtransferfunctioneditor.h"
#include "tgt/assert.h"
#include "tgt/shadermanager.h"
#include "tgt/qt/qtcontextmanager.h"
#include "tgt/qt/qtthreadedcanvas.h"
#include "application/gui/qtcolortools.h"
#include "application/gui/properties/tfgeometrymanipulator.h"
#include "core/classification/geometry2dtransferfunction.h"
#include "core/classification/TFGeometry2D.h"
#include "core/datastructures/imagedatalocal.h"
#include "core/properties/transferfunctionproperty.h"
#include "core/tools/opengljobprocessor.h"
#include <QGridLayout>
#include <QLabel>
#include <QPushButton>
#include <QVBoxLayout>
namespace TUMVis {
Geometry2DTransferFunctionEditor::Geometry2DTransferFunctionEditor(Geometry2DTransferFunction* tf, QWidget* parent /*= 0*/)
: AbstractTransferFunctionEditor(tf, parent)
, _layout(0)
, _canvas(0)
, _lblIntensityLeft(0)
, _lblIntensityRight(0)
, _btnAddGeometry(0)
{
_selectedGeometry = 0;
setupGUI();
tf->s_geometryCollectionChanged.connect(this, &Geometry2DTransferFunctionEditor::onGeometryCollectionChanged);
updateManipulators();
setEventTypes(tgt::Event::MOUSEPRESSEVENT);
}
Geometry2DTransferFunctionEditor::~Geometry2DTransferFunctionEditor() {
tbb::mutex::scoped_lock lock(_localMutex);
// clear and delete former stuff
_selectedGeometry = 0;
for (std::vector<AbstractTFGeometryManipulator*>::iterator it = _manipulators.begin(); it != _manipulators.end(); ++it) {
if (WholeTFGeometryManipulator* tester = dynamic_cast<WholeTFGeometryManipulator*>(*it)) {
tester->s_selected.disconnect(this);
}
delete *it;
}
Geometry2DTransferFunction* gtf = static_cast<Geometry2DTransferFunction*>(_transferFunction);
gtf->s_geometryCollectionChanged.disconnect(this);
// TODO: this needs to be done, but we can not ensure that GLJobProc is still existant during deconstruction...
//GLJobProc.deregisterContext(_canvas);
}
void Geometry2DTransferFunctionEditor::updateWidgetFromProperty() {
Geometry2DTransferFunction* gtf = static_cast<Geometry2DTransferFunction*>(_transferFunction);
_lblIntensityLeft->setText(QString::number(gtf->getIntensityDomain().x));
_lblIntensityRight->setText(QString::number(gtf->getIntensityDomain().y));
invalidate();
}
void Geometry2DTransferFunctionEditor::paint() {
Geometry2DTransferFunction* gtf = static_cast<Geometry2DTransferFunction*>(_transferFunction);
gtf->lock();
const std::vector<TFGeometry2D*>& geometries = gtf->getGeometries();
const tgt::vec2& intensityDomain = gtf->getIntensityDomain();
// TODO: get rid of intermediate mode?
glPushAttrib(GL_ALL_ATTRIB_BITS);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glViewport(0, 0, _canvas->width(), _canvas->height());
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glOrtho(0, 1 , 0, 1, -1, 1);
glClearColor(1.f, 1.f, 1.f, 1.f);
glClear(GL_COLOR_BUFFER_BIT);
LGL_ERROR;
// renderIntoEditor TF geometries
for (std::vector<TFGeometry2D*>::const_iterator it = geometries.begin(); it != geometries.end(); ++it) {
(*it)->render();
}
// render histogram if existent
const AbstractTransferFunction::IntensityHistogramType* ih = gtf->getIntensityHistogram();
if (ih != 0) {
size_t numBuckets = ih->getNumBuckets(0);
if (numBuckets > 0) {
float maxFilling = static_cast<float>(ih->getMaxFilling());
float xl = static_cast<float>(0.f) / static_cast<float>(numBuckets);
float xr = 0.f;
float yl = static_cast<float>(ih->getNumElements(0)) / maxFilling;
float yr = 0.f;
glBegin(GL_QUADS);
glColor4f(1.f, .75f, 0.f, .5f);
for (size_t i = 1; i < numBuckets; ++i) {
xr = static_cast<float>(i) / static_cast<float>(numBuckets);
yr = static_cast<float>(ih->getNumElements(i)) / maxFilling;
glVertex2f(xl, 0.f);
glVertex2f(xl, yl);
glVertex2f(xr, yr);
glVertex2f(xr, 0.f);
xl = xr;
yl = yr;
}
glEnd();
}
}
{
tbb::mutex::scoped_lock lock(_localMutex);
// render selected geometry
if (_selectedGeometry != 0) {
const std::vector<tgt::vec2>& helperPoints = _selectedGeometry->getHelperPoints();
glColor4ub(0, 0, 0, 196);
glEnable(GL_LINE_STIPPLE);
glLineStipple(1, 0xFAFA);
glBegin(GL_LINE_LOOP);
for (std::vector<tgt::vec2>::const_iterator it = helperPoints.begin(); it != helperPoints.end(); ++it)
glVertex2fv(it->elem);
glEnd();
glDisable(GL_LINE_STIPPLE);
}
glPopMatrix();
glPushMatrix();
glOrtho(0, _canvas->width(), 0, _canvas->height(), -1, 1);
// render manipulators
for (std::vector<AbstractTFGeometryManipulator*>::iterator it = _manipulators.begin(); it != _manipulators.end(); ++it) {
(*it)->render();
}
glPopMatrix();
}
LGL_ERROR;
glPopAttrib();
gtf->unlock();
}
void Geometry2DTransferFunctionEditor::sizeChanged(const tgt::ivec2& size) {
tbb::mutex::scoped_lock lock(_localMutex);
for (std::vector<AbstractTFGeometryManipulator*>::iterator it = _manipulators.begin(); it != _manipulators.end(); ++it) {
(*it)->setViewportSize(size);
}
invalidate();
}
void Geometry2DTransferFunctionEditor::mousePressEvent(tgt::MouseEvent* e) {
if (_selectedGeometry != 0 && e->modifiers() & tgt::Event::CTRL) {
// TFGeometry2D* g = _selectedGeometry->getGeometry();
// std::vector<TFGeometry2D::KeyPoint>& kpts = g->getKeyPoints();
// TFGeometry2D::KeyPoint kp(static_cast<float>(e->x()) / static_cast<float>(_canvas->width()), tgt::col4(255));
// std::vector<TFGeometry2D::KeyPoint>::const_iterator lb = std::upper_bound(kpts.begin(), kpts.end(), kp);
// if (lb != kpts.end()) {
// kp._color = lb->_color;
// }
// else {
// kp._color = kpts.back()._color;
// }
// float alpha = tgt::clamp(static_cast<float>(_canvas->height() - e->y()) / static_cast<float>(_canvas->height()), 0.f, 1.f);
// kp._color.a = static_cast<uint8_t>(alpha * 255.f);
// kpts.insert(lb, kp);
// updateManipulators();
// g->s_changed();
}
else {
_selectedGeometry = 0;
invalidate();
e->ignore();
}
}
void Geometry2DTransferFunctionEditor::invalidate() {
GLJobProc.enqueueJob(_canvas, new CallMemberFuncJob<Geometry2DTransferFunctionEditor>(this, &Geometry2DTransferFunctionEditor::paint), OpenGLJobProcessor::PaintJob);
}
void Geometry2DTransferFunctionEditor::setupGUI() {
Geometry2DTransferFunction* gtf = static_cast<Geometry2DTransferFunction*>(_transferFunction);
_layout = new QGridLayout(this);
setLayout(_layout);
QLabel* lblOpacityTop = new QLabel(tr("100%"), this);
_layout->addWidget(lblOpacityTop, 1, 0, 1, 1, Qt::AlignRight);
QLabel* lblOpacity = new QLabel(tr("Opacity"), this);
_layout->addWidget(lblOpacity, 2, 0, 1, 1, Qt::AlignRight);
QLabel* lblOpacityBottom = new QLabel(tr("0%"), this);
_layout->addWidget(lblOpacityBottom, 3, 0, 1, 1, Qt::AlignRight);
_canvas = CtxtMgr.createContext("tfcanvas", "", tgt::ivec2(256, 128), tgt::GLCanvas::RGBA_BUFFER, 0, false);
_canvas->doneCurrent();
GLJobProc.registerContext(_canvas);
_canvas->setPainter(this, false);
_layout->addWidget(_canvas, 1, 1, 3, 3);
_lblIntensityLeft = new QLabel(QString::number(gtf->getIntensityDomain().x), this);
_layout->addWidget(_lblIntensityLeft, 4, 1, 1, 1, Qt::AlignLeft);
QLabel* lblIntensity = new QLabel(tr("Intensity"), this);
_layout->addWidget(lblIntensity, 4, 2, 1, 1, Qt::AlignHCenter);
_lblIntensityRight = new QLabel(QString::number(gtf->getIntensityDomain().y), this);
_layout->addWidget(_lblIntensityRight, 4, 3, 1, 1, Qt::AlignRight);
QVBoxLayout* buttonLayout = new QVBoxLayout(); // TODO: check whether buttonLayout will be deleted by Qt's GC!
_layout->addLayout(buttonLayout, 1, 4, 1, 3, Qt::AlignTop);
_btnAddGeometry = new QPushButton(tr("Add Geometry"), this);
buttonLayout->addWidget(_btnAddGeometry);
connect(_btnAddGeometry, SIGNAL(clicked()), this, SLOT(onBtnAddGeometryClicked()));
_btnRemoveGeometry = new QPushButton(tr("Remove Geometry"), this);
buttonLayout->addWidget(_btnRemoveGeometry);
connect(_btnRemoveGeometry, SIGNAL(clicked()), this, SLOT(onBtnRemoveGeometryClicked()));
_layout->setColumnStretch(2, 1);
_layout->setRowStretch(2, 1);
}
void Geometry2DTransferFunctionEditor::updateManipulators() {
tbb::mutex::scoped_lock lock(_localMutex);
_canvas->getEventHandler()->addListenerToFront(this);
}
void Geometry2DTransferFunctionEditor::onGeometryCollectionChanged() {
updateManipulators();
}
void Geometry2DTransferFunctionEditor::onWholeTFGeometryManipulatorSelected(WholeTFGeometryManipulator* wtf /* :) */) {
_selectedGeometry = wtf;
invalidate();
}
void Geometry2DTransferFunctionEditor::onBtnAddGeometryClicked() {
Geometry2DTransferFunction* gtf = static_cast<Geometry2DTransferFunction*>(_transferFunction);
gtf->addGeometry(TFGeometry2D::createQuad(tgt::vec2(.4f, .6f), tgt::vec2(0.f, .4f), tgt::col4(196)));
}
void Geometry2DTransferFunctionEditor::onBtnRemoveGeometryClicked() {
if (_selectedGeometry != 0) {
// to get the signal-slots disconnected in the correct order and avoid double deletion,
// this is getting a little messy and cumbersome:
// Geometry2DTransferFunction* gtf = static_cast<Geometry2DTransferFunction*>(_transferFunction);
// TFGeometry2D* geometryToRemove = _selectedGeometry->getGeometry();
//
// {
// tbb::mutex::scoped_lock lock(_localMutex);
//
// for (std::vector<AbstractTFGeometryManipulator*>::iterator it = _manipulators.begin(); it != _manipulators.end(); ++it) {
// if (*it == _selectedGeometry) {
// _manipulators.erase(it);
// break;
// }
// }
// delete _selectedGeometry;
// _selectedGeometry = 0;
// }
//
// gtf->removeGeometry(geometryToRemove);
}
}
}
\ No newline at end of file
// ================================================================================================
//
// This file is part of the TUMVis Visualization Framework.
//
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de)
// Chair for Computer Aided Medical Procedures
// Technische Universitt Mnchen
// Boltzmannstr. 3, 85748 Garching b. Mnchen, Germany
//
// The licensing of this softare is not yet resolved. Until then, redistribution in source or
// binary forms outside the CAMP chair is not permitted, unless explicitly stated in legal form.
// However, the names of the original authors and the above copyright notice must retain in its
// original state in any case.
//
// Legal disclaimer provided by the BSD license:
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// ================================================================================================
#ifndef GEOMETRY2DTRANSFERFUNCTIONEDITOR_H__
#define GEOMETRY2DTRANSFERFUNCTIONEDITOR_H__
#include "tbb/include/tbb/mutex.h"
#include "tgt/painter.h"
#include "tgt/event/eventlistener.h"
#include "core/classification/tfgeometry2d.h"
#include "application/gui/properties/abstracttransferfunctioneditor.h"
class QGridLayout;
class QLabel;
class QPushButton;
namespace tgt {
class QtThreadedCanvas;
class Shader;
}
namespace TUMVis {
class ColorPickerWidget;
class Geometry2DTransferFunction;
class AbstractTFGeometryManipulator;
class WholeTFGeometryManipulator;
/**
* Editor widget for a Geometry2DTransferFunction.
*/
class Geometry2DTransferFunctionEditor : public AbstractTransferFunctionEditor, public tgt::EventListener, public tgt::Painter {
Q_OBJECT;
public:
/**
* Creates a new editor widget for the for the TransferFunctionProperty \a property.
* \param tf The transfer function the editor shall handle.
* \param parent Parent Qt widget
*/
Geometry2DTransferFunctionEditor(Geometry2DTransferFunction* tf, QWidget* parent = 0);
/**
* Destructor
*/
virtual ~Geometry2DTransferFunctionEditor();
/**
* Performs the painting.
*/
void paint();
/// \see tgt::Painter::sizeChanged
virtual void sizeChanged(const tgt::ivec2&);
/// \see tgt::EventListener::mousePressEvent
virtual void mousePressEvent(tgt::MouseEvent* e);
/**
* Slot to be called when the geometry vector of the transfer function has changed.
*/
void onGeometryCollectionChanged();
/**
* Slot tp be called when a WholeTFGeometryManipulator was selected.
* \param the selected WholeTFGeometryManipulator
*/
void onWholeTFGeometryManipulatorSelected(WholeTFGeometryManipulator* wtf /* :) */);
protected slots:
/**
* Slot to be called when _btnAddGeometry was clicked.
*/
void onBtnAddGeometryClicked();
/**
* Slot to be called when _btnRemoveGeometry was clicked.
*/
void onBtnRemoveGeometryClicked();
protected:
/**
* Gets called when the property has changed, so that widget can update its state.
*/
virtual void updateWidgetFromProperty();
/**
* Updates the GeometryManipulator vector.
* Invalidates all of its iterators.
*/
void updateManipulators();
/**
* To be called when the canvas is invalidated, issues new paint job.
*/
void invalidate();
/**
* Sets up the GUI stuff.
*/
void setupGUI();
std::vector<AbstractTFGeometryManipulator*> _manipulators;
tbb::atomic<WholeTFGeometryManipulator*> _selectedGeometry;
tbb::mutex _localMutex;
QGridLayout* _layout;
tgt::QtThreadedCanvas* _canvas;
QLabel* _lblIntensityLeft;
QLabel* _lblIntensityRight;
QPushButton* _btnAddGeometry;
QPushButton* _btnRemoveGeometry;
};
}
#endif // GEOMETRY2DTRANSFERFUNCTIONEDITOR_H__
......@@ -42,11 +42,9 @@
namespace TUMVis {
AbstractTFGeometryManipulator::AbstractTFGeometryManipulator(const tgt::ivec2& viewportSize, Geometry1DTransferFunction* tf)
AbstractTFGeometryManipulator::AbstractTFGeometryManipulator(const tgt::ivec2& viewportSize)
: _viewportSize(viewportSize)
, _tf(tf)
{
tgtAssert(tf != 0, "Transfer Function must not be 0.");
}
void AbstractTFGeometryManipulator::setViewportSize(const tgt::ivec2& viewportSize) {
......@@ -65,12 +63,11 @@ namespace TUMVis {
// ================================================================================================
KeyPointManipulator::KeyPointManipulator(const tgt::ivec2& viewportSize, Geometry1DTransferFunction* tf, TFGeometry1D* geometry, const std::vector<TFGeometry1D::KeyPoint>::iterator& keyPoint)
: AbstractTFGeometryManipulator(viewportSize, tf)
KeyPointManipulator::KeyPointManipulator(const tgt::ivec2& viewportSize, TFGeometry1D* geometry, const std::vector<TFGeometry1D::KeyPoint>::iterator& keyPoint)
: AbstractTFGeometryManipulator(viewportSize)
, _geometry(geometry)
, _keyPoint(keyPoint)
, _mousePressed(false)
//, _pressedPosition(0, 0)
{
tgtAssert(geometry != 0, "Geometry must not be 0.");
}
......@@ -139,8 +136,8 @@ namespace TUMVis {
// ================================================================================================
WholeTFGeometryManipulator::WholeTFGeometryManipulator(const tgt::ivec2& viewportSize, Geometry1DTransferFunction* tf, TFGeometry1D* geometry)
: AbstractTFGeometryManipulator(viewportSize, tf)
WholeTFGeometryManipulator::WholeTFGeometryManipulator(const tgt::ivec2& viewportSize, TFGeometry1D* geometry)
: AbstractTFGeometryManipulator(viewportSize)
, _geometry(geometry)
, _mousePressed(false)
{
......
......@@ -33,6 +33,7 @@
#include "tgt/matrix.h"
#include "tgt/event/eventlistener.h"
#include "core/classification/tfgeometry1d.h"
#include "core/classification/tfgeometry2d.h"
namespace TUMVis {
class Geometry1DTransferFunction;
......@@ -48,9 +49,8 @@ namespace TUMVis {
/**
* Creates a new AbstractTFGeometryManipulator for the given Geometry1DTransferFunction.
* \param viewportSize Viewport size (extent of the OpenGL rendering canvas)
* \param tf Parent TF of the geometries to manipulate
*/
AbstractTFGeometryManipulator(const tgt::ivec2& viewportSize, Geometry1DTransferFunction* tf);
AbstractTFGeometryManipulator(const tgt::ivec2& viewportSize);
/**
* Pure virtual Destructor
......@@ -85,7 +85,6 @@ namespace TUMVis {
tgt::vec2 viewportToTF(const tgt::ivec2& pos) const;
tgt::ivec2 _viewportSize; ///< Viewport size (extent of the OpenGL rendering canvas)
Geometry1DTransferFunction* _tf; ///< Parent TF of the geometries to manipulate (might be handy somewhere later...)
};
// ================================================================================================
......@@ -98,11 +97,10 @@ namespace TUMVis {
/**
* Creates a new KeyPointManipulator
* \param viewportSize Viewport size (extent of the OpenGL rendering canvas)
* \param tf Parent TF of the geometries to manipulate
* \param geometry Parent geometry of the KeyPoint to manipulate
* \param keyPoint Iterator to the KeyPoint to manipulate
*/
KeyPointManipulator(const tgt::ivec2& viewportSize, Geometry1DTransferFunction* tf, TFGeometry1D* geometry, const std::vector<TFGeometry1D::KeyPoint>::iterator& keyPoint);
KeyPointManipulator(const tgt::ivec2& viewportSize, TFGeometry1D* geometry, const std::vector<TFGeometry1D::KeyPoint>::iterator& keyPoint);
/// \see AbstractTFGeometryManipulator::render
void render();
......@@ -136,10 +134,9 @@ namespace TUMVis {
/**
* Creates a new KeyPointManipulator
* \param viewportSize Viewport size (extent of the OpenGL rendering canvas)
* \param tf Parent TF of the geometries to manipulate
* \param geometry Parent geometry of the KeyPoint to manipulate
*/
WholeTFGeometryManipulator(const tgt::ivec2& viewportSize, Geometry1DTransferFunction* tf, TFGeometry1D* geometry);
WholeTFGeometryManipulator(const tgt::ivec2& viewportSize, TFGeometry1D* geometry);
/**
* Destructor
......
......@@ -30,10 +30,12 @@
#include "application/gui/properties/abstracttransferfunctioneditor.h"
#include "application/gui/properties/geometry1dtransferfunctioneditor.h"
#include "application/gui/properties/geometry2dtransferfunctioneditor.h"
#include "application/gui/properties/simpletransferfunctioneditor.h"
#include "core/classification/abstracttransferfunction.h"
#include "core/classification/geometry1dtransferfunction.h"
#include "core/classification/geometry2dtransferfunction.h"
#include "core/classification/simpletransferfunction.h"
namespace TUMVis {
......@@ -49,6 +51,10 @@ namespace TUMVis {
return new Geometry1DTransferFunctionEditor(tester);
}
if (Geometry2DTransferFunction* tester = dynamic_cast<Geometry2DTransferFunction*>(tf)) {
return new Geometry2DTransferFunctionEditor(tester);