Fixed isnan for windows and added DDS_ALIVE as an attribute

Author: angelrti

CMakeLists.txt

@@ -259,7 +259,7 @@ endif()
 
 add_subdirectory( plotjuggler_app )
 
-if(PJ_ENABLE_MAC_APP)
+if(APPLE AND PJ_ENABLE_MAC_APP)
     # Copy plugins inside the .app folder.
     # Plugins have to be installed after the plotjuggler_app
     set(PJ_PLUGIN_INSTALL_DIRECTORY "${PJ_PLUGIN_INSTALL_DIRECTORY}/plotjuggler.app/Contents/MacOS")

plotjuggler_base/include/PlotJuggler/plotdatabase.h

@@ -51,7 +51,11 @@ enum PlotAttribute
 
   // Color of the curve in the plot.
   // Type: QColor
-  COLOR_HINT
+  COLOR_HINT,
+
+  // DDS entity alive view
+  // Type: boolean. Default: false
+  DDS_ALIVE
 };
 
 using Attributes = std::unordered_map<PlotAttribute, QVariant>;
@@ -64,6 +68,7 @@ inline bool CheckType(PlotAttribute attr, const QVariant& value)
     case COLOR_HINT:
       return value.type() == QVariant::Color;
     case ITALIC_FONTS:
+    case DDS_ALIVE:
       return value.type() == QVariant::Bool;
     case TOOL_TIP:
       return value.type() == QVariant::String;

plotjuggler_plugins/ParserROS/rosx_introspection/include/rosx_introspection/details/conversion_impl.hpp

@@ -235,7 +235,7 @@ template<typename SRC,typename DST,
           typename details::EnableIf< details::unsigned_to_smaller_conversion<SRC, DST>>* = nullptr  >
 inline void convert_impl( const SRC& from, DST& target )
 {
-  if(!std::isnan(from)) {
+  if(!std::isnan(static_cast<double>(from))) {
     checkUpperLimit<SRC,DST>(from);
   }
   target = static_cast<DST>(from);
@@ -245,7 +245,7 @@ template<typename SRC,typename DST,
           typename details::EnableIf< details::signed_to_smaller_conversion<SRC, DST>>* = nullptr  >
 inline void convert_impl( const SRC& from, DST& target )
 {
-  if(!std::isnan(from)) {
+  if(!std::isnan(static_cast<double>(from))) {
     checkLowerLimit<SRC,DST>(from);
     checkUpperLimit<SRC,DST>(from);
   }
@@ -257,7 +257,7 @@ template<typename SRC,typename DST,
           typename details::EnableIf< details::signed_to_smaller_unsigned_conversion<SRC, DST>>* = nullptr  >
 inline void convert_impl( const SRC& from, DST& target )
 {
-  if (!std::isnan(from) && from < 0 ){
+  if (!std::isnan(static_cast<double>(from)) && from < 0 ){
     throw RangeException("Value is negative and can't be converted to signed");
   }
 
@@ -332,7 +332,7 @@ template<typename SRC,typename DST,
           typename details::EnableIf< details::integer_to_floating_conversion<SRC, DST>>* = nullptr >
 inline void convert_impl( const SRC& from, DST& target )
 {
-  if(!std::isnan(from)) {
+  if(!std::isnan(static_cast<double>(from))) {
     checkTruncation<SRC,DST>(from);
   }
   target = static_cast<DST>( from);