New splash screen, added ROS_DISTRO to version.cpp.in, image sources …

…moved to image_src

git-svn-id: https://code.ros.org/svn/ros-pkg/stacks/visualization/trunk@39799 eb33c2ac-9c88-4c90-87e0-44a10359b0c3

default.rviz

@@ -4,7 +4,7 @@ Visualization Manager:
   Enabled: true
   Global Options:
     Fixed Frame: /map
-    Background Color: 0; 0; 0
+    Background Color: 48; 48; 48
   Displays:
     - Class: rviz/Grid
       Name: Grid

src/rviz/CMakeLists.txt

@@ -13,6 +13,9 @@ if(${SVN_VERSION} MATCHES "^exported$")
                   OUTPUT_VARIABLE  SVN_VERSION
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
+
+set(ROS_DISTRO $ENV{ROS_DISTRO})
+
 configure_file(version.cpp.in ${VERSION_FILE} @ONLY)
 
 # We create one lib with the C++...

src/rviz/load_resource.cpp

@@ -79,6 +79,7 @@ QPixmap loadPixmap( QString url, bool fill_cache )
   // so the error won't appear again anytime soon.
   if ( boost::filesystem::exists( path ) )
   {
+    ROS_DEBUG_NAMED( "load_resource", "Loading '%s'", path.string().c_str() );
     if ( !pixmap.load( QString::fromStdString( path.string() ) ) )
     {
       ROS_ERROR( "Could not load pixmap '%s'", path.string().c_str() );

src/rviz/splash_screen.cpp

@@ -28,17 +28,37 @@
  */
 
 #include "rviz/splash_screen.h"
+#include "version.h"
+
+#include <QPainter>
+
+#include <iostream>
+#include <QCoreApplication>
 
 namespace rviz
 {
 
 SplashScreen::SplashScreen( const QPixmap& pixmap )
   : QSplashScreen( pixmap )
-{}
+{
+}
 
 void SplashScreen::showMessage( const QString& message )
 {
-  QSplashScreen::showMessage( message, Qt::AlignLeft | Qt::AlignBottom );
+  QSplashScreen::showMessage( message, Qt::AlignLeft | Qt::AlignBottom, Qt::white );
+}
+
+void SplashScreen::drawContents ( QPainter * painter )
+{
+  QSplashScreen::drawContents( painter );
+
+  QString version_info = "r"+QString(get_version().c_str());
+  version_info += " (" + QString(get_distro().c_str()) + ")";
+
+  painter->setPen( QColor(192,192,192) );
+  QRect r = rect();
+  r .setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10);
+  painter->drawText( r, Qt::AlignRight | Qt::AlignBottom, version_info );
 }
 
 } // end namespace rviz

src/rviz/splash_screen.h

@@ -32,6 +32,9 @@
 
 #include <QSplashScreen>
 
+
+class QPainter;
+
 namespace rviz
 {
 
@@ -41,6 +44,8 @@ Q_OBJECT
 public:
   SplashScreen( const QPixmap& pixmap );
 
+  void drawContents ( QPainter * painter );
+
 public Q_SLOTS:
   void showMessage( const QString& message );
 };

src/rviz/version.cpp.in

@@ -38,4 +38,11 @@ std::string get_version()
   return "@SVN_VERSION@";
 }
 
+std::string get_distro()
+{
+  // The return string here is replaced at compile time by
+  // CMakeLists.txt in this directory.
+  return "@ROS_DISTRO@";
+}
+
 }

src/rviz/version.h

@@ -34,6 +34,7 @@
 namespace rviz
 {
 std::string get_version();
+std::string get_distro();
 }
 
 #endif // RVIZ_VERSION_H

src/rviz/visualization_manager.cpp

@@ -146,7 +146,7 @@ VisualizationManager::VisualizationManager( RenderPanel* render_panel, WindowMan
                                                global_options_, frame_manager_, false,
                                                SLOT( updateFixedFrame() ), this );
 
-  background_color_property_ = new ColorProperty( "Background Color", Qt::black,
+  background_color_property_ = new ColorProperty( "Background Color", QColor(48,48,48),
                                                   "Background color for the 3D view.",
                                                   global_options_, SLOT( updateBackgroundColor() ), this );