Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
6e4a9bba
Commit
6e4a9bba
authored
6 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Added en/disabling of button and removed log messages (sorry)
parent
de73b5a9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp
+12
-12
12 additions, 12 deletions
...s/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp
with
12 additions
and
12 deletions
source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp
+
12
−
12
View file @
6e4a9bba
...
...
@@ -144,7 +144,7 @@ void DebugDrawerViewerWidgetController::updateComboClearLayer()
combo
->
setFont
(
font
);
};
auto
setHint
=
[
combo
,
&
setItalic
](
const
std
::
string
&
hint
)
auto
disableButton
=
[
combo
,
this
,
&
setItalic
](
const
std
::
string
&
hint
)
{
QString
itemText
(
hint
.
c_str
());
QString
itemData
(
""
);
...
...
@@ -160,11 +160,13 @@ void DebugDrawerViewerWidgetController::updateComboClearLayer()
combo
->
setItemText
(
0
,
itemText
);
combo
->
setItemData
(
0
,
itemData
);
}
this
->
widget
.
btnClearLayer
->
setEnabled
(
false
);
};
if
(
!
debugDrawer
)
{
setHint
(
"not connected"
);
disableButton
(
"not connected"
);
return
;
}
...
...
@@ -173,19 +175,19 @@ void DebugDrawerViewerWidgetController::updateComboClearLayer()
if
(
layers
.
empty
())
{
setHint
(
"no layers"
);
disableButton
(
"no layers"
);
return
;
}
else
if
(
combo
->
font
().
italic
())
else
{
setItalic
(
false
);
this
->
widget
.
btnClearLayer
->
setEnabled
(
true
);
}
const
int
numLayers
=
static_cast
<
int
>
(
layers
.
size
());
// sort the layers by name
std
::
sort
(
layers
.
begin
(),
layers
.
end
(),
[](
const
LayerInformation
&
lhs
,
const
LayerInformation
&
rhs
)
{
// compare case insensitively
for
(
std
::
size_t
i
=
0
;
i
<
lhs
.
layerName
.
size
()
&&
i
<
lhs
.
layerName
.
size
();
++
i
)
{
auto
lhsLow
=
std
::
tolower
(
lhs
.
layerName
[
i
]);
...
...
@@ -199,12 +201,14 @@ void DebugDrawerViewerWidgetController::updateComboClearLayer()
return
false
;
}
}
// if one is a prefix of the other, the shorter
is th
e "smaller"
one
// if one is a prefix of the other, the shorter
on
e "smaller"
return
lhs
.
layerName
.
size
()
<
rhs
.
layerName
.
size
();
});
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
layers
.
size
());
++
i
)
const
int
numLayers
=
static_cast
<
int
>
(
layers
.
size
());
for
(
int
i
=
0
;
i
<
numLayers
;
++
i
)
{
const
LayerInformation
&
layer
=
layers
[
static_cast
<
std
::
size_t
>
(
i
)];
...
...
@@ -219,7 +223,6 @@ void DebugDrawerViewerWidgetController::updateComboClearLayer()
{
// item layer is smaller than next layer
// => item layer was deleted
ARMARX_INFO
<<
"Removing "
<<
itemData
;
combo
->
removeItem
(
i
);
itemData
=
i
<
combo
->
count
()
?
combo
->
itemData
(
i
).
toString
()
:
""
;
}
...
...
@@ -227,20 +230,17 @@ void DebugDrawerViewerWidgetController::updateComboClearLayer()
// update existing layer
if
(
itemData
==
layerName
)
{
ARMARX_INFO
<<
"Updating "
<<
itemData
;
combo
->
setItemText
(
i
,
makeLayerItemText
(
layer
));
}
else
// (itemData > layerName)
{
// item layer is further down than current layer
// => insert current layer here
ARMARX_INFO
<<
"Inserting "
<<
layerName
<<
" before "
<<
itemData
;
combo
->
insertItem
(
i
,
makeLayerItemText
(
layer
),
layerName
);
}
}
else
// out of range
{
ARMARX_INFO
<<
"Inserting "
<<
layerName
<<
" at end"
;
combo
->
insertItem
(
i
,
makeLayerItemText
(
layer
),
layerName
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment