Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
behavior_loader
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bioroboticslab
biotracker
behavior_loader
Commits
0a22499a
Commit
0a22499a
authored
6 years ago
by
moenck
Browse files
Options
Downloads
Patches
Plain Diff
Fixed getCurrentPluginName()
parent
82647698
No related branches found
No related tags found
No related merge requests found
Pipeline
#12625
failed
6 years ago
Stage: build
Stage: package
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SrcBehaviorLoader/PluginLoader.cpp
+18
-7
18 additions, 7 deletions
SrcBehaviorLoader/PluginLoader.cpp
SrcBehaviorLoader/PluginLoader.h
+3
-4
3 additions, 4 deletions
SrcBehaviorLoader/PluginLoader.h
with
21 additions
and
11 deletions
SrcBehaviorLoader/PluginLoader.cpp
+
18
−
7
View file @
0a22499a
...
...
@@ -205,6 +205,7 @@ std::vector<std::string> PluginLoader::searchDirectoriesForPlugins(std::vector<s
PluginLoader
::
PluginLoader
(
QObject
*
parent
)
{
m_MetaData
=
nullptr
;
m_PluginLoader
=
new
QPluginLoader
(
this
);
m_PluginListModel
=
new
QStringListModel
();
}
...
...
@@ -233,6 +234,7 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
retval
=
m_PluginLoader
->
load
();
QString
s
=
m_PluginLoader
->
errorString
();
std
::
string
ss
=
s
.
toStdString
();
addPluginnameToLists
(
getCurrentPluginName
(),
filename
);
if
(
!
m_PluginLoader
->
isLoaded
())
{
...
...
@@ -248,6 +250,14 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
return
retval
;
}
void
PluginLoader
::
addPluginnameToLists
(
QString
mstring
,
QString
filename
)
{
if
(
!
m_PluginList
.
contains
(
mstring
))
m_PluginList
.
append
(
mstring
);
m_PluginListModel
->
setStringList
(
m_PluginList
);
m_PluginMap
.
insert
(
std
::
pair
<
QString
,
QString
>
(
mstring
,
filename
));
}
bool
PluginLoader
::
loadPluginFromName
(
QString
name
)
{
QString
filename
=
m_PluginMap
.
find
(
name
)
->
second
;
return
loadPluginFromFilename
(
filename
);
...
...
@@ -266,10 +276,7 @@ int PluginLoader::addToPluginList(QString filename, QString suffix) {
QJsonValue
pluginMeda
(
loader
.
metaData
().
value
(
"MetaData"
));
QJsonObject
metaObj
=
pluginMeda
.
toObject
();
QString
mstring
=
metaObj
.
value
(
"name"
).
toString
();
if
(
!
m_PluginList
.
contains
(
mstring
))
m_PluginList
.
append
(
mstring
);
m_PluginListModel
->
setStringList
(
m_PluginList
);
m_PluginMap
.
insert
(
std
::
pair
<
QString
,
QString
>
(
mstring
,
filename
));
addPluginnameToLists
(
mstring
,
filename
);
}
else
{
return
2
;
...
...
@@ -288,12 +295,14 @@ QObject* PluginLoader::getPluginInstance() {
QJsonObject
PluginLoader
::
getPluginMetaData
()
const
{
return
m_MetaData
;
if
(
m_MetaData
==
nullptr
)
qFatal
(
"(getPluginMetaData) No plugin loaded"
);
return
*
m_MetaData
;
}
void
PluginLoader
::
readMetaDataFromPlugin
()
{
m_MetaData
=
m_PluginLoader
->
metaData
().
value
(
"MetaData"
).
toObject
();
m_MetaData
=
std
::
make_shared
<
QJsonObject
>
(
m_PluginLoader
->
metaData
().
value
(
"MetaData"
).
toObject
()
)
;
}
bool
PluginLoader
::
getIsPluginLoaded
()
{
...
...
@@ -301,7 +310,9 @@ bool PluginLoader::getIsPluginLoaded() {
}
QString
PluginLoader
::
getCurrentPluginName
()
{
return
m_currentPluginName
;
if
(
m_MetaData
==
nullptr
)
return
"Error name"
;
return
m_MetaData
->
value
(
"name"
).
toString
();
}
const
std
::
map
<
QString
,
QString
>
&
PluginLoader
::
getPluginMap
()
const
{
...
...
This diff is collapsed.
Click to expand it.
SrcBehaviorLoader/PluginLoader.h
+
3
−
4
View file @
0a22499a
...
...
@@ -68,6 +68,8 @@ public:
private:
void
addPluginnameToLists
(
QString
name
,
QString
filename
);
//a map containing the mapping "plugin name -> filename"
std
::
map
<
QString
,
QString
>
m_PluginMap
;
...
...
@@ -80,7 +82,7 @@ private:
// The QT object to actually load the plugins
QPluginLoader
*
m_PluginLoader
;
QJsonObject
m_MetaData
;
std
::
shared_ptr
<
QJsonObject
>
m_MetaData
;
//nomen est omen
bool
m_isPluginLoaded
;
...
...
@@ -88,9 +90,6 @@ private:
// List of all available plugins
QStringList
m_PluginList
;
//Name of the currently loaded plugin
QString
m_currentPluginName
;
// Entire ListModel of the metadata (actually containing all metadata, not only name)
QStringListModel
*
m_PluginListModel
;
};
...
...
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