[Personalrobots-commit] SF.net SVN: personalrobots: [1483] pkg/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1483
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=1483&view=rev
Author:   jleibs
Date:     2008-07-11 02:19:53 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
Splitting gui from the lower level logging headers so that megamaid doesn't depend on wx.

Modified Paths:
--------------
    pkg/trunk/util/logging/manifest.xml
    pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.cpp
    pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.h
    pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/test_topic_display.fbp
    pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.cpp
    pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.h

Added Paths:
-----------
    pkg/trunk/visualization/log_gui/
    pkg/trunk/visualization/log_gui/CMakeLists.txt
    pkg/trunk/visualization/log_gui/Makefile
    pkg/trunk/visualization/log_gui/README
    pkg/trunk/visualization/log_gui/bin/
    pkg/trunk/visualization/log_gui/manifest.xml
    pkg/trunk/visualization/log_gui/src/

Removed Paths:
-------------
    pkg/trunk/util/logging/CMakeLists.txt
    pkg/trunk/util/logging/Makefile
    pkg/trunk/util/logging/README
    pkg/trunk/util/logging/bin/
    pkg/trunk/util/logging/src/
    pkg/trunk/visualization/log_gui/Makefile
    pkg/trunk/visualization/log_gui/README
    pkg/trunk/visualization/log_gui/bin/
    pkg/trunk/visualization/log_gui/include/
    pkg/trunk/visualization/log_gui/manifest.xml
    pkg/trunk/visualization/log_gui/src/

Deleted: pkg/trunk/util/logging/CMakeLists.txt
===================================================================

--- pkg/trunk/util/logging/CMakeLists.txt	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/util/logging/CMakeLists.txt	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,27 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-include(rosbuild)
-rospack(logging)
-
-set(wxWidgets_USE_LIBS base core)
-
-find_package(wxWidgets REQUIRED)
-
-include(${wxWidgets_USE_FILE})
-include_directories(${wxWidgets_INCLUDE_DIRS})
-
-find_program(WXFORMBUILDER NAMES wxformbuilder)
-
-if(WXFORMBUILDER)
-  add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/src/log_gui/GenLogGui.cpp
-                            ${PROJECT_SOURCE_DIR}/src/log_gui/GenLogGui.h
-                     COMMAND ${WXFORMBUILDER} -g ${PROJECT_SOURCE_DIR}/src/log_gui/log_gui.fbp
-                     DEPENDS src/log_gui/log_gui.fbp)
-endif(WXFORMBUILDER)
-
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-
-rospack_add_executable(log_gui src/log_gui/LogGui.cpp
-                               src/log_gui/GenLogGui.cpp)
-
-target_link_libraries(log_gui wxtopicdisplay ${wxWidgets_LIBRARIES})
-

Deleted: pkg/trunk/util/logging/Makefile
===================================================================
--- pkg/trunk/util/logging/Makefile	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/util/logging/Makefile	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1 +0,0 @@
-include $(shell rospack find mk)/cmake.mk

Deleted: pkg/trunk/util/logging/README
===================================================================
--- pkg/trunk/util/logging/README	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/util/logging/README	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,6 +0,0 @@
-You need to have wxWidgets installed on your box for this to compile.
-
-To do this on Ubuntu 08.04, type this:
-
-sudo apt-get install wxgtk2.8-dev
-

Modified: pkg/trunk/util/logging/manifest.xml
===================================================================
--- pkg/trunk/util/logging/manifest.xml	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/util/logging/manifest.xml	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,15 +1,11 @@
 <package>
-<description brief="System logger">
-Gui for selecting and logging topics from a running system.  
-Currently does all logging in a single centralized filesystem, so don't 
-expect to use it to log video over a wireless link.
+<description brief="Logging headers">
 </description>
-<author>Eric Berger be...@wi..., Morgan Quigley mqu...@wi...</author>
+<author>Jeremy Leibs be...@wi..., Morgan Quigley mqu...@wi...</author>
 <license>BSD</license>
 <url>http://pr.willowgarage.com</url>
 <depend package="roscpp"/>
 <depend package="std_msgs"/>
-<depend package="wx_topic_display"/>
 <export>
   <cpp cflags="-I${prefix}/include"/>
 </export>

Copied: pkg/trunk/visualization/log_gui (from rev 1467, pkg/trunk/util/logging)

Copied: pkg/trunk/visualization/log_gui/CMakeLists.txt (from rev 1482, pkg/trunk/util/logging/CMakeLists.txt)
===================================================================
--- pkg/trunk/visualization/log_gui/CMakeLists.txt	                        (rev 0)
+++ pkg/trunk/visualization/log_gui/CMakeLists.txt	2008-07-11 09:19:53 UTC (rev 1483)
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 2.6)
+include(rosbuild)
+rospack(logging)
+
+set(wxWidgets_USE_LIBS base core)
+
+find_package(wxWidgets REQUIRED)
+
+include(${wxWidgets_USE_FILE})
+include_directories(${wxWidgets_INCLUDE_DIRS})
+
+find_program(WXFORMBUILDER NAMES wxformbuilder)
+
+if(WXFORMBUILDER)
+  add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/src/log_gui/GenLogGui.cpp
+                            ${PROJECT_SOURCE_DIR}/src/log_gui/GenLogGui.h
+                     COMMAND ${WXFORMBUILDER} -g ${PROJECT_SOURCE_DIR}/src/log_gui/log_gui.fbp
+                     DEPENDS src/log_gui/log_gui.fbp)
+endif(WXFORMBUILDER)
+
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+
+rospack_add_executable(log_gui src/log_gui/LogGui.cpp
+                               src/log_gui/GenLogGui.cpp)
+
+target_link_libraries(log_gui wxtopicdisplay ${wxWidgets_LIBRARIES})
+

Deleted: pkg/trunk/visualization/log_gui/Makefile
===================================================================
--- pkg/trunk/util/logging/Makefile	2008-07-11 03:07:02 UTC (rev 1467)
+++ pkg/trunk/visualization/log_gui/Makefile	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,3 +0,0 @@
-SUBDIRS = src
-include $(shell rospack find mk)/recurse_subdirs.mk
-

Copied: pkg/trunk/visualization/log_gui/Makefile (from rev 1482, pkg/trunk/util/logging/Makefile)
===================================================================
--- pkg/trunk/visualization/log_gui/Makefile	                        (rev 0)
+++ pkg/trunk/visualization/log_gui/Makefile	2008-07-11 09:19:53 UTC (rev 1483)
@@ -0,0 +1 @@
+include $(shell rospack find mk)/cmake.mk

Deleted: pkg/trunk/visualization/log_gui/README
===================================================================
--- pkg/trunk/util/logging/README	2008-07-11 03:07:02 UTC (rev 1467)
+++ pkg/trunk/visualization/log_gui/README	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,6 +0,0 @@
-You need to have wxWidgets installed on your box for this to compile.
-
-To do this on Ubuntu 08.04, type this:
-
-sudo apt-get install wxgtk2.8-dev
-

Copied: pkg/trunk/visualization/log_gui/README (from rev 1482, pkg/trunk/util/logging/README)
===================================================================
--- pkg/trunk/visualization/log_gui/README	                        (rev 0)
+++ pkg/trunk/visualization/log_gui/README	2008-07-11 09:19:53 UTC (rev 1483)
@@ -0,0 +1,6 @@
+You need to have wxWidgets installed on your box for this to compile.
+
+To do this on Ubuntu 08.04, type this:
+
+sudo apt-get install wxgtk2.8-dev
+

Copied: pkg/trunk/visualization/log_gui/bin (from rev 1482, pkg/trunk/util/logging/bin)

Deleted: pkg/trunk/visualization/log_gui/manifest.xml
===================================================================
--- pkg/trunk/util/logging/manifest.xml	2008-07-11 03:07:02 UTC (rev 1467)
+++ pkg/trunk/visualization/log_gui/manifest.xml	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,16 +0,0 @@
-<package>
-<description brief="System logger">
-Gui for selecting and logging topics from a running system.  
-Currently does all logging in a single centralized filesystem, so don't 
-expect to use it to log video over a wireless link.
-</description>
-<author>Eric Berger be...@wi..., Morgan Quigley mqu...@wi...</author>
-<license>BSD</license>
-<url>http://pr.willowgarage.com</url>
-<depend package="roscpp"/>
-<depend package="std_msgs"/>
-<export>
-  <cpp cflags="-I${prefix}/include"/>
-</export>
-</package>
-

Copied: pkg/trunk/visualization/log_gui/manifest.xml (from rev 1482, pkg/trunk/util/logging/manifest.xml)
===================================================================
--- pkg/trunk/visualization/log_gui/manifest.xml	                        (rev 0)
+++ pkg/trunk/visualization/log_gui/manifest.xml	2008-07-11 09:19:53 UTC (rev 1483)
@@ -0,0 +1,15 @@
+<package>
+<description brief="System logger">
+Gui for selecting and logging topics from a running system.  
+Currently does all logging in a single centralized filesystem, so don't 
+expect to use it to log video over a wireless link.
+</description>
+<author>Eric Berger be...@wi..., Morgan Quigley mqu...@wi...</author>
+<license>BSD</license>
+<url>http://pr.willowgarage.com</url>
+<depend package="roscpp"/>
+<depend package="std_msgs"/>
+<depend package="logging"/>
+<depend package="wx_topic_display"/>
+</package>
+

Copied: pkg/trunk/visualization/log_gui/src (from rev 1482, pkg/trunk/util/logging/src)

Modified: pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.cpp
===================================================================
--- pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.cpp	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.cpp	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Apr 21 2008)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -14,7 +14,7 @@
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
 	wxStaticBoxSizer* sbSizer1;
-	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("label") ), wxHORIZONTAL );
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxHORIZONTAL );
 	
 	topicPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	sbSizer1->Add( topicPanel, 1, wxALL|wxEXPAND, 5 );

Modified: pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.h
===================================================================
--- pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.h	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/GenTestTopicDisplay.h	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Apr 21 2008)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!

Modified: pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/test_topic_display.fbp
===================================================================
--- pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/test_topic_display.fbp	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/visualization/wx_ros/wx_topic_display/src/test/test_topic_display.fbp	2008-07-11 09:19:53 UTC (rev 1483)
@@ -72,7 +72,7 @@
             <event name="OnUpdateUI"></event>
             <object class="wxStaticBoxSizer" expanded="1">
                 <property name="id">wxID_ANY</property>
-                <property name="label">label</property>
+                <property name="label"></property>
                 <property name="minimum_size"></property>
                 <property name="name">sbSizer1</property>
                 <property name="orient">wxHORIZONTAL</property>

Modified: pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.cpp
===================================================================
--- pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.cpp	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.cpp	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Apr 21 2008)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!

Modified: pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.h
===================================================================
--- pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.h	2008-07-11 09:13:21 UTC (rev 1482)
+++ pkg/trunk/visualization/wx_ros/wx_topic_display/src/wx_topic_display/GenTopicDisplay.h	2008-07-11 09:19:53 UTC (rev 1483)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Apr 21 2008)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


