Commit 4c4e6d0c authored by schultezub's avatar schultezub
Browse files

fix DataContainerInspectorCanvas minimum height + TF editor widget dock area

git-svn-id: https://camplinux.in.tum.de/svn/campvis/branches/gui-redux@520 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent 30524611
......@@ -252,10 +252,10 @@ namespace campvis {
CtxtMgr.releaseCurrentContext();
}
void CampVisApplication::registerDockWidget(Qt::DockWidgetArea area, QDockWidget* dock) {
tgtAssert(dock != 0, "Dock widget must not be 0.");
_mainWindow->addDockWidget(area, dock);
}
void CampVisApplication::registerDockWidget(Qt::DockWidgetArea area, QDockWidget* dock) {
tgtAssert(dock != 0, "Dock widget must not be 0.");
_mainWindow->addDockWidget(area, dock);
}
}
......@@ -34,7 +34,7 @@
#include "sigslot/sigslot.h"
#include <QApplication>
#include <QDockWidget>
#include <QDockWidget>
#include <utility>
#include <vector>
......@@ -110,15 +110,15 @@ namespace campvis {
void addVisualizationPipeline(const std::string& name, VisualizationPipeline* vp);
/**
* Adds a dock widget to the main window.
* The dock widget will be automatically docked in the specified area.
*
* \param area Area of the main window to which the dock widget should be added.
* \param dock The dock widget to add to the main window.
*/
void registerDockWidget(Qt::DockWidgetArea area, QDockWidget* dock);
/**
* Adds a dock widget to the main window.
* The dock widget will be automatically docked in the specified area.
*
* \param area Area of the main window to which the dock widget should be added.
* \param dock The dock widget to add to the main window.
*/
void registerDockWidget(Qt::DockWidgetArea area, QDockWidget* dock);
/**
* Runs the actual application.
* Make sure to call init() before.
* \return 0 on success.
......
......@@ -133,6 +133,7 @@ namespace campvis {
_infoWidgetLayout->addWidget(_btnSaveToFile);
_canvas = new DataContainerInspectorCanvas(_infoWidget);
_canvas->setMinimumSize(QSize(100, 100));
_infoWidgetLayout->addWidget(_canvas, 1);
_pcWidget = new PropertyCollectionWidget(_infoWidget);
......
......@@ -31,7 +31,7 @@
#include "application/gui/properties/abstracttransferfunctioneditor.h"
#include "application/gui/properties/transferfunctioneditorfactory.h"
#include "application/campvisapplication.h"
#include "application/campvisapplication.h"
#include "core/datastructures/imagerepresentationlocal.h"
#include <QDockWidget>
......@@ -141,10 +141,10 @@ namespace campvis {
_dockWidget = new QDockWidget("Transfer Function Editor");
_dockWidget->setWidget(_editor);
static_cast<CampVisApplication*>(qApp)->registerDockWidget(Qt::RightDockWidgetArea, _dockWidget);
} else {
_dockWidget->setVisible(true);
}
static_cast<CampVisApplication*>(qApp)->registerDockWidget(Qt::BottomDockWidgetArea, _dockWidget);
} else {
_dockWidget->setVisible(true);
}
}
void TransferFunctionPropertyWidget::onFitClicked(bool checked) {
......
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