Skip to content

Commit

Permalink
Split libmrpt-apps into cli and gui parts
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Feb 5, 2025
1 parent b4ae01f commit 059843b
Show file tree
Hide file tree
Showing 113 changed files with 1,302 additions and 1,024 deletions.
2 changes: 1 addition & 1 deletion apps/grid-matching/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ add_executable(${PROJECT_NAME}
# Dependencies on MRPT libraries:
# Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)
DeclareAppForInstall(${PROJECT_NAME})
2 changes: 1 addition & 1 deletion apps/icp-slam-live/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable(${PROJECT_NAME}
# Dependencies on MRPT libraries:
# Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)

DeclareAppForInstall(${PROJECT_NAME})
2 changes: 1 addition & 1 deletion apps/icp-slam/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ add_executable(${PROJECT_NAME}
# Dependencies on MRPT libraries:
# Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)

DeclareAppForInstall(${PROJECT_NAME})
2 changes: 1 addition & 1 deletion apps/kf-slam/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ add_executable(${PROJECT_NAME}
# Dependencies on MRPT libraries:
# Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)

DeclareAppForInstall(${PROJECT_NAME})
2 changes: 1 addition & 1 deletion apps/pf-localization/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ add_executable(${PROJECT_NAME} pf_localization_main.cpp ${MRPT_VERSION_RC_FILE})
# Dependencies on MRPT libraries:
# Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)

DeclareAppForInstall(${PROJECT_NAME})
2 changes: 1 addition & 1 deletion apps/rawlog-edit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ add_executable(${PROJECT_NAME}
DeclareAppForInstall(${PROJECT_NAME})
# Dependencies on MRPT libraries: Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-cli)
2 changes: 1 addition & 1 deletion apps/rawlog-edit/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
For instructions and more: see manpage of rawlog-edit
---------------------------------------------------------------*/

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

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion apps/rawlog-grabber/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ add_executable(${PROJECT_NAME}
# Dependencies on MRPT libraries:
# Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-cli)

DeclareAppForInstall(${PROJECT_NAME})
2 changes: 1 addition & 1 deletion apps/rbpf-slam/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ add_executable(${PROJECT_NAME}
# Dependencies on MRPT libraries:
# Just mention the top-level dependency, the rest will be detected automatically,
# and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps)
DeclareAppDependencies(${PROJECT_NAME} mrpt::apps-gui)

DeclareAppForInstall(${PROJECT_NAME})
1 change: 0 additions & 1 deletion doc/source/doxygen-docs/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ If not present, the following classes will raise an exception upon usage:
If this library is not present in the system, the following will raise an exception upon usage:

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

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

Expand Down
3 changes: 1 addition & 2 deletions doc/source/env-vars.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ numerical value (e.g. ``1``) will be interpreted as "true".

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

- ``MRPT_YAML_PARSER_VERBOSE``: Set to ``1`` to show verbose debug information
Expand Down
13 changes: 7 additions & 6 deletions doc/source/images/graph_mrpt_libs.dot
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ digraph MRPT_LIBS {

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

apps [label="mrpt-apps",URL="group_mrpt_bayes_grp.html"];
apps -> gui;
apps -> slam;
apps -> hwdrivers;
apps_gui [label="mrpt-apps-gui",URL="group_mrpt_apps_gui_grp.html"];
apps_gui -> apps_cli;
apps_gui -> gui;

apps_cli [label="mrpt-apps-cli",URL="group_mrpt_apps_cli_grp.html"];
apps_cli -> slam;
apps_cli -> hwdrivers;

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

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

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

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

0 comments on commit 059843b

Please sign in to comment.