Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
57e32368
Commit
57e32368
authored
Apr 15, 2010
by
Sebastian Eichelbaum
Browse files
[CHANGE] - empty property tabs do not get displayed.
parent
682bc879
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
7 deletions
+40
-7
src/gui/qt4/datasetbrowser/WPropertyIntWidget.cpp
src/gui/qt4/datasetbrowser/WPropertyIntWidget.cpp
+1
-1
src/gui/qt4/datasetbrowser/WPropertyStringWidget.cpp
src/gui/qt4/datasetbrowser/WPropertyStringWidget.cpp
+2
-2
src/gui/qt4/datasetbrowser/WQtDSBWidget.cpp
src/gui/qt4/datasetbrowser/WQtDSBWidget.cpp
+22
-1
src/gui/qt4/datasetbrowser/WQtDSBWidget.h
src/gui/qt4/datasetbrowser/WQtDSBWidget.h
+12
-0
src/gui/qt4/datasetbrowser/WQtDatasetBrowser.cpp
src/gui/qt4/datasetbrowser/WQtDatasetBrowser.cpp
+2
-3
src/modules/template/WMTemplate.cpp
src/modules/template/WMTemplate.cpp
+1
-0
No files found.
src/gui/qt4/datasetbrowser/WPropertyIntWidget.cpp
View file @
57e32368
...
...
@@ -39,7 +39,7 @@ WPropertyIntWidget::WPropertyIntWidget( WPropInt property, QGridLayout* property
m_intProperty
(
property
),
m_slider
(
Qt
::
Horizontal
,
this
),
m_edit
(
this
),
m_layout
()
m_layout
(
this
)
{
// initialize members
m_edit
.
resize
(
m_edit
.
minimumSizeHint
().
width
()
,
m_edit
.
size
().
height
()
);
...
...
src/gui/qt4/datasetbrowser/WPropertyStringWidget.cpp
View file @
57e32368
...
...
@@ -36,12 +36,12 @@ WPropertyStringWidget::WPropertyStringWidget( WPropString property, QGridLayout*
WPropertyWidget
(
property
,
propertyGrid
,
parent
),
m_stringProperty
(
property
),
m_edit
(
this
),
m_layout
()
m_layout
(
this
)
{
// initialize members
setLayout
(
&
m_layout
);
// layout
both against each other
// layout
m_layout
.
addWidget
(
&
m_edit
);
// set the initial values
...
...
src/gui/qt4/datasetbrowser/WQtDSBWidget.cpp
View file @
57e32368
...
...
@@ -32,7 +32,8 @@ WQtDSBWidget::WQtDSBWidget( std::string name, QWidget* parent )
:
QWidget
(
parent
),
m_name
(
name
.
c_str
()
),
m_controlLayout
(),
m_pageLayout
()
m_pageLayout
(),
m_numberOfWidgets
(
0
)
{
m_pageLayout
.
addLayout
(
&
m_controlLayout
);
}
...
...
@@ -43,41 +44,57 @@ WQtDSBWidget::~WQtDSBWidget()
WPropertyBoolWidget
*
WQtDSBWidget
::
addProp
(
WPropBool
property
)
{
++
m_numberOfWidgets
;
return
new
WPropertyBoolWidget
(
property
,
&
m_controlLayout
,
this
);
}
WPropertyIntWidget
*
WQtDSBWidget
::
addProp
(
WPropInt
property
)
{
++
m_numberOfWidgets
;
return
new
WPropertyIntWidget
(
property
,
&
m_controlLayout
,
this
);
}
WPropertyDoubleWidget
*
WQtDSBWidget
::
addProp
(
WPropDouble
property
)
{
++
m_numberOfWidgets
;
return
new
WPropertyDoubleWidget
(
property
,
&
m_controlLayout
,
this
);
}
WPropertyStringWidget
*
WQtDSBWidget
::
addProp
(
WPropString
property
)
{
++
m_numberOfWidgets
;
return
new
WPropertyStringWidget
(
property
,
&
m_controlLayout
,
this
);
}
WPropertyColorWidget
*
WQtDSBWidget
::
addProp
(
WPropColor
property
)
{
++
m_numberOfWidgets
;
return
new
WPropertyColorWidget
(
property
,
&
m_controlLayout
,
this
);
}
WPropertyFilenameWidget
*
WQtDSBWidget
::
addProp
(
WPropFilename
property
)
{
++
m_numberOfWidgets
;
return
new
WPropertyFilenameWidget
(
property
,
&
m_controlLayout
,
this
);
}
WPropertyTriggerWidget
*
WQtDSBWidget
::
addProp
(
WPropTrigger
property
)
{
++
m_numberOfWidgets
;
return
new
WPropertyTriggerWidget
(
property
,
&
m_controlLayout
,
this
);
}
void
WQtDSBWidget
::
addGroup
(
WQtDSBWidget
*
widget
)
{
++
m_numberOfWidgets
;
// TODO(ebaum): extend it to collapse the group
QGroupBox
*
group
=
new
QGroupBox
(
widget
->
getName
()
,
this
);
QGridLayout
*
grid
=
new
QGridLayout
();
...
...
@@ -105,3 +122,7 @@ void WQtDSBWidget::setName( QString name )
m_name
=
name
;
}
bool
WQtDSBWidget
::
isEmpty
()
const
{
return
!
m_numberOfWidgets
;
}
src/gui/qt4/datasetbrowser/WQtDSBWidget.h
View file @
57e32368
...
...
@@ -60,6 +60,13 @@ public:
*/
virtual
~
WQtDSBWidget
();
/**
* True if there are no widgets inside.
*
* \return true if number of widgets is 0.
*/
bool
isEmpty
()
const
;
/**
* helper function to add a generic button
* \param label Text on the push button
...
...
@@ -188,6 +195,11 @@ private:
* Layout used for the whole widget.
*/
QVBoxLayout
m_pageLayout
;
/**
* The number of widgets inside this one.
*/
unsigned
int
m_numberOfWidgets
;
};
#endif // WQTDSBWIDGET_H
src/gui/qt4/datasetbrowser/WQtDatasetBrowser.cpp
View file @
57e32368
...
...
@@ -426,7 +426,7 @@ void WQtDatasetBrowser::selectRoiTreeItem()
WQtDSBWidget
*
WQtDatasetBrowser
::
buildPropWidget
(
boost
::
shared_ptr
<
WProperties
>
props
)
{
WQtDSBWidget
*
tab
=
new
WQtDSBWidget
(
QString
::
fromStdString
(
props
->
getName
()
)
);
WQtDSBWidget
*
tab
=
new
WQtDSBWidget
(
props
->
getName
()
);
if
(
props
.
get
()
)
{
...
...
@@ -563,10 +563,9 @@ void WQtDatasetBrowser::changeRoiTreeItem()
}
}
int
WQtDatasetBrowser
::
addTabWidgetContent
(
WQtDSBWidget
*
content
)
{
if
(
!
content
)
if
(
!
content
||
content
->
isEmpty
()
)
{
return
-
1
;
}
...
...
src/modules/template/WMTemplate.cpp
View file @
57e32368
...
...
@@ -235,6 +235,7 @@ void WMTemplate::properties()
// TODO(ebaum): write
m_aIntegerOutput
=
m_infoProperties
->
addProperty
(
"Run Count"
,
"Number of run cycles the module made so far."
,
0
);
m_aIntegerOutput
->
setPurpose
(
PV_PURPOSE_INFORMATION
);
}
void
WMTemplate
::
moduleMain
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment