Skip to content
GitLab
Commit 1f90eb62 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Merge branch 'issue-546' into 'development' 

Issue 546
parents bf30ff15 5cb6d721
Expand all Hide whitespace changes
Inline Side-by-side
application/gui/datacontainerinspectorcanvas.h
View file @ 1f90eb62
......@@ -35,14 +35,16 @@
#include "application/gui/qtdatahandle.h"
#include "core/properties/propertycollection.h"
#include "core/properties/metaproperty.h"
#include "core/properties/numericproperty.h"
#include "core/properties/propertycollection.h"
#include "core/properties/transferfunctionproperty.h"
#include "core/tools/opengljobprocessor.h"
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "modules/base/processors/lightsourceprovider.h"
#include "modules/vis/processors/geometryrenderer.h"
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/datastructures/meshgeometry.h"
namespace tgt {
class Shader;
......@@ -56,28 +58,9 @@ namespace campvis {
class DataContainerTreeWidget;
class DataHandle;
class FaceGeometry;
class GeometryData;
class DataContainerInspectorWidget;
/**
* Stores information about the textures which store the rendered geomtery.
* Note: The object's destroy() function should be called before deleting or releasing the object's memory.
*/
struct GeometryTextureInfo {
campvis::QtDataHandle _geomData;
tgt::Texture* _texture;
int _trackballIndx;
GeometryTextureInfo(): _geomData(0), _texture(0) {
}
void destroy() {
delete _texture;
}
~GeometryTextureInfo() {
}
};
class DataContainerInspectorCanvas : public tgt::QtThreadedCanvas, tgt::Painter, public tgt::EventListener, public HasPropertyCollection {
Q_OBJECT;
......@@ -97,7 +80,7 @@ namespace campvis {
* Initializes the OpenGL stuff (e.g. shaders).
* Must be called with a valid and locked OpenGL context.
*/
virtual void init(DataContainerInspectorWidget* _pWidget);
virtual void init();
/**
* Deinitializes the OpenGL stuff (e.g. shaders).
......@@ -106,22 +89,10 @@ namespace campvis {
void deinit();
/**
* Reset the content of the canvas.
* It will clear the array of textures, rendered geomteries, color buffers, depth buffers and its content.
* Set the DataHandles to show in the canvas to those in \a handles.
* \param handles vector of name-DataHandle pairs to show in the canvas.
*/
void resetContent();
void setDataHandles(const std::vector< std::pair<QString, QtDataHandle> >& handles);
/**
* returns the color value which is captured with the mouse.
*/
const tgt::Color& getCapturedColor();
/**
* returns the depth value which is captured with the mouse.
*/
const float& getCapturedDepth();
/**
* Size hint for the default window size
......@@ -137,50 +108,27 @@ namespace campvis {
/// This is meant be overridden to adjust camera settings to new canvas dimensions
virtual void sizeChanged(const tgt::ivec2&);
/**
* Called on double click event on this canvas
* \param e Mouse event arguments
*/
virtual void mouseDoubleClickEvent(tgt::MouseEvent* e);
/**
* Called on mouse move event on this canvas
* \param e Mouse event arguments
*/
virtual void mouseMoveEvent(tgt::MouseEvent* e);
/**
* Called on mouse wheel event on this canvas.
* \param e Mouse event arguments
*/
virtual void wheelEvent(tgt::MouseEvent* e);
virtual void onEvent(tgt::Event* e);
/**
* Called on mouse press button event on this canvas.
* \param e Mouse event arguments
*/
virtual void mousePressEvent(tgt::MouseEvent* e);
/**
* Called on mouse release button event on this canvas.
* \param e Mouse event arguments
*/
virtual void mouseReleaseEvent(tgt::MouseEvent* e);
/**
* Slot getting called when one of the observed properties changed and notifies its observers.
* \param prop Property that emitted the signal
*/
virtual void onPropertyChanged(const AbstractProperty* prop);
IntProperty p_currentSlice; ///< Currently selected slice to show
TransferFunctionProperty p_transferFunction; ///< Transfer function
BoolProperty p_renderRChannel; ///< Flag whether to render Red channel
BoolProperty p_renderGChannel; ///< Flag whether to render Green channel
BoolProperty p_renderBChannel; ///< Flag whether to render Blue channel
BoolProperty p_renderAChannel; ///< Flag whether to render Alpha channel
IntProperty p_currentSlice;
Vec4Property p_meshSolidColor; ///< Color used to render the mesh object
TransferFunctionProperty p_transferFunction; ///< Transfer function
MetaProperty p_geometryRendererProperties; ///< MetaProperty for the GeometryRenderer
BoolProperty p_renderRChannel; /// Flag whether to render Red channel
BoolProperty p_renderGChannel; /// Flag whether to render Green channel
BoolProperty p_renderBChannel; /// Flag whether to render Blue channel
BoolProperty p_renderAChannel; /// Flag whether to render Alpha channel
signals:
void s_colorChanged(const tgt::vec4&);
void s_depthChanged(float depth);
private slots:
/**
......@@ -196,11 +144,6 @@ namespace campvis {
*/
virtual void paint();
/**
* Performs the painting.
*/
virtual void paintMeshGeomTextures();
/**
* Gets called when the data collection of this pipeline has changed and thus has notified its observers.
* If \a name equals the name of the renderTarget, the s_renderTargetChanged signal will be emitted.
......@@ -209,6 +152,13 @@ namespace campvis {
*/
void onDataContainerDataAdded(const std::string& name, const DataHandle& dh);
/**
* Slot getting called when one of the observed properties changed and notifies its observers.
* \param prop Property that emitted the signal
*/
virtual void onPropertyChanged(const AbstractProperty* prop);
virtual void onGeometryRendererPropertyChanged(const AbstractProperty* prop);
/**
* Updates the textures vector.
* \note Only call with acquired lock and valid OpenGL context!!
......@@ -216,49 +166,49 @@ namespace campvis {
void updateTextures();
/**
* Updates the textures vector elements that belongs to mesh geomteries.
* \note Only call with acquired lock and valid OpenGL context!!
* Resets the trackball and reinitializes the camera to the currently loaded geometries if necessary.
*/
void updateMeshGeomRenderedTextures();
void resetTrackball();
/**
* To be called when the canvas is invalidated, issues new paint job.
*/
void invalidate();
/**
* To be called when the mesh geometry parts of the scene is invalidated, issues new paint job only for textures that belong to mesh geomteries.
*/
void invalidateMeshGeomTextures();
/**
* Renders the given 2D texture.
* Binds the texture to the shader, sets the uniforms and renders the quad.
* \param texture The texture to render.
* \param texture The texture to render. Must not be 0.
* \param uint2d The texture unit that will be attached to rendering pipeline (2D for 2D textures).
* \param uint2d The texture unit that will be attached to rendering pipeline (3D for 3D textures).
*/
void paintTexture(const tgt::Texture* texture, const tgt::TextureUnit& unit2d, const tgt::TextureUnit& unit3d);
/**
* Renders the Meshgeometry into the geometry renderer color buffer and depth buffer.
* Binds the texture to the shader, sets the uniforms and renders the mesh geometry.
* \param meshgeometry The mesh to be rendered.
* \param colorBuffer The color buffer that the object will be rendered to.
* \param depthBuffer The depth buffer that the object will be rendered to.
* \param meshIndex The index of the rendered mesh in the texture array.
* Renders \a geometry into a texture.
*
* \param name
* \param geometry
*/
void drawGeomteryData(const campvis::GeometryData* meshgeometry, tgt::Texture* colorBuffer, const int& trackballIndx);
void renderGeometryIntoTexture(const std::string& name, int textureIndex = -1);
/**
* Creates the quad used for rendering the textures.
*/
void createQuad();
std::map<QString, QtDataHandle> _handles;
std::vector<const tgt::Texture*> _textures; ///< vector of textures
bool _texturesDirty; ///< Flag that shows that the textures need update or not.
bool _meshGeomTexturesDirty; ///< Flag that shows that the mesh geometry textures need updare or not.
std::map<QString, QtDataHandle> _handles; ///< Map of DataHandles to show
/// Vector of textures to render. Each DataHandle contains an ImageData that has an OpenGL representation.
/// This ensures thread safety.
std::vector<QtDataHandle> _textures;
/// List of the names of all rendered geometries. This simplifies to update their rendering.
std::vector< std::pair<std::string, int> > _geometryNames;
bool _texturesDirty; ///< Flag that shows that the textures need update or not.
bool _geometriesDirty; ///< Flag that shows that the rendered geometries need update or not.
DataContainer* _dataContainer; ///< The DataContainer this widget is inspecting
tbb::mutex _localMutex; ///< Mutex protecting the local members
......@@ -266,25 +216,13 @@ namespace campvis {
tgt::Shader* _paintShader; ///< GLSL shader for rendering the textures
FaceGeometry* _quad; ///< Quad used for rendering
tgt::Color _color; ///< Color under the mouse cursor
float _depth; ///< Depth under the mouse cursor
DataContainerInspectorWidget* _widget; ///< Pointer to the widget which has access to this canvas
tgt::ivec2 _numTiles; ///< number of tiles on texture overview
tgt::ivec2 _quadSize; ///< size in pixels for each tile in overview
size_t _selectedTexture; ///< index of selected texture by mouse
int _selectedTrackball; ///< index of selected trackball which will be updated currently
bool _renderFullscreen; ///< flag whether to render in full screen
int _currentSlice; ///< current slice if rendering a 3D image fullscreen, render MIP if negative
tgt::Shader* _geometryRenderingShader; ///< GLSL shader for rendering the mesh geomteries
tgt::FramebufferObject* _frameBuffer;
tgt::Texture* _depthBuffer;
std::vector<campvis::CameraProperty*> _trackballCameraProperties; ///< The property of the trackball camera. Used to pass the trackball camera to the shader.
std::vector<TrackballNavigationEventListener*> _trackballEHs; ///< TrackBall Event Handler for the camera rotating around the object in the canvas
std::vector<GeometryTextureInfo> _geomTextureInfos; ///< Array of data regarding the rendered geomteries
DataContainer _localDataContainer; ///< Local DataContainer the GeometryRenderer works on
IVec2Property p_viewportSize;
GeometryRenderer _geometryRenderer; ///< GeometryRenderer used to render geometries
TrackballNavigationEventListener* _trackballEH;
};
}
......
application/gui/datacontainerinspectorwidget.cpp
View file @ 1f90eb62
......@@ -55,6 +55,7 @@
#include "modules/io/processors/genericimagereader.h"
#include <QFileDialog>
#include <QScrollArea>
namespace campvis {
......@@ -81,7 +82,6 @@ namespace campvis {
, _colorWidgetLayout(0)
, _lblColorVal(0)
, _colorValWidget(0)
, _ColorValWidgetPalette(0)
, _btnLoadFile(0)
, _btnSaveToFile(0)
, _propEditorWid(0)
......@@ -183,9 +183,9 @@ namespace campvis {
_colorValWidget->setAutoFillBackground(true);
_colorValWidget->setFixedSize(16, 16);
_ColorValWidgetPalette = new QPalette(palette());
_ColorValWidgetPalette->setColor(QPalette::Background, Qt::gray);
_colorValWidget->setPalette(*(_ColorValWidgetPalette));
_colorValWidgetPalette = QPalette(palette());
_colorValWidgetPalette.setColor(QPalette::Background, Qt::gray);
_colorValWidget->setPalette(_colorValWidgetPalette);
_colorWidgetLayout = new QHBoxLayout();
_colorWidgetLayout->setSpacing(0);
......@@ -200,20 +200,36 @@ namespace campvis {
_canvas = new DataContainerInspectorCanvas(_infoWidget);
_canvas->setMinimumSize(QSize(100, 100));
_infoWidgetLayout->addWidget(_canvas, 5, 0, 1, 2);
_infoWidgetLayout->setRowStretch(5, 2);
_pcWidget = new PropertyCollectionWidget(_infoWidget);
QScrollArea* _pipelinePropertiesScrollArea = new QScrollArea(_infoWidget);
_pipelinePropertiesScrollArea->setWidgetResizable(true);
_pipelinePropertiesScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
_pipelinePropertiesScrollArea->setFrameStyle(QScrollArea::NoFrame);
_pipelinePropertiesScrollArea->setMinimumHeight(224);
_pcWidget = new PropertyCollectionWidget(_pipelinePropertiesScrollArea);
_pcWidget->updatePropCollection(_canvas, _dataContainer);
_infoWidgetLayout->addWidget(_pcWidget, 6, 0, 1, 2);
_pipelinePropertiesScrollArea->setWidget(_pcWidget);
_infoWidgetLayout->addWidget(_pipelinePropertiesScrollArea, 6, 0, 1, 2);
_mainLayout->addWidget(_infoWidget, 0, 1, 3, 1);
qRegisterMetaType<QtDataHandle>("QtDataHandle");
qRegisterMetaType<tgt::vec4>("tgt_vec4");
connect(
_dctWidget->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
this, SLOT(onDCTWidgetSelectionModelSelectionChanged(const QItemSelection&, const QItemSelection&)));
connect(
this, SIGNAL(dataContainerChanged(const QString&, QtDataHandle)),
_canvas, SLOT(onDataContainerChanged(const QString&, QtDataHandle)));
connect(
_canvas, SIGNAL(s_colorChanged(const tgt::vec4&)),
this, SLOT(onColorChanged(const tgt::vec4&)));
connect(
_canvas, SIGNAL(s_depthChanged(float)),
this, SLOT(onDepthChanged(float)));
connect(
this, SIGNAL(dataContainerChanged(const QString&, QtDataHandle)),
_dctWidget->getTreeModel(), SLOT(onDataContainerChanged(const QString&, QtDataHandle)));
......@@ -222,26 +238,6 @@ namespace campvis {
this, SLOT(onBtnLoadFileClicked()));
}
void DataContainerInspectorWidget::updateColor(){
const tgt::Color& color = _canvas->getCapturedColor();
_lblColorVal->setText(QString("Color: [%1, %2, %3, %4]").arg(QString::number(color.r), QString::number(color.g), QString::number(color.b), QString::number(color.a)));
_ColorValWidgetPalette->setColor(QPalette::Background, QColor(static_cast<int>(color.r * 255), static_cast<int>(color.g * 255), static_cast<int>(color.b * 255)));
_colorValWidget->setPalette(*_ColorValWidgetPalette);
}
void DataContainerInspectorWidget::updateDepth(){
float depth = _canvas->getCapturedDepth();
_lblColorVal->setText(QString("Depth: %1").arg(QString::number(depth)));
_ColorValWidgetPalette->setColor(QPalette::Background, QColor(static_cast<int>(depth * 255), static_cast<int>(depth * 255), static_cast<int>(depth * 255)));
_colorValWidget->setPalette(*_ColorValWidgetPalette);
}
void DataContainerInspectorWidget::updateInfoWidget() {
if (!_inited)
return;
......@@ -290,11 +286,11 @@ namespace campvis {
_canvas->p_currentSlice.setVisible(tester->getDimensionality() == 3);
_canvas->p_transferFunction.setVisible(true);
_canvas->p_meshSolidColor.setVisible(false);
_canvas->p_renderRChannel.setVisible(true);
_canvas->p_renderGChannel.setVisible(true);
_canvas->p_renderBChannel.setVisible(true);
_canvas->p_renderAChannel.setVisible(true);
_canvas->p_geometryRendererProperties.setVisible(false);
}
else if (const GeometryData* tester = dynamic_cast<const GeometryData*>(handles.front().second.getData())) {
_lblSize->setText(tr("Size: n/a"));
......@@ -306,11 +302,11 @@ namespace campvis {
_canvas->p_currentSlice.setVisible(false);
_canvas->p_transferFunction.setVisible(false);
_canvas->p_meshSolidColor.setVisible(true);
_canvas->p_renderRChannel.setVisible(false);
_canvas->p_renderGChannel.setVisible(false);
_canvas->p_renderBChannel.setVisible(false);
_canvas->p_renderAChannel.setVisible(false);
_canvas->p_geometryRendererProperties.setVisible(true);
}
else if (const RenderData* tester = dynamic_cast<const RenderData*>(handles.front().second.getData())) {
const ImageData* id = tester->getNumColorTextures() > 0 ? tester->getColorTexture() : tester->getDepthTexture();
......@@ -333,11 +329,11 @@ namespace campvis {
_canvas->p_currentSlice.setVisible(false);
_canvas->p_transferFunction.setVisible(true);
_canvas->p_meshSolidColor.setVisible(false);
_canvas->p_renderRChannel.setVisible(true);
_canvas->p_renderGChannel.setVisible(true);
_canvas->p_renderBChannel.setVisible(true);
_canvas->p_renderAChannel.setVisible(true);
_canvas->p_geometryRendererProperties.setVisible(false);
}
#ifdef CAMPVIS_HAS_MODULE_COLUMBIA
else if (const FiberData* tester = dynamic_cast<const FiberData*>(handles.front().second.getData())) {
......@@ -389,7 +385,7 @@ namespace campvis {
void DataContainerInspectorWidget::init() {
if (_canvas != 0)
_canvas->init(this);
_canvas->init();
_inited = true;
}
......@@ -533,4 +529,20 @@ namespace campvis {
}
void DataContainerInspectorWidget::onColorChanged(const tgt::vec4& color) {
_lblColorVal->setText(QString("Color: [%1, %2, %3, %4]").arg(QString::number(color.r), QString::number(color.g), QString::number(color.b), QString::number(color.a)));
tgt::ivec4 clamped(tgt::clamp(color * 255.f, 0.f, 255.f));
_colorValWidgetPalette.setColor(QPalette::Background, QColor(clamped.r, clamped.g, clamped.b, clamped.a));
_colorValWidget->setPalette(_colorValWidgetPalette);
}
void DataContainerInspectorWidget::onDepthChanged(float depth) {
_lblColorVal->setText(QString("Depth: %1").arg(QString::number(depth)));
tgt::ivec4 clamped(tgt::clamp(depth * 255.f, 0.f, 255.f));
_colorValWidgetPalette.setColor(QPalette::Background, QColor(clamped.r, clamped.g, clamped.b, clamped.a));
_colorValWidget->setPalette(_colorValWidgetPalette);
}
}
\ No newline at end of file
application/gui/datacontainerinspectorwidget.h
View file @ 1f90eb62
......@@ -89,10 +89,6 @@ namespace campvis {
*/
void onDataContainerDataAdded(const std::string&, const DataHandle&);
void mousePressEvent(QMouseEvent*) {
updateInfoWidget();
}
/**
* Size hint for the default window size
* \return QSize(640, 480)
......@@ -111,16 +107,6 @@ namespace campvis {
*/
void deinit();
/**
* Updates color of the info widget
*/
void updateColor();
/**
* Updates depth of the info widget
*/
void updateDepth();
signals:
void dataContainerChanged(const QString&, QtDataHandle);
......@@ -138,26 +124,22 @@ namespace campvis {
*/
void onBtnSaveToFileClicked();
/**
* Slot being called when the user clicks on the "Load File" button.
*/
void onBtnLoadFileClicked();
/// Slot being called when the color under the mouse has changed
void onColorChanged(const tgt::vec4& color);
/// Slot being called when the depth under the mouse has changed
void onDepthChanged(float depth);
protected:
/**
* Setup the GUI stuff
*/
void setupGUI();
/**
* Saves the Image in \a handle to the file \a filename.
* \note This method must be called with a valid OpenGL context!
* \param handle DataHandle containing the image to save. Must contain ImageData or RenderData!
* \param filename Filename for the file to save.
*/
protected:
static void saveToFile(DataHandle handle, std::string filename);
......@@ -196,10 +178,8 @@ namespace campvis {
QHBoxLayout* _colorWidgetLayout; ///< Layout for the following widget
QLabel* _lblColorVal; ///< Color Label Value in text
QWidget* _colorValWidget; ///< Widget that shows the color value in color
QPalette* _ColorValWidgetPalette; ///< Palette which will be used to colorize the color widget
QPalette _colorValWidgetPalette; ///< Palette which will be used to colorize the color widget
// Added by Hossain Mahmud <mahmud@in.tum.de>
// Date: January 02, 2014
QPushButton* _btnLoadFile;
QPushButton* _btnSaveToFile;
DataContainerFileLoaderWidget* _propEditorWid;
......
ext/tgt/texture.cpp
View file @ 1f90eb62
......@@ -464,194 +464,272 @@ void Texture::uploadTexture() {
LGL_ERROR;
}
tgt::Color Texture::texelAsFloat(size_t x, size_t y) const {
tgt::Color ret = tgt::Color(0.0f);
switch(format_) {
case GL_RGBA:
tgt::vec4 Texture::texelAsFloat(size_t x, size_t y) const {
tgt::vec4 ret = tgt::vec4(0.0f);
switch (getNumChannels()) {
case 4:
switch(dataType_) {
case GL_UNSIGNED_BYTE: {
tgt::Vector4<uint8_t> t = texel< tgt::Vector4<uint8_t> >(x,y);
ret.x = (float )t.x / 0xFF;
ret.y = (float )t.y / 0xFF;
ret.z = (float )t.z / 0xFF;
ret.w = (float )t.w / 0xFF;
case GL_BYTE:
ret = tgt::vec4(texel< tgt::Vector4<int8_t> >(x, y)) / float(0xFF);
break;
}
case GL_UNSIGNED_SHORT: {
tgt::Vector4<uint16_t> t = texel< tgt::Vector4<uint16_t> >(x,y);
ret.x = (float )t.x / 0xFFFF;
ret.y = (float )t.y / 0xFFFF;
ret.z = (float )t.z / 0xFFFF;
ret.w = (float )t.w / 0xFFFF;
case GL_UNSIGNED_BYTE:
ret = tgt::vec4(texel< tgt::Vector4<uint8_t> >(x, y)) / float(0xFF);
break;
case GL_SHORT:
ret = tgt::vec4(texel< tgt::Vector4<int16_t> >(x, y)) / float(0xFFFF);
break;
case GL_UNSIGNED_SHORT:
ret = tgt::vec4(texel< tgt::Vector4<uint16_t> >(x, y)) / float(0xFFFF);
break;
case GL_INT:
ret = tgt::vec4(texel< tgt::Vector4<int32_t> >(x, y)) / float(0xFFFFFFFF);
break;
case GL_UNSIGNED_INT:
ret = tgt::vec4(texel< tgt::Vector4<uint32_t> >(x, y)) / float(0xFFFFFFFF);
break;
}
case GL_FLOAT:
ret = texel<tgt::Color>(x,y);
ret = texel< tgt::vec4 >(x, y);
break;
default:
LWARNINGC("tgt.texture", "texelAsFloat: Unknown data type!");
}
break;
case GL_RGB:
case 3: {
tgt::vec3 tmp;
switch(dataType_) {
case GL_UNSIGNED_BYTE: {
tgt::Vector3<uint8_t> t = texel< tgt::Vector3<uint8_t> >(x,y);
ret.x = (float )t.x / 0xFF;
ret.y = (float )t.y / 0xFF;
ret.z = (float )t.z / 0xFF;
ret.w = 1.0f;
case GL_BYTE:
tmp = tgt::vec3(texel< tgt::Vector3<int8_t> >(x, y)) / float(0xFF);
break;
}
case GL_UNSIGNED_SHORT: {
tgt::Vector3<uint16_t> t = texel< tgt::Vector3<uint16_t> >(x,y);
ret.x = (float )t.x / 0xFFFF;
ret.y = (float )t.y / 0xFFFF;
ret.z = (float )t.z / 0xFFFF;
ret.w = 1.0f;
case GL_UNSIGNED_BYTE:
tmp = tgt::vec3(texel< tgt::Vector3<uint8_t> >(x, y)) / float(0xFF);
break;
}
case GL_FLOAT: {
tgt::Vector3f t = texel<tgt::Vector3f>(x,y);
ret.x = t.x;
ret.y = t.y;
ret.z = t.z;
ret.w = 1.0f;
case GL_SHORT:
tmp = tgt::vec3(texel< tgt::Vector3<int16_t> >(x, y)) / float(0xFFFF);
break;
case GL_UNSIGNED_SHORT:
tmp = tgt::vec3(texel< tgt::Vector3<uint16_t> >(x, y)) / float(0xFFFF);
break;
case GL_INT:
tmp = tgt::vec3(texel< tgt::Vector3<int32_t> >(x, y)) / float(0xFFFFFFFF);
break;
case GL_UNSIGNED_INT:
tmp = tgt::vec3(texel< tgt::Vector3<uint32_t> >(x, y)) / float(0xFFFFFFFF);