Commit 0e440a30 authored by Hossain Mahmud's avatar Hossain Mahmud
Browse files

DataInspector screen update handled

parent 054bd1f7
......@@ -472,12 +472,12 @@ namespace campvis {
GenericImageReader *imgReader = new GenericImageReader();
imgReader->setURL(fileTobeRead);
PropertyEditorWidget *propEditorWid = new PropertyEditorWidget(_dctWidget->getTreeModel(), nullptr);
PropertyEditorWidget *propEditorWid = new PropertyEditorWidget(this, nullptr); //_dctWidget->getTreeModel()
propEditorWid->setDataContainer(_dataContainer);
propEditorWid->setImageReader(imgReader);
propEditorWid->updatePropCollection();
//propEditorWid->_propCollectionWidget->updatePropCollection(imgReader, _dataContainer);
//propEditorWid->setParentx(_dctWidget->getTreeModel());
propEditorWid->setParentx(this);
imgReader->setVisibibility(".mhd", true);
propEditorWid->setVisible(true);
......
......@@ -51,6 +51,7 @@
#include "modules/columbia/datastructures/fiberdata.h"
#endif
#include "application/gui/datacontainerinspectorwidget.h"
#include "application/gui/datacontainertreewidget.h"
#include "application/gui/qtdatahandle.h"
#include "modules/io/processors/genericimagereader.h"
......@@ -61,7 +62,7 @@ namespace campvis {
const std::string PropertyEditorWidget::loggerCat_ = "CAMPVis.application.PropertyEditorWidget";
PropertyEditorWidget::PropertyEditorWidget(DataContainerTreeModel* treeModel, QWidget* parent)
PropertyEditorWidget::PropertyEditorWidget(DataContainerInspectorWidget* treeModel, QWidget* parent)
: QWidget(parent)
, _inited(false)
, _dataContainer(0)
......@@ -100,7 +101,7 @@ namespace campvis {
}
void PropertyEditorWidget::setParentx(DataContainerTreeModel* parent) {
void PropertyEditorWidget::setParentx(DataContainerInspectorWidget* parent) {
this->_parent = parent;
}
void PropertyEditorWidget::setImageReader (GenericImageReader* imgReader) {
......@@ -225,8 +226,8 @@ namespace campvis {
void PropertyEditorWidget::onBtnLoadFileClicked() {
_imgReader->process(*_dataContainer);
emit dataContainerChanged();
//emit dataContainerChanged();
this->_parent->setDataContainer(_dataContainer);
this->close();
}
......
......@@ -37,7 +37,8 @@
#include "application/gui/properties/stringpropertywidget.h"
#include "core/tools/opengljobprocessor.h"
#include "modules/io/processors/genericimagereader.h"
#include "application/gui/datacontainertreewidget.h"
//#include "application/gui/datacontainertreewidget.h"
#include "application/gui/datacontainerinspectorwidget.h"
#include <QLabel>
#include <QWidget>
......@@ -72,7 +73,7 @@ namespace campvis {
* Creates a new DataContainerInspectorWidget.
* \param parent Parent Qt widget, may be 0 (default)
*/
explicit PropertyEditorWidget(DataContainerTreeModel* treeModel, QWidget* parent = nullptr);
explicit PropertyEditorWidget(DataContainerInspectorWidget* treeModel, QWidget* parent = nullptr);
/**
* Destructor.
......@@ -84,7 +85,7 @@ namespace campvis {
* \param dataContainer The DataContainer this widget shall inspect, may be 0.
*/
void setDataContainer(DataContainer* dataContainer);
void setParentx(DataContainerTreeModel* parent);
void setParentx(DataContainerInspectorWidget* parent);
void setImageReader (GenericImageReader* imgReader);
void updatePropCollection ();
......@@ -182,7 +183,7 @@ namespace campvis {
GenericImageReader *_imgReader;
PropertyCollectionWidget* _propCollectionWidget; ///< Widget for browsing the PropertyCollection of the selected pipeline/processor
DataContainerTreeModel* _parent;
DataContainerInspectorWidget* _parent;
static const std::string loggerCat_;
};
......
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