Commit 9109cd1a authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[CHANGE #358] changed name of WQtDSBWidget to WQtPropertyGroupWidget as

there is no such thing as DSB anymore and because this name refelects the
purpose of the class much better
parent 2306824c
......@@ -29,7 +29,7 @@ SET(GUI_QT4_MOC_HDRS
controlPanel/WPropertySelectionWidget.h
controlPanel/WPropertyPositionWidget.h
controlPanel/WQtControlPanel.h
controlPanel/WQtDSBWidget.h
controlPanel/WQtPropertyGroupWidget.h
controlPanel/WQtTreeWidget.h
controlPanel/WQtTreeItem.h
controlPanel/WQtTextureSorter.h
......
......@@ -1000,7 +1000,7 @@ void WQtConfigWidget::updateGui( boost::shared_ptr< WProperties > properties )
updatePropertyGroups( properties, "modules.defaultList", true );
}
WQtDSBWidget *WQtConfigWidget::createTabForSection( boost::shared_ptr< WProperties > from, std::string sectionName )
WQtPropertyGroupWidget *WQtConfigWidget::createTabForSection( boost::shared_ptr< WProperties > from, std::string sectionName )
{
WProperties::PropertyAccessType accesObject = from->getAccessObject();
// Temporarily disabled since locking causes several problems here :-/
......@@ -1012,7 +1012,7 @@ WQtDSBWidget *WQtConfigWidget::createTabForSection( boost::shared_ptr< WProperti
name = from->getName();
}
WQtDSBWidget* tab = new WQtDSBWidget( name );
WQtPropertyGroupWidget* tab = new WQtPropertyGroupWidget( name );
WProperties::PropertyIterator iter;
for ( iter = accesObject->get().begin(); iter != accesObject->get().end(); ++iter )
......
......@@ -39,7 +39,7 @@
#include "../../common/WProperties.h"
#include "../../common/WThreadedRunner.h"
#include "controlPanel/WQtDSBWidget.h"
#include "controlPanel/WQtPropertyGroupWidget.h"
/**
* Class that provides registration, loading and writing of the standard config file walnut.cfg
......@@ -176,7 +176,7 @@ private:
*
* \result pointer to the widget
*/
WQtDSBWidget *createTabForSection( boost::shared_ptr< WProperties > from, std::string sectionName );
WQtPropertyGroupWidget *createTabForSection( boost::shared_ptr< WProperties > from, std::string sectionName );
/**
* creates the whole gui for a give property group
......
......@@ -756,9 +756,9 @@ void WQtControlPanel::selectDataModule( boost::shared_ptr< WDataSet > dataSet )
selectTreeItem();
}
WQtDSBWidget* WQtControlPanel::buildPropWidget( boost::shared_ptr< WProperties > props )
WQtPropertyGroupWidget* WQtControlPanel::buildPropWidget( boost::shared_ptr< WProperties > props )
{
WQtDSBWidget* tab = new WQtDSBWidget( props->getName() );
WQtPropertyGroupWidget* tab = new WQtPropertyGroupWidget( props->getName() );
if ( props.get() )
{
......@@ -818,8 +818,8 @@ WQtDSBWidget* WQtControlPanel::buildPropWidget( boost::shared_ptr< WProperties
void WQtControlPanel::buildPropTab( boost::shared_ptr< WProperties > props, boost::shared_ptr< WProperties > infoProps )
{
WQtDSBWidget* tab = NULL;
WQtDSBWidget* infoTab = NULL;
WQtPropertyGroupWidget* tab = NULL;
WQtPropertyGroupWidget* infoTab = NULL;
if ( props )
{
tab = buildPropWidget( props );
......@@ -905,7 +905,7 @@ void WQtControlPanel::changeRoiTreeItem()
}
}
int WQtControlPanel::addTabWidgetContent( WQtDSBWidget* content )
int WQtControlPanel::addTabWidgetContent( WQtPropertyGroupWidget* content )
{
if ( !content || content->isEmpty() )
{
......
......@@ -39,7 +39,7 @@
#include "../../../graphicsEngine/WROI.h"
#include "../../../kernel/modules/fiberDisplay/WRMROIRepresentation.h"
#include "../WQtCombinerToolbar.h"
#include "WQtDSBWidget.h"
#include "WQtPropertyGroupWidget.h"
#include "WQtModuleHeaderTreeItem.h"
#include "WQtModuleTreeItem.h"
#include "WQtRoiHeaderTreeItem.h"
......@@ -76,7 +76,7 @@ public:
*
* \return the index of the new tab
*/
int addTabWidgetContent( WQtDSBWidget* content );
int addTabWidgetContent( WQtPropertyGroupWidget* content );
/**
* Adds a subject entry to the tree widget
......@@ -297,7 +297,7 @@ private slots:
*
* \param props the properties.
*/
WQtDSBWidget* buildPropWidget( boost::shared_ptr< WProperties > props );
WQtPropertyGroupWidget* buildPropWidget( boost::shared_ptr< WProperties > props );
/**
* function gets called when a change to a tree item, eg. check box status, occurs
......
......@@ -28,9 +28,9 @@
#include <QtGui/QPushButton>
#include <QtGui/QScrollArea>
#include "WQtDSBWidget.h"
#include "WQtPropertyGroupWidget.h"
WQtDSBWidget::WQtDSBWidget( std::string name, QWidget* parent )
WQtPropertyGroupWidget::WQtPropertyGroupWidget( std::string name, QWidget* parent )
: QWidget( parent ),
m_name( name.c_str() ),
// m_controlLayout(),
......@@ -44,74 +44,74 @@ WQtDSBWidget::WQtDSBWidget( std::string name, QWidget* parent )
m_pageLayout->addLayout( m_controlLayout );
}
WQtDSBWidget::~WQtDSBWidget()
WQtPropertyGroupWidget::~WQtPropertyGroupWidget()
{
}
WPropertyBoolWidget* WQtDSBWidget::addProp( WPropBool property )
WPropertyBoolWidget* WQtPropertyGroupWidget::addProp( WPropBool property )
{
++m_numberOfWidgets;
return new WPropertyBoolWidget( property, m_controlLayout, this );
}
WPropertyIntWidget* WQtDSBWidget::addProp( WPropInt property )
WPropertyIntWidget* WQtPropertyGroupWidget::addProp( WPropInt property )
{
++m_numberOfWidgets;
return new WPropertyIntWidget( property, m_controlLayout, this );
}
WPropertyDoubleWidget* WQtDSBWidget::addProp( WPropDouble property )
WPropertyDoubleWidget* WQtPropertyGroupWidget::addProp( WPropDouble property )
{
++m_numberOfWidgets;
return new WPropertyDoubleWidget( property, m_controlLayout, this );
}
WPropertyStringWidget* WQtDSBWidget::addProp( WPropString property )
WPropertyStringWidget* WQtPropertyGroupWidget::addProp( WPropString property )
{
++m_numberOfWidgets;
return new WPropertyStringWidget( property, m_controlLayout, this );
}
WPropertyColorWidget* WQtDSBWidget::addProp( WPropColor property )
WPropertyColorWidget* WQtPropertyGroupWidget::addProp( WPropColor property )
{
++m_numberOfWidgets;
return new WPropertyColorWidget( property, m_controlLayout, this );
}
WPropertyFilenameWidget* WQtDSBWidget::addProp( WPropFilename property )
WPropertyFilenameWidget* WQtPropertyGroupWidget::addProp( WPropFilename property )
{
++m_numberOfWidgets;
return new WPropertyFilenameWidget( property, m_controlLayout, this );
}
WPropertyTriggerWidget* WQtDSBWidget::addProp( WPropTrigger property )
WPropertyTriggerWidget* WQtPropertyGroupWidget::addProp( WPropTrigger property )
{
++m_numberOfWidgets;
return new WPropertyTriggerWidget( property, m_controlLayout, this );
}
WPropertyPositionWidget* WQtDSBWidget::addProp( WPropPosition property )
WPropertyPositionWidget* WQtPropertyGroupWidget::addProp( WPropPosition property )
{
++m_numberOfWidgets;
return new WPropertyPositionWidget( property, m_controlLayout, this );
}
WPropertySelectionWidget* WQtDSBWidget::addProp( WPropSelection property )
WPropertySelectionWidget* WQtPropertyGroupWidget::addProp( WPropSelection property )
{
++m_numberOfWidgets;
return new WPropertySelectionWidget( property, m_controlLayout, this );
}
void WQtDSBWidget::addGroup( WQtDSBWidget* widget, bool asScrollArea )
void WQtPropertyGroupWidget::addGroup( WQtPropertyGroupWidget* widget, bool asScrollArea )
{
++m_numberOfWidgets;
......@@ -172,23 +172,23 @@ void WQtDSBWidget::addGroup( WQtDSBWidget* widget, bool asScrollArea )
m_controlLayout->addWidget( box, row, 0, 1, 2 );
}
void WQtDSBWidget::addSpacer()
void WQtPropertyGroupWidget::addSpacer()
{
m_pageLayout->addStretch();
setLayout( m_pageLayout );
}
QString WQtDSBWidget::getName()
QString WQtPropertyGroupWidget::getName()
{
return m_name;
}
void WQtDSBWidget::setName( QString name )
void WQtPropertyGroupWidget::setName( QString name )
{
m_name = name;
}
bool WQtDSBWidget::isEmpty() const
bool WQtPropertyGroupWidget::isEmpty() const
{
return !m_numberOfWidgets;
}
......@@ -22,8 +22,8 @@
//
//---------------------------------------------------------------------------
#ifndef WQTDSBWIDGET_H
#define WQTDSBWIDGET_H
#ifndef WQTPROPERTYGROUPWIDGET_H
#define WQTPROPERTYGROUPWIDGET_H
#include <string>
......@@ -43,9 +43,9 @@
#include "../../../common/WPropertyVariable.h"
/**
* Container widget to contain the context widget for the control panel.
* Container widget to contain a number of properties for the module context in the control panel.
*/
class WQtDSBWidget : public QWidget
class WQtPropertyGroupWidget : public QWidget
{
Q_OBJECT
......@@ -55,12 +55,12 @@ public:
* \param name Name of the widget
* \param parent The widget managing this widget
*/
explicit WQtDSBWidget( std::string name, QWidget* parent = 0 );
explicit WQtPropertyGroupWidget( std::string name, QWidget* parent = 0 );
/**
* destructor
*/
virtual ~WQtDSBWidget();
virtual ~WQtPropertyGroupWidget();
/**
* True if there are no widgets inside.
......@@ -76,7 +76,7 @@ public:
QPushButton* addPushButton( QString label );
/**
* Adds a new bool property to the DSB.
* Adds a new bool property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -85,7 +85,7 @@ public:
WPropertyBoolWidget* addProp( WPropBool property );
/**
* Adds a new int property to the DSB.
* Adds a new int property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -94,7 +94,7 @@ public:
WPropertyIntWidget* addProp( WPropInt property );
/**
* Adds a new double property to the DSB.
* Adds a new double property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -103,7 +103,7 @@ public:
WPropertyDoubleWidget* addProp( WPropDouble property );
/**
* Adds a new string property to the DSB.
* Adds a new string property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -112,7 +112,7 @@ public:
WPropertyStringWidget* addProp( WPropString property );
/**
* Adds a new path property to the DSB.
* Adds a new path property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -121,7 +121,7 @@ public:
WPropertyFilenameWidget* addProp( WPropFilename property );
/**
* Adds a new list property to the DSB.
* Adds a new list property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -130,7 +130,7 @@ public:
WPropertySelectionWidget* addProp( WPropSelection property );
/**
* Adds a new position property to the DSB.
* Adds a new position property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -139,7 +139,7 @@ public:
WPropertyPositionWidget* addProp( WPropPosition property );
/**
* Adds a new color property to the DSB.
* Adds a new color property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -148,7 +148,7 @@ public:
WPropertyColorWidget* addProp( WPropColor property );
/**
* Adds a new trigger property to the DSB.
* Adds a new trigger property to the PropertyGroup.
*
* \param property the property to add.
*
......@@ -162,7 +162,7 @@ public:
* \param widget the widget
* \param asScrollArea true if the group should be embedded into a scroll area
*/
void addGroup( WQtDSBWidget* widget, bool asScrollArea = false );
void addGroup( WQtPropertyGroupWidget* widget, bool asScrollArea = false );
/**
* helper function to add a spacer at the end
......@@ -205,4 +205,4 @@ private:
unsigned int m_numberOfWidgets;
};
#endif // WQTDSBWIDGET_H
#endif // WQTPROPERTYGROUPWIDGET_H
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