Skip to content

Commit bf1b920

Browse files
committed
Split libmrpt-apps into cli and gui parts
1 parent ee1937a commit bf1b920

File tree

113 files changed

+1302
-1024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1302
-1024
lines changed

apps/grid-matching/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ add_executable(${PROJECT_NAME}
2323
# Dependencies on MRPT libraries:
2424
# Just mention the top-level dependency, the rest will be detected automatically,
2525
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
26-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
26+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)
2727
DeclareAppForInstall(${PROJECT_NAME})

apps/icp-slam-live/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ add_executable(${PROJECT_NAME}
1111
# Dependencies on MRPT libraries:
1212
# Just mention the top-level dependency, the rest will be detected automatically,
1313
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
14-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
14+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)
1515

1616
DeclareAppForInstall(${PROJECT_NAME})

apps/icp-slam/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ add_executable(${PROJECT_NAME}
2323
# Dependencies on MRPT libraries:
2424
# Just mention the top-level dependency, the rest will be detected automatically,
2525
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
26-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
26+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)
2727

2828
DeclareAppForInstall(${PROJECT_NAME})

apps/kf-slam/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ add_executable(${PROJECT_NAME}
2525
# Dependencies on MRPT libraries:
2626
# Just mention the top-level dependency, the rest will be detected automatically,
2727
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
28-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
28+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)
2929

3030
DeclareAppForInstall(${PROJECT_NAME})

apps/pf-localization/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ add_executable(${PROJECT_NAME} pf_localization_main.cpp ${MRPT_VERSION_RC_FILE})
2323
# Dependencies on MRPT libraries:
2424
# Just mention the top-level dependency, the rest will be detected automatically,
2525
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
26-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
26+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)
2727

2828
DeclareAppForInstall(${PROJECT_NAME})

apps/rawlog-edit/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ add_executable(${PROJECT_NAME}
1616
DeclareAppForInstall(${PROJECT_NAME})
1717
# Dependencies on MRPT libraries: Just mention the top-level dependency, the rest will be detected automatically,
1818
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
19-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
19+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-cli)

apps/rawlog-edit/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
For instructions and more: see manpage of rawlog-edit
1313
---------------------------------------------------------------*/
1414

15-
#include <mrpt/apps/RawlogEditApp.h>
15+
#include <mrpt/apps-cli/RawlogEditApp.h>
1616

1717
#include <iostream>
1818

apps/rawlog-grabber/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ add_executable(${PROJECT_NAME}
2121
# Dependencies on MRPT libraries:
2222
# Just mention the top-level dependency, the rest will be detected automatically,
2323
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
24-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
24+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-cli)
2525

2626
DeclareAppForInstall(${PROJECT_NAME})

apps/rbpf-slam/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ add_executable(${PROJECT_NAME}
1414
# Dependencies on MRPT libraries:
1515
# Just mention the top-level dependency, the rest will be detected automatically,
1616
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
17-
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
17+
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)
1818

1919
DeclareAppForInstall(${PROJECT_NAME})

doc/source/doxygen-docs/dependencies.md

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ If not present, the following classes will raise an exception upon usage:
3131
If this library is not present in the system, the following will raise an exception upon usage:
3232

3333
- All window classes in mrpt::gui except those based on nanogui.
34-
- The function mrpt::hwdrivers::prepareVideoSourceFromUserSelection()
3534

3635
Also, most GUI apps will not be built if wxWidgets is not found.
3736

doc/source/env-vars.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ numerical value (e.g. ``1``) will be interpreted as "true".
5757

5858
- ``MRPT_WXSUBSYS_TIMEOUT_MS``: The timeout in milliseconds to wait
5959
in mrpt::gui windows constructors until the wxWidgets thread processes and
60-
really creates the window, before reporting an error. It's also used in
61-
the function mrpt::hwdrivers::prepareVideoSourceFromUserSelection().
60+
really creates the window, before reporting an error.
6261
Default: ``5000`` in Release builds, ``30000`` in Debug builds.
6362

6463
- ``MRPT_YAML_PARSER_VERBOSE``: Set to ``1`` to show verbose debug information

doc/source/images/graph_mrpt_libs.dot

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ digraph MRPT_LIBS {
22

33
node [shape=box,style=filled, fillcolor="#D0D0D0"];
44

5-
apps [label="mrpt-apps",URL="group_mrpt_bayes_grp.html"];
6-
apps -> gui;
7-
apps -> slam;
8-
apps -> hwdrivers;
5+
apps_gui [label="mrpt-apps-gui",URL="group_mrpt_apps_gui_grp.html"];
6+
apps_gui -> apps_cli;
7+
apps_gui -> gui;
8+
9+
apps_cli [label="mrpt-apps-cli",URL="group_mrpt_apps_cli_grp.html"];
10+
apps_cli -> slam;
11+
apps_cli -> hwdrivers;
912

1013
bayes [label="mrpt-bayes",URL="group_mrpt_bayes_grp.html"];
1114
bayes -> math;
@@ -32,12 +35,10 @@ digraph MRPT_LIBS {
3235
graphs -> viz;
3336

3437
graphslam [label="mrpt-graphslam",URL="group_mrpt_graphslam_grp.html"];
35-
graphslam -> gui;
3638
graphslam -> slam;
3739

3840
gui [label="mrpt-gui",URL="group_mrpt_gui_grp.html"];
3941
gui -> opengl;
40-
gui -> viz;
4142

4243
viz [label="mrpt-viz",URL="group_mrpt_viz_grp.html"];
4344
viz -> poses;

doc/source/images/graph_mrpt_libs.map

+32-31
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
<map id="MRPT_LIBS" name="MRPT_LIBS">
2-
<area shape="rect" id="node1" href="group_mrpt_bayes_grp.html" title="mrpt&#45;apps" alt="" coords="425,5,545,53"/>
3-
<area shape="rect" id="node2" href="group_mrpt_gui_grp.html" title="mrpt&#45;gui" alt="" coords="703,101,808,149"/>
4-
<area shape="rect" id="node3" href="group_mrpt_slam_grp.html" title="mrpt&#45;slam" alt="" coords="425,101,545,149"/>
5-
<area shape="rect" id="node4" href="group_mrpt_hwdrivers_grp.html" title="mrpt&#45;hwdrivers" alt="" coords="230,101,401,149"/>
6-
<area shape="rect" id="node16" href="group_mrpt_viz_grp.html" title="mrpt&#45;viz" alt="" coords="391,389,493,437"/>
7-
<area shape="rect" id="node18" href="group_mrpt_opengl_grp.html" title="mrpt&#45;opengl" alt="" coords="790,293,929,341"/>
8-
<area shape="rect" id="node21" href="group_mrpt_maps_grp.html" title="mrpt&#45;maps" alt="" coords="421,197,548,245"/>
9-
<area shape="rect" id="node29" href="group_mrpt_vision_grp.html" title="mrpt&#45;vision" alt="" coords="266,197,397,245"/>
10-
<area shape="rect" id="node8" href="group_mrpt_comms_grp.html" title="mrpt&#45;comms" alt="" coords="5,485,148,533"/>
11-
<area shape="rect" id="node5" href="group_mrpt_bayes_grp.html" title="mrpt&#45;bayes" alt="" coords="230,581,361,629"/>
12-
<area shape="rect" id="node6" href="group_mrpt_math_grp.html" title="mrpt&#45;math" alt="" coords="373,773,497,821"/>
13-
<area shape="rect" id="node7" href="group_mrpt_config_grp.html" title="mrpt&#45;config" alt="" coords="225,677,357,725"/>
14-
<area shape="rect" id="node14" href="group_mrpt_system_grp.html" title="mrpt&#45;system" alt="" coords="172,869,315,917"/>
15-
<area shape="rect" id="node24" href="group_mrpt_serialization_grp.html" title="mrpt&#45;serialization" alt="" coords="339,869,531,917"/>
16-
<area shape="rect" id="node25" href="group_mrpt_random_grp.html" title="mrpt&#45;random" alt="" coords="505,1061,653,1109"/>
17-
<area shape="rect" id="node10" href="group_mrpt_expr_grp.html" title="mrpt&#45;expr" alt="" coords="221,773,340,821"/>
18-
<area shape="rect" id="node9" href="group_mrpt_io_grp.html" title="mrpt&#45;io" alt="" coords="109,677,201,725"/>
19-
<area shape="rect" id="node11" href="group_mrpt_containers_grp.html" title="mrpt&#45;containers" alt="" coords="177,965,352,1013"/>
20-
<area shape="rect" id="node12" href="group_mrpt_core_grp.html" title="mrpt&#45;core" alt="" coords="365,1061,481,1109"/>
21-
<area shape="rect" id="node13" href="group_mrpt_typemeta_grp.html" title="mrpt&#45;typemeta (.h)" alt="" coords="138,1061,341,1109"/>
22-
<area shape="rect" id="node15" href="group_mrpt_graphs_grp.html" title="mrpt&#45;graphs" alt="" coords="371,293,513,341"/>
23-
<area shape="rect" id="node19" href="group_mrpt_poses_grp.html" title="mrpt&#45;poses" alt="" coords="231,485,360,533"/>
24-
<area shape="rect" id="node20" href="group_mrpt_img_grp.html" title="mrpt&#45;img" alt="" coords="385,581,496,629"/>
25-
<area shape="rect" id="node17" href="group_mrpt_graphslam_grp.html" title="mrpt&#45;graphslam" alt="" coords="618,5,794,53"/>
26-
<area shape="rect" id="node23" href="group_mrpt_obs_grp.html" title="mrpt&#45;obs" alt="" coords="239,293,347,341"/>
27-
<area shape="rect" id="node22" href="group_mrpt_kinematics_grp.html" title="mrpt&#45;kinematics" alt="" coords="537,293,715,341"/>
28-
<area shape="rect" id="node27" href="group_mrpt_tfest_grp.html" title="mrpt&#45;tfest" alt="" coords="235,389,353,437"/>
29-
<area shape="rect" id="node28" href="group_mrpt_rtti_grp.html" title="mrpt&#45;rtti" alt="" coords="377,965,483,1013"/>
30-
<area shape="rect" id="node26" href="group_mrpt_nav_grp.html" title="mrpt&#45;nav" alt="" coords="569,101,678,149"/>
31-
<area shape="rect" id="node30" href="group_mrpt_topography_grp.html" title="mrpt&#45;topography" alt="" coords="58,197,242,245"/>
32-
<area shape="rect" id="node31" href="group_mrpt_vision_lgpl_grp.html" title="mrpt&#45;vision&#45;lgpl" alt="" coords="33,101,206,149"/>
2+
<area shape="rect" id="node1" href="group_mrpt_apps_gui_grp.html" title="mrpt&#45;apps&#45;gui" alt="" coords="617,5,773,53"/>
3+
<area shape="rect" id="node2" href="group_mrpt_apps_cli_grp.html" title="mrpt&#45;apps&#45;cli" alt="" coords="546,101,694,149"/>
4+
<area shape="rect" id="node3" href="group_mrpt_gui_grp.html" title="mrpt&#45;gui" alt="" coords="718,101,823,149"/>
5+
<area shape="rect" id="node4" href="group_mrpt_slam_grp.html" title="mrpt&#45;slam" alt="" coords="272,197,392,245"/>
6+
<area shape="rect" id="node5" href="group_mrpt_hwdrivers_grp.html" title="mrpt&#45;hwdrivers" alt="" coords="549,197,720,245"/>
7+
<area shape="rect" id="node19" href="group_mrpt_opengl_grp.html" title="mrpt&#45;opengl" alt="" coords="701,389,840,437"/>
8+
<area shape="rect" id="node22" href="group_mrpt_maps_grp.html" title="mrpt&#45;maps" alt="" coords="390,293,517,341"/>
9+
<area shape="rect" id="node30" href="group_mrpt_vision_grp.html" title="mrpt&#45;vision" alt="" coords="27,293,157,341"/>
10+
<area shape="rect" id="node9" href="group_mrpt_comms_grp.html" title="mrpt&#45;comms" alt="" coords="723,581,866,629"/>
11+
<area shape="rect" id="node6" href="group_mrpt_bayes_grp.html" title="mrpt&#45;bayes" alt="" coords="371,677,501,725"/>
12+
<area shape="rect" id="node7" href="group_mrpt_math_grp.html" title="mrpt&#45;math" alt="" coords="371,869,495,917"/>
13+
<area shape="rect" id="node8" href="group_mrpt_config_grp.html" title="mrpt&#45;config" alt="" coords="447,773,579,821"/>
14+
<area shape="rect" id="node15" href="group_mrpt_system_grp.html" title="mrpt&#45;system" alt="" coords="554,965,697,1013"/>
15+
<area shape="rect" id="node25" href="group_mrpt_serialization_grp.html" title="mrpt&#45;serialization" alt="" coords="337,965,529,1013"/>
16+
<area shape="rect" id="node26" href="group_mrpt_random_grp.html" title="mrpt&#45;random" alt="" coords="215,1157,363,1205"/>
17+
<area shape="rect" id="node11" href="group_mrpt_expr_grp.html" title="mrpt&#45;expr" alt="" coords="531,869,650,917"/>
18+
<area shape="rect" id="node10" href="group_mrpt_io_grp.html" title="mrpt&#45;io" alt="" coords="655,773,747,821"/>
19+
<area shape="rect" id="node12" href="group_mrpt_containers_grp.html" title="mrpt&#45;containers" alt="" coords="517,1061,691,1109"/>
20+
<area shape="rect" id="node13" href="group_mrpt_core_grp.html" title="mrpt&#45;core" alt="" coords="387,1157,503,1205"/>
21+
<area shape="rect" id="node14" href="group_mrpt_typemeta_grp.html" title="mrpt&#45;typemeta (.h)" alt="" coords="528,1157,731,1205"/>
22+
<area shape="rect" id="node16" href="group_mrpt_graphs_grp.html" title="mrpt&#45;graphs" alt="" coords="333,389,475,437"/>
23+
<area shape="rect" id="node17" href="group_mrpt_viz_grp.html" title="mrpt&#45;viz" alt="" coords="445,485,547,533"/>
24+
<area shape="rect" id="node20" href="group_mrpt_poses_grp.html" title="mrpt&#45;poses" alt="" coords="371,581,501,629"/>
25+
<area shape="rect" id="node21" href="group_mrpt_img_grp.html" title="mrpt&#45;img" alt="" coords="550,677,661,725"/>
26+
<area shape="rect" id="node18" href="group_mrpt_graphslam_grp.html" title="mrpt&#45;graphslam" alt="" coords="244,101,420,149"/>
27+
<area shape="rect" id="node24" href="group_mrpt_obs_grp.html" title="mrpt&#45;obs" alt="" coords="201,389,309,437"/>
28+
<area shape="rect" id="node23" href="group_mrpt_kinematics_grp.html" title="mrpt&#45;kinematics" alt="" coords="499,389,677,437"/>
29+
<area shape="rect" id="node28" href="group_mrpt_tfest_grp.html" title="mrpt&#45;tfest" alt="" coords="295,485,414,533"/>
30+
<area shape="rect" id="node29" href="group_mrpt_rtti_grp.html" title="mrpt&#45;rtti" alt="" coords="385,1061,492,1109"/>
31+
<area shape="rect" id="node27" href="group_mrpt_nav_grp.html" title="mrpt&#45;nav" alt="" coords="416,197,525,245"/>
32+
<area shape="rect" id="node31" href="group_mrpt_topography_grp.html" title="mrpt&#45;topography" alt="" coords="181,293,365,341"/>
33+
<area shape="rect" id="node32" href="group_mrpt_vision_lgpl_grp.html" title="mrpt&#45;vision&#45;lgpl" alt="" coords="5,197,179,245"/>
3334
</map>

doc/source/images/graph_mrpt_libs.png

-1.41 KB
Loading

0 commit comments

Comments
 (0)