Build in Ubuntu 22.04/24.04

rosmon_core/CMakeLists.txt

@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
 catkin_package()
 include_directories(${catkin_INCLUDE_DIRS})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 
 find_package(TinyXML REQUIRED)
 
@@ -177,10 +177,11 @@ if(CATKIN_ENABLE_TESTING)
 endif()
 
 # Version 1.6 (increment this comment to trigger a CMake update)
-catkin_add_env_hooks(50-rosmon
-	SHELLS bash zsh
-	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks
-)
+# disabling for Ubuntu 22.04 and greater
+# catkin_add_env_hooks(50-rosmon
+# 	SHELLS bash zsh
+# 	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks
+# )
 
 install(TARGETS rosmon rosmon_launch_config _shim
 	LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}

rosmon_core/src/launch/substitution_python.cpp

@@ -13,7 +13,6 @@
 #include <boost/python/import.hpp>
 
 #include <boost/lexical_cast.hpp>
-
 #include <boost/mpl/vector.hpp>
 
 namespace py = boost::python;

rosmon_core/src/main.cpp

@@ -45,7 +45,7 @@ static fs::path findFile(const fs::path& base, const std::string& name)
 			if(!p.empty())
 				return p;
 		}
-		else if(it->path().leaf() == name)
+		else if(it->path().filename() == name)
 			return *it;
 	}
 
@@ -370,15 +370,16 @@ int main(int argc, char** argv)
 
 		if(envSyslog || logFile == "syslog")
 		{
+			const auto log_path = fs::path(launchFilePath).stem().string();
 			// Try systemd journal first
 			try
 			{
-				logger.reset(new rosmon::SystemdLogger(fs::basename(launchFilePath)));
+				logger.reset(new rosmon::SystemdLogger(log_path));
 			}
 			catch(rosmon::SystemdLogger::NotAvailable& e)
 			{
 				fmt::print(stderr, "Systemd Journal not available: {}\n", e.what());
-				logger.reset(new rosmon::SyslogLogger(fs::basename(launchFilePath)));
+				logger.reset(new rosmon::SyslogLogger(log_path));
 			}
 		}
 		else
@@ -523,7 +524,7 @@ int main(int argc, char** argv)
 	config->setNodeLogDir(nodeLogPath);
 
     rosmon::monitor::Monitor monitor(config, watcher);
-	monitor.logMessageSignal.connect(boost::bind(&rosmon::Logger::log, logger.get(), _1));
+	monitor.logMessageSignal.connect(boost::bind(&rosmon::Logger::log, logger.get(), boost::placeholders::_1));
 
 	fmt::print("\n\n");
 	monitor.setParameters();
@@ -549,7 +550,7 @@ int main(int argc, char** argv)
 		monitor.logMessageSignal.connect(
 			boost::bind(
 				logToStdout,
-				_1,
+				boost::placeholders::_1,
 				get_max_node_name(monitor)));
 	}
 

rosmon_core/src/monitor/monitor.cpp

@@ -46,7 +46,7 @@ Monitor::Monitor(launch::LaunchConfig::ConstPtr config, FDWatcher::Ptr watcher)
 		if(launchNode->required())
 		{
 			node->exitedSignal.connect(
-				boost::bind(&Monitor::handleRequiredNodeExit, this, _1)
+				boost::bind(&Monitor::handleRequiredNodeExit, this, boost::placeholders::_1)
 			);
 		}
 
@@ -59,7 +59,7 @@ Monitor::Monitor(launch::LaunchConfig::ConstPtr config, FDWatcher::Ptr watcher)
 	m_statTimer = m_nh.createWallTimer(
 #endif
 		ros::WallDuration(1.0),
-		boost::bind(&Monitor::updateStats, this, _1)
+		boost::bind(&Monitor::updateStats, this, boost::placeholders::_1)
 	);
 }
 

rosmon_core/src/ui.cpp

@@ -40,7 +40,7 @@ UI::UI(monitor::Monitor* monitor, const FDWatcher::Ptr& fdWatcher)
  , m_selectedNode(-1)
 {
 	std::atexit(cleanup);
-	m_monitor->logMessageSignal.connect(boost::bind(&UI::log, this, _1));
+	m_monitor->logMessageSignal.connect(boost::bind(&UI::log, this, boost::placeholders::_1));
 
 	m_sizeTimer = ros::NodeHandle().createWallTimer(ros::WallDuration(2.0), boost::bind(&UI::checkWindowSize, this));
 	m_sizeTimer.start();

rqt_rosmon/CMakeLists.txt

@@ -13,7 +13,7 @@ find_package(catkin REQUIRED COMPONENTS
 catkin_package()
 include_directories(${catkin_INCLUDE_DIRS})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 
 if(${pluginlib_VERSION} VERSION_GREATER 1.11.1)
 	message(STATUS "using new pluginlib headers with .hpp extensions")

rqt_rosmon/src/node_model.cpp

@@ -4,6 +4,7 @@
 #include "node_model.h"
 
 #include <QColor>
+#include <QBrush>
 
 #include <ros/node_handle.h>
 
@@ -173,17 +174,17 @@ QVariant NodeModel::data(const QModelIndex& index, int role) const
 					return int(Qt::AlignRight | Qt::AlignVCenter);
 			}
 			break;
-		case Qt::BackgroundColorRole:
+		case Qt::BackgroundRole:
 			switch(entry.state)
 			{
 				case rosmon_msgs::NodeState::RUNNING:
 					return QVariant();
 				case rosmon_msgs::NodeState::IDLE:
-					return QColor(200, 200, 200);
+					return QBrush(QColor(200, 200, 200));
 				case rosmon_msgs::NodeState::CRASHED:
-					return QColor(255, 100, 100);
+					return QBrush(QColor(255, 100, 100));
 				case rosmon_msgs::NodeState::WAITING:
-					return QColor(255, 255, 128);
+					return QBrush(QColor(255, 255, 128));
 			}
 			break;
 		case SortRole: