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
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lennard Hofmann
RobotAPI
Commits
bcef6b8f
Commit
bcef6b8f
authored
4 years ago
by
Christian Dreher
Browse files
Options
Downloads
Patches
Plain Diff
fix: Proper signal handling, refactor method name.
parent
c36e32f0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+12
-10
12 additions, 10 deletions
source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
source/RobotAPI/libraries/armem_gui/MemoryViewer.h
+3
-5
3 additions, 5 deletions
source/RobotAPI/libraries/armem_gui/MemoryViewer.h
with
15 additions
and
15 deletions
source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+
12
−
10
View file @
bcef6b8f
...
...
@@ -49,8 +49,8 @@ namespace armarx::armem::gui
ARMARX_CHECK_NULL
(
_instanceGroupBox
);
connect
(
this
,
&
This
::
connected
,
this
,
&
This
::
updateMemor
y
);
connect
(
updateWidget
,
&
armem
::
gui
::
PeriodicUpdateWidget
::
update
,
this
,
&
This
::
updateMemor
y
);
connect
(
this
,
&
This
::
connected
,
this
,
&
This
::
updateMemor
ies
);
connect
(
updateWidget
,
&
armem
::
gui
::
PeriodicUpdateWidget
::
update
,
this
,
&
This
::
updateMemor
ies
);
connect
(
this
,
&
This
::
memoryDataChanged
,
this
,
&
This
::
updateMemoryTree
);
connect
(
memoryGroup
->
tree
(),
&
armem
::
gui
::
MemoryTreeWidget
::
selectedItemChanged
,
this
,
&
This
::
updateInstanceTree
);
...
...
@@ -108,7 +108,7 @@ namespace armarx::armem::gui
}
void
MemoryViewer
::
updateMemor
y
()
// Todo: plural
void
MemoryViewer
::
updateMemor
ies
()
{
memoryReaders
.
clear
();
memoryData
.
clear
();
...
...
@@ -119,6 +119,8 @@ namespace armarx::armem::gui
memoryReaders
[
name
]
=
memoryReader
;
}
bool
dataChanged
=
false
;
for
(
auto
&
[
name
,
reader
]
:
memoryReaders
)
{
TIMING_START
(
MemoryQuery
);
...
...
@@ -146,7 +148,7 @@ namespace armarx::armem::gui
if
(
memoryData
[
name
])
{
emit
memoryD
ataChanged
(
name
)
;
d
ataChanged
=
true
;
}
else
{
...
...
@@ -156,6 +158,11 @@ namespace armarx::armem::gui
}
}
}
if
(
dataChanged
)
{
emit
memoryDataChanged
();
}
}
...
...
@@ -218,7 +225,7 @@ namespace armarx::armem::gui
}
}
void
MemoryViewer
::
updateMemoryTree
(
const
std
::
string
&
name
)
void
MemoryViewer
::
updateMemoryTree
()
{
std
::
map
<
std
::
string
,
const
armem
::
Memory
*>
convMap
;
for
(
auto
&
[
name
,
data
]
:
memoryData
)
...
...
@@ -271,8 +278,3 @@ namespace armarx::armem::gui
}
}
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/armem_gui/MemoryViewer.h
+
3
−
5
View file @
bcef6b8f
...
...
@@ -62,7 +62,7 @@ namespace armarx::armem::gui
public
slots
:
void
updateMemor
y
();
void
updateMemor
ies
();
void
updateInstanceTree
(
const
armem
::
MemoryID
&
selectedID
);
...
...
@@ -78,11 +78,11 @@ namespace armarx::armem::gui
private
slots
:
void
updateMemoryTree
(
const
std
::
string
&
);
void
updateMemoryTree
();
signals:
void
memoryDataChanged
(
const
std
::
string
&
);
void
memoryDataChanged
();
private:
...
...
@@ -120,5 +120,3 @@ namespace armarx::armem::gui
};
}
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