Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[23088] pkg/trunk
|
From: <wa...@us...> - 2009-08-27 01:34:42
|
Revision: 23088
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23088&view=rev
Author: wattsk
Date: 2009-08-27 01:34:33 +0000 (Thu, 27 Aug 2009)
Log Message:
-----------
Renamed wg_hardware_roslaunch to roslaunch_caller
Modified Paths:
--------------
pkg/trunk/pr2/life_test/bin/gui
pkg/trunk/pr2/life_test/manifest.xml
pkg/trunk/pr2/life_test/src/life_test/life_test.py
pkg/trunk/pr2/life_test/src/life_test/ui.py
pkg/trunk/pr2/qualification/manifest.xml
pkg/trunk/pr2/qualification/src/qualification/component_qual.py
pkg/trunk/pr2/qualification/src/qualification/pr2_qual_panel.py
pkg/trunk/pr2/qualification/src/qualification/qual_frame.py
pkg/trunk/pr2/qualification/tests/simple_example/test_node.py
pkg/trunk/pr2/roslaunch_caller/manifest.xml
pkg/trunk/sandbox/pr2_startup/manifest.xml
pkg/trunk/sandbox/pr2_startup/src/pr2_startup/ui.py
pkg/trunk/sandbox/webteleop/manifest.xml
pkg/trunk/sandbox/webteleop/src/server.py
Added Paths:
-----------
pkg/trunk/pr2/roslaunch_caller/
Removed Paths:
-------------
pkg/trunk/pr2/roslaunch_caller/src/wg_hardware_roslaunch/
pkg/trunk/pr2/wg_hardware_roslaunch/
Modified: pkg/trunk/pr2/life_test/bin/gui
===================================================================
--- pkg/trunk/pr2/life_test/bin/gui 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/life_test/bin/gui 2009-08-27 01:34:33 UTC (rev 23088)
@@ -45,5 +45,5 @@
app.MainLoop()
except Exception, e:
print "Caught exception in TestManagerApp Main Loop"
- print e
- e
+ import traceback
+ trackback.print_exc()
Modified: pkg/trunk/pr2/life_test/manifest.xml
===================================================================
--- pkg/trunk/pr2/life_test/manifest.xml 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/life_test/manifest.xml 2009-08-27 01:34:33 UTC (rev 23088)
@@ -31,7 +31,7 @@
<depend package="runtime_monitor" />
<depend package="invent_client" />
<depend package="diagnostic_msgs" />
- <depend package="wg_hardware_roslaunch" />
+ <depend package="roslaunch_caller" />
<depend package="mechanism_msgs" />
<depend package="geometry_msgs" />
</package>
Modified: pkg/trunk/pr2/life_test/src/life_test/life_test.py
===================================================================
--- pkg/trunk/pr2/life_test/src/life_test/life_test.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/life_test/src/life_test/life_test.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -50,7 +50,6 @@
import rospy
from std_srvs.srv import *
-#from diagnostic_msgs.msg import DiagnosticArray, DiagnosticStatus, KeyValue, DiagnosticString
# Stuff from life_test package
@@ -67,7 +66,8 @@
from email.mime.base import MIMEBase
from email import Encoders
-import wg_hardware_roslaunch.roslaunch_caller as roslaunch_caller
+
+from roslaunch_caller import roslaunch_caller
class TestMonitorPanel(wx.Panel):
Modified: pkg/trunk/pr2/life_test/src/life_test/ui.py
===================================================================
--- pkg/trunk/pr2/life_test/src/life_test/ui.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/life_test/src/life_test/ui.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -65,7 +65,7 @@
from life_test import *
from test_param import *
-import wg_hardware_roslaunch.roslaunch_caller as roslaunch_caller
+from roslaunch_caller import roslaunch_caller
class TestManagerFrame(wx.Frame):
def __init__(self, parent):
Modified: pkg/trunk/pr2/qualification/manifest.xml
===================================================================
--- pkg/trunk/pr2/qualification/manifest.xml 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/qualification/manifest.xml 2009-08-27 01:34:33 UTC (rev 23088)
@@ -19,7 +19,7 @@
<depend package="pr2_alpha" />
<depend package="pr2_head_cart" />
<depend package="invent_client" />
- <depend package="wg_hardware_roslaunch" />
+ <depend package="roslaunch_caller" />
<depend package="forearm_cam" />
<depend package="opencv_latest" />
<depend package="rxtools" />
Modified: pkg/trunk/pr2/qualification/src/qualification/component_qual.py
===================================================================
--- pkg/trunk/pr2/qualification/src/qualification/component_qual.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/qualification/src/qualification/component_qual.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -61,10 +61,9 @@
import runtime_monitor
from runtime_monitor.monitor_panel import MonitorPanel
-import wg_hardware_roslaunch.roslaunch_caller as roslaunch_caller
+from roslaunch_caller import roslaunch_caller
TESTS_DIR = os.path.join(roslib.packages.get_pkg_dir('qualification'), 'tests')
-
CONFIG_DIR = os.path.join(roslib.packages.get_pkg_dir('qualification'), 'config')
Modified: pkg/trunk/pr2/qualification/src/qualification/pr2_qual_panel.py
===================================================================
--- pkg/trunk/pr2/qualification/src/qualification/pr2_qual_panel.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/qualification/src/qualification/pr2_qual_panel.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -53,6 +53,8 @@
from qualification.test import *
from qualification.qual_frame import *
+from roslaunch_caller import roslaunch_caller
+
import traceback
ONBOARD_DIR = os.path.join(roslib.packages.get_pkg_dir('qualification'), 'onboard')
Modified: pkg/trunk/pr2/qualification/src/qualification/qual_frame.py
===================================================================
--- pkg/trunk/pr2/qualification/src/qualification/qual_frame.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/qualification/src/qualification/qual_frame.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -32,7 +32,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-### Author: Kevin Watt
+### Author: Kevin Watts
import roslib
import roslib.packages
@@ -65,19 +65,21 @@
import runtime_monitor
from runtime_monitor.monitor_panel import MonitorPanel
-import wg_hardware_roslaunch.roslaunch_caller as roslaunch_caller
+from roslaunch_caller import roslaunch_caller
import rxtools
import rxtools.cppwidgets
-## Passed to qualification manager
+##\brief Passed to qualification manager
+##
+## Holds data about item to be qualified. Subtests can hold more data
class QualTestObject():
def __init__(self, name, serial):
self.name = name
self.serial = serial
-## Loads instructions for operator. Displays instructions in HTML window.
+##\brief Loads instructions for operator. Displays instructions in HTML window.
class InstructionsPanel(wx.Panel):
def __init__(self, parent, resource, qualification_frame, file):
wx.Panel.__init__(self, parent)
@@ -108,7 +110,9 @@
def on_cancel(self, event):
# We reset here and don't cancel, because nothing is running
self._manager.reset()
-
+
+##\brief Displays waiting page, subtest results
+##
## Plots panel displays a waiting page while waiting for subtests to
## complete, displays subtest results, displays runtime monitor
class PlotsPanel(wx.Panel):
@@ -140,15 +144,15 @@
# Make runtime monitor panel, console panel
self._notebook = xrc.XRCCTRL(self._panel, 'results_notebook')
- self.create_monitor()
- self.create_rxconsole()
+ self._create_monitor()
+ self._create_rxconsole()
- def create_monitor(self):
+ def _create_monitor(self):
self._monitor_panel = MonitorPanel(self._notebook)
self._monitor_panel.SetSize(wx.Size(400, 500))
self._notebook.AddPage(self._monitor_panel, "Runtime Monitor")
- def create_rxconsole(self):
+ def _create_rxconsole(self):
rxtools.cppwidgets.initRoscpp("qualification_console", False)
self._rxconsole_panel = rxtools.cppwidgets.RosoutPanel(self._notebook)
@@ -192,8 +196,10 @@
def on_cancel(self, event):
self._manager.cancel()
-## Displays results of qualification tests. Results come in as a TestResult
-## class, which makes an HTML page
+##\brief Displays results of entire qualification tests
+##
+## Displays results of qualification tests. Results come in as a QualTestResult
+## class, which makes an HTML page. Users must submit to inventory system.
class ResultsPanel(wx.Panel):
def __init__(self, parent, resource, qualification_frame):
wx.Panel.__init__(self, parent)
@@ -226,11 +232,11 @@
def on_submit(self, event):
self._manager.submit_results(self._notesbox.GetValue(), self._dir_picker.GetPath())
-## Prestartup or shutdown scripts, returns timeout msg
+##\brief Prestartup or shutdown scripts, returns timeout msg
def script_timeout(timeout):
return ScriptDoneRequest(1, "Automatic timeout. Timeout: %s" % timeout)
-## Subtest timeout, returns timeout message
+##\brief Subtest timeout, returns timeout message
def subtest_timeout(timeout):
msg = 'Automated timeout. Timeout: %s' % timeout
@@ -242,13 +248,15 @@
return result
+##\brief Makes waiting page for subtests
def make_html_waiting_page(subtest_name, index, len_subtests):
html = '<html>\n<H2 align=center>Waiting for Subtest to Complete</H2>\n'
html += '<H3 align=center>Test Name: %s</H3>\n' % subtest_name
html += '<H4 align=center>Test %d of %d</H4>\n</html>' % (index + 1, len_subtests)
return html
-## Main frame of qualification
+##\brief Main frame of qualification
+##
## Loads tests, launches them and records results
class QualificationFrame(wx.Frame):
def __init__(self, parent):
@@ -732,8 +740,6 @@
self.log('Launches stopped.')
-
-
## Launches shutdown script
def test_finished(self):
if (self._current_test is not None and self._current_test.getShutdownScript() != None):
Modified: pkg/trunk/pr2/qualification/tests/simple_example/test_node.py
===================================================================
--- pkg/trunk/pr2/qualification/tests/simple_example/test_node.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/pr2/qualification/tests/simple_example/test_node.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -37,7 +37,7 @@
import rospy
from std_srvs.srv import *
-from diagnostic_msgs.msg import DiagnosticArray, DiagnosticStatus, DiagnosticString
+from diagnostic_msgs.msg import DiagnosticArray, DiagnosticStatus, KeyValue
from time import sleep
@@ -59,8 +59,7 @@
stat.name = 'Test Node'
stat.message = 'OK'
stat.hardware_id = 'HW ID'
- stat.strings = [ DiagnosticString(label='Node Status', value='OK') ]
- stat.values = []
+ stat.values = [ KeyValue('Node Status', 'OK') ]
msg.status.append(stat)
while not rospy.is_shutdown():
Property changes on: pkg/trunk/pr2/roslaunch_caller
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/pr2/wg_hardware_roslaunch:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/pr2/roslaunch_caller/manifest.xml
===================================================================
--- pkg/trunk/pr2/wg_hardware_roslaunch/manifest.xml 2009-08-26 21:15:54 UTC (rev 23029)
+++ pkg/trunk/pr2/roslaunch_caller/manifest.xml 2009-08-27 01:34:33 UTC (rev 23088)
@@ -1,10 +1,10 @@
<package>
- <description brief='Puts roslaunch in a library for hardware test calling'>
+ <description brief='Puts roslaunch in a library for API use'>
</description>
- <author>Kevin Watts (wa...@wi...)</author>
+ <author>Kevin Watts (wa...@wi...), Ken Conley (kw...@wi...)</author>
<license>BSD</license>
<review status="unreviewed" notes=""/>
<depend package="rospy" />
<depend package="roslaunch" />
- <url></url>
+ <url>http://www.ros.org/wiki/roslaunch_caller</url>
</package>
Modified: pkg/trunk/sandbox/pr2_startup/manifest.xml
===================================================================
--- pkg/trunk/sandbox/pr2_startup/manifest.xml 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/sandbox/pr2_startup/manifest.xml 2009-08-27 01:34:33 UTC (rev 23088)
@@ -8,7 +8,7 @@
<license>BSD</license>
<review status="unreviewed" notes=""/>
<url>http://pr.willowgarage.com/wiki/pr2_startup</url>
- <depend package="wg_hardware_roslaunch" />
+ <depend package="roslaunch_caller" />
<depend package="rospy" />
<depend package="std_msgs" />
<depend package="robot_mechanism_controllers" />
Modified: pkg/trunk/sandbox/pr2_startup/src/pr2_startup/ui.py
===================================================================
--- pkg/trunk/sandbox/pr2_startup/src/pr2_startup/ui.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/sandbox/pr2_startup/src/pr2_startup/ui.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -50,9 +50,8 @@
import time
from wx import xrc
+from roslaunch_caller import roslaunch_caller
-import wg_hardware_roslaunch.roslaunch_caller as roslaunch_caller
-
class PR2StartUpAppFrame(wx.Frame):
def __init__(self, parent):
wx.Frame.__init__(self, parent, wx.ID_ANY, "PR2StartUp")
Modified: pkg/trunk/sandbox/webteleop/manifest.xml
===================================================================
--- pkg/trunk/sandbox/webteleop/manifest.xml 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/sandbox/webteleop/manifest.xml 2009-08-27 01:34:33 UTC (rev 23088)
@@ -14,7 +14,7 @@
<depend package="bullet_python"/>
<depend package="bullet"/>
<depend package="tf"/>
- <depend package="wg_hardware_roslaunch"/>
+ <depend package="roslaunch_caller" />
<depend package="pr2_default_controllers" />
<depend package="joy" />
Modified: pkg/trunk/sandbox/webteleop/src/server.py
===================================================================
--- pkg/trunk/sandbox/webteleop/src/server.py 2009-08-27 01:34:31 UTC (rev 23087)
+++ pkg/trunk/sandbox/webteleop/src/server.py 2009-08-27 01:34:33 UTC (rev 23088)
@@ -26,7 +26,7 @@
import roslaunch
import roslaunch.pmon
-import wg_hardware_roslaunch.roslaunch_caller as roslaunch_caller
+from roslaunch_caller import roslaunch_caller
from nav_msgs import *
from nav_msgs.msg import *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
