From 6b9cb70fc143a3a9f2de57baa7cfa0c37ab8f4c4 Mon Sep 17 00:00:00 2001 From: Glen Turner <8gt6@queensu.ca> Date: Wed, 1 Jul 2015 12:17:18 -0700 Subject: [PATCH] Removed ~ files --- README.md~ | 48 -------------------- backend/js/Topic.js | 2 +- data/bagfile_2015-07-01-09-17-42.bag.active | Bin 0 -> 63160 bytes launch.bash~ | 27 ----------- launch/all.launch~ | 5 -- src/bagger.py~ | 32 ------------- src/talker.py~ | 0 7 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 README.md~ create mode 100644 data/bagfile_2015-07-01-09-17-42.bag.active delete mode 100644 launch.bash~ delete mode 100644 launch/all.launch~ delete mode 100755 src/bagger.py~ delete mode 100644 src/talker.py~ diff --git a/README.md~ b/README.md~ deleted file mode 100644 index ed99238..0000000 --- a/README.md~ +++ /dev/null @@ -1,48 +0,0 @@ -# Asctec Pelican GUI - -The purpose of this project is an example of how to write a web page that can be accessed by any device on the same network as the host computer by accessing the IP of that host computer. - -### Quick Start Guide - - -If you are connecting to a remote computer that is running the roscore, you need to run the following lines in the terminal: - - sudo route add 192.168.2.1 gw - export ROS_MASTER_URI=http://:11311 - export ROS_IP= - -Make sure you have the web_video_server installed: - - sudo apt-get install ros-indigo-web-video-server - -Make sure you have ROSBridge installed: - - sudo apt-get install ros-indigo-rosbridge-suite - -Then run the bash file in the working directory by running the following in the terminal. - - bash launch.bash - -#### Just display the webpage - -If you just want to test the webpage, navigate to the working directory in the terminal and type - - python -m SimpleHTTPServer - -Then open http://localhost:8000/. -# Making Changes - -Feel free to clone this project and use it as a base for your own GUI. - -You can easily customise the "Robot Display" pannel by changing the HTML "robot\_display.html" file. - -All ROS related Javascript should go in the "ProjectFiles/js/ros_scripts.js" file. -All functions that are used to update the GUI should go in the "ProjectFiles/js/update_guis.js" file - -By using ROSBridge, this GUI will attempt to display relevant information over the web for any device. - -TODO: -1. Display Network Information -1. Add checkmarks for which topics you want to record -2. Add time plot for data -1. fix connectoin button on ROS Bridge Connection tab diff --git a/backend/js/Topic.js b/backend/js/Topic.js index 4cf5077..e8292c1 100644 --- a/backend/js/Topic.js +++ b/backend/js/Topic.js @@ -9,4 +9,4 @@ Array.prototype.indexOfTopic = function(name) { if (this[i].name == name) return i; return -1; -} \ No newline at end of file +} diff --git a/data/bagfile_2015-07-01-09-17-42.bag.active b/data/bagfile_2015-07-01-09-17-42.bag.active new file mode 100644 index 0000000000000000000000000000000000000000..347c1e60d9e96f622b42d84382bd88fd6f50aae7 GIT binary patch literal 63160 zcmeHQ34B!5)z1P!LVyqu0Wm(CU!%{P6tQ3nq5|SxYbz?Q*oqb`E)|!mw1NnTAY0G5_q~uu=DxY(_okPh-}oaYZ{C}C z|L6SAUH<3Z_ijPWq}ov-_=z68VMSP|thuX7%AvQ`?0t zK`%NIFINAI{e>2PFlsH60{$T0nf!`H;aD1la~B?1>kLlAFGO)Wv-7$Pm|2Vb}UK77+3l-yFY zI}Bma5^#s%dZ-=#AYNV{21fAi@Gm0IZIOdsSsHs`1&LwV+Y; zSsffkiX|unAjr)jZ=*CAkWX%nHbQ(L*Yn(AzuNh0+rPn5xPTf7UsFWOYn2%JI4HAs<`25=yh-y9Cj^ZURqPb`hftSG~XX>1o-9(s8*B?II>ho4S|pcDlH+Xt+wEu z>ioX!4sBpxY!o3ES^4|C#Z#xfU6}hN+yfg~JpSN9 zA7*INGR}nm>9nU@PWlW%#2C9xIA-q4A0O8d$Q6Lhkp$2@l=h-&4ZA` zh{Ni1)xjzp{KTzJZn%a9uo^avp(eSsAs`1!p?RO<57y0((5eA-2*x@v8fj?p*U48v zqZ*J)v3)6px`iEY9oDB3vlFUQiMhPQ;w-V1nc$qsXa{2((5}`+p`)3OV~$|Mb>ITM ziihWz!@69kby$&34D060o;qxFL(o-(VZ@ah%%ui%sli-oFc)u(_#++6wQD`KgSn^X z)aHK*Ehk7G8i1`oeuYhQ5via2nJ=M z4(kG;2GAG%;e=jyk^$$L-ANbdPDlcxElU96c+UT!6ZvH-BOptui~xVyAe9k7;hf3{ zBqby8gHrtb+n_&n<)VBXyJPDsLxXz%dpwq^)2b`-R%_wHC!;qlv z2A|M#bvW;X&GxXSkgp{mSFMA;Pa2P-m}r}|!=_tpzWc!6ik5&JRGm8U5?%|Rp9McB zvOG|jlGy@r0BQ0$a#Yi#n~UIbW!A2|yv!@R+!lw+>6N`Mugl|exva9+Y4y5o7N14J zOFPcmDN|dREz8bkAtRq-O1*6krAi-z_iX{}f8U41Od`$$|Hx{(3*m zl8~b|2S||EJE5)Mh<1r;8eRR3iDM$lAg$JxDwQ-?FiWkvyTb%QA2^$spA(rKO?92A zu9Lstgey~8D5ZsPBKXwOLhV{mZENnV+MNFcG_QC;6uQoF{=L|Xre$C!fm4bn_gI7B z^O+aWIbri`Nu3O&^Ytf9cwr9<)5+10HxvM=g#9<D5_tcBtU@^CmB5Z4CV_`Q32l5Kk1Ai7zE${wkb_xl z928_jOlm2k=a^%r)Ji8@@RVBVlu&=IcX6sOPxa+V>&s)dd7P`A+O?h9c71G3FVe2x z@n3D%HGK{f+Y9c@A=u|ERxj)ZB^Lvo5&2 zGqLj5r=pbukCw)<(xtJI$>pkHM@x~*I~6PI59}>XfJ>JFTrwHRnL@GMDh?Yn&Sv~+ zuRRU}<$Me@?%iug29_vRF3Q?zPk@2)WHPWcZ6Cq*zv8gPjNDZ)(w#kZQX2YgDPY6n z<-fQ9-Nx4nSxsgG{1!7h5X*GHrW+klz9u@r26YU5q94FJ-G3jo@-}f+G8u?GQJIAd z+@)aaztVvo;bp*L00T_FjowYM-7XFrGddps`|zwd(P7a<2lGxd|5lL`=T2psJ2Cy0 zlXZR$a*5*&jJv}VOK}>Mm&-B(xMarJtUZ+k+uh=@F&XG(v*yKNz^Y+@Y2~r0);wh3 z9>vNBqUYl4MtB*p8o&TEI$jA-Y&hb>=s1R27Y-twemOOtYo$wv(j>jT3n`JTX?t&e-_Yc`hi(Mjo+Bj@mUqcrjFADU}Hwd zU#I5k=V8G&d{#~#(S@i*bu6^`_T$9~v_eK`VrFz$wsj-e?o*;e05&EATdv5{*Xvf3 zR| znSSeAU?SKa5QmK!9X)?z($6J;Z#2=tWT5o*0-_diEQAcaynGHM15mOM?2SZ=?dP+t>6`5G&kT#n2g zM6CS1I4hy#j+t|`viACJL=&rHp3cC|4S1Amf zN>rL9c&FQTOdwW1B+km1bpWwRW9VEgjuP-VJI{q4;nT!+lM$Mj z$-rlIBlLAAl+VY&vg=0>b^Wk7E13+uag&{BVjLwP13N|~FuQ9{o+d^tmL*PoO$_Dp zG2qbiK{F>OFJWY&P?s~S6==F8turV3P-&drsiNQA-2AFqB z5B1a6opv7GiT>KKpdZnl>lJ^QPw&OAuA!7<=>fzRzJp@JQ57DaO4!~zLN&2EO1N!q z0#A$B4bjBR7IJtsRkDvNeiML=8M!xS#Ccu^e50uYU_-~O1V+QBH>VLLtBw+et~kuE zWbKA1StbKth0+PO4GIGSurV3PwPot(62Lba2AEdn+o)Q6OtJD3PXe0Qo;*#A(J|!L zhx9cul&`Up8E606O=rW^v5){Onb=y!{F~@bbu6@O{pbAi#P;NAVq{=X(Jq4RaV0tg zU}M&S&69WOYhv(C{ODK%Rz7z5XrdNzyn)B>RwST_9foM)nDrB}yk@zWV0%IwwwMec zws9NA>+5y!jfMfHm9IyJ6SerHV&%%~6PPD<7@~=xj>HGvVu_Jk!7(L#zDUK$F@-(VfpI zR(9T&&##FchG=4DbZlEmvEeukqeB2TCIb!qO7%4{_(sD3)5@g-2M{HT;|;X3;?>^# zO4ebBl4VB6y(0z^Y=01kjmf}$N6ymEC4g`E7dqSfQ`vO|6Sen=di&yd<=Zu+==K;bu9E@RRXiSj^t@#WMJzWitUdI0|Kxy8E9Od zrLT#>H+&4t7?NhjXK2*1&`rw^@~@qC7@~=pt#v(w-k z4FgOo*K9jRbmyNGD|dhTHNPfy7@~=pR(5_Z(-Fr?PTe_ef2ITDOdVATuoC>+QT03o zHT}##%pkfG$3l2K?fHptDd#MuGkKaAvDgO8B-s8e4qMFVKx}tb&(zn%;2TXHU^4J% z!8oFcalC<@G-EZdN9$QFDOUt=Y+rVse;9Af2*;;dvcu(5{DpyF5v8OWTS!1Kh;vC$&&k4Ef=~KBL2y!e$GguT zQEI>JGf8HNZU+wA&4=I(O{U&(Aw>DfFNw#!R6@ZzZveI`Z-Boc$eDXo$L!${WuKq+ zB&gp|+OSg!HM0$W?}IpR>2vX9)zJQVIrPbp&5He39dlCFNHY-U{a8>+vQ{f2ws!_o zY^Z1PSO7L=+~h2x8NW9bY%jc;KsM5qylf=;>5f(#$&{iB#bW{3n2|f7GEO!Ud~+^T zWQ;3p5-P!lj&mYt)z$7HBpZoJ50Ah3V*=Somm%3mW^|mjlw$jfIBZM?&RH8L8wtMQ zV_@OOgGrtaRVXrW)`SFB=(v)XjYKTB7sYv70+g?@lF4QC^7Dw5e-&pXlpMPbT$)!v zR>7b?L#t<9(wBdQj?0j2Bs0zqKUAWh@q_aD7_dBPB38a7&PpZ&n|hu>vXQFNd*<~V z{x>7M{P74`L@D<0BlSKKE1BLel`+(!^gmi%r0aVj5>y1w&OegY^2MOY$UVw-jYqR zy`wN702`Bm`lUVeSLlFm_!tbu%8+93<;lxyA(pQDD+spj;;=Cp7;$L0{wh204Icy1F*M_Yx*4sO z>=OSfyK+PFTFg4|j~!N$je1WUHYNj??Xc;u00iG?7+_ktdU_Gb_`I)J+2huJ{CTbN zJ=G<|O3V)6odsCQ#P&tcGfD0Ubu(gHbx8twt@7mM zwGhia^C-3t#9?FBfl)2z=;yV-H+<2t@y^~PuZ6l9t-kD`4F0@UdGhjFh~-H0=>*${ z;;=CpSU)JvDm(BE9|N0i&LVj&RqZ}ic!)o*Rc=ULi)rOBPdEMC5tOg7lG)alWaJSm z|DkXxz)C1Nb_@C22z@3?ReXKte8ZpDDo9Vjn4f6M&5w9cO3c>gTn< zH=5{($-r8$a^com@^lw!6+B+@JbzxxX*MLU6*F=X%QM$ZBiMF`!xobP#FqKE{*!0u z8$Jfka9>Q+BB~y|^BFmnSSpt$hEj}Jp}}Ne@>lf9vya7LV=^$PAp$zC6miTn@12UKM`jo6We124x&3hRj_qg zR?Mx5!2?F@+5shZ?4t++Hw`1$P?6!W0Bp=Uu(L@LHP7e%r=xRH-lUCa? z{gt=MK@==%JM`Bzx17zbuCWvYR-7^8?8di-5p17{!^ZU6+DUY+2dW?2JpJ4l395yBcH@v35)&qUR$G}aSju+!Q8c?es11qbJaKE7xN-^TeGp3ch&&<(X zPl4rYtYmVzWGh|K@`X4nq2$=T-MH=PL@lD~K?cq}!2dQD@PH9JSu*|h>jyIlwlBqD zV@AigFZAEWg1*s22a|yt*3QkbkWQl#;ZaEHN6MpG)5qvr}O}05&EA8?Nf2 ztBKJ!8U|v<**dWDrNwj=#J|8wJl?Q50ZnW%L=(rf60uAfI!kx0hZD-zSQ#_U@Jw&)EV_;>v zljM#t-+&B!c$|N&2b5w&UW>_q|HJbMw%y{eF&U_TOMk5g`bNV5)5?2hmy(Rn*NT<- z1Nhf^Kq*FKqoCxDS_`A$kYCD`_e!^UJ_`frBn=e58$d<^`1XJ3*#!h8c-J@JEX{CO=)^72}U z#rrOOhUpt|*q97la;^Sa4`?4a@>*!+gfF|1^%R)7z~j$)@UQiNQjExJF4nb_8DA4@dx0R`K#UnQ{Cqs$OZ3?+ALJJ4^>9j4e&6XUS}Y%%KqV(GkG z|1HB#@C{#dtQbpm=XZ*gnRoL){{W>Jp^2Fc-1^c9O^j9xz{X^t^6b(2>rlWq8U~nF z_8RVL)17GLk=+Tb^(Zq$6Em&cw12ezdI~6CVFzeD ziIIW%w4_L@VGkl07O88aXS>E*3R0-g*7o z{5$VBt%hh~CIjnksU>xeN8I-|#W;PL8QfcOnC8?n>aP1#9v&F=E+XO*L_*!his5Oa?aI6K9?n ze8a~;_iqQa=}xqIPb?^IMkySc7_EHO+ns1))SY;|<<4~O zcLG2uNt-7|EK8oC*s>G`1Ylz_V0!-yeN7C$;j07h9;eS3pzcJguPNkz*CjBJG);_H zK7Oey(ZpR81_WSZGLUw){<|*GH+&3Cx%@DBpCsx|wEDR{2|WK`HAE9Lt;}4Prms7p ze2taNQB|jp=$j8tQ@9jhCHS}FOyCCacyF1`6Ql0LO7JWY&PcJ~=WG;ueDf&UJ+{{V}pt;zrZ literal 0 HcmV?d00001 diff --git a/launch.bash~ b/launch.bash~ deleted file mode 100644 index 0e7380c..0000000 --- a/launch.bash~ +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - - -kill_child_processes() { - isTopmost=$1 - curPid=$2 - childPids=`ps -o pid --no-headers --ppid ${curPid}` - for childPid in $childPids - do - kill_child_processes 0 $childPid - done - if [ $isTopmost -eq 0 ]; then - kill -9 $curPid 2> /dev/null - fi -} - -# Ctrl-C trap. Catches INT signal -trap "kill_child_processes 1 $$; exit 0" INT - -chmod a+x src/bagger.py - -x-terminal-emulator -e "roslaunch rosbridge_gui_example all.launch" & -x-terminal-emulator -e "python -m SimpleHTTPServer 8000" & -x-terminal-emulator -e "rostopic echo /bag_notifier" & -x-terminal-emulator -e "rosrun web_video_server web_video_server" - - diff --git a/launch/all.launch~ b/launch/all.launch~ deleted file mode 100644 index b995f9e..0000000 --- a/launch/all.launch~ +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/bagger.py~ b/src/bagger.py~ deleted file mode 100755 index 4012702..0000000 --- a/src/bagger.py~ +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -import rospy -from std_msgs.msg import String -import rospkg -import subprocess -import os -import signal - -class Bagger(object): - - def __init__(self): - rospy.init_node("bagger", anonymous=True) - rospy.Subscriber("bag_publisher", String, self.callback) - self.pub = rospy.Publisher("bag_notifier", String, queue_size=10) - self.proc = None - rospack = rospkg.RosPack() - self.data_path = os.path.join(rospack.get_path("rosbridge_gui_example"), "data") - - def callback(self, msg): - if msg.data == "STOP" and self.proc is not None: - os.killpg(self.proc.pid, signal.SIGINT) - self.pub.publish("STOPPED") - else: - bag_file = os.path.join(self.data_path, msg.data) - self.proc = subprocess.Popen(["rosbag", "record", "-o", bag_file], preexec_fn=os.setsid) - self.pub.publish(["rosbag", "record", "-o", bag_file]) - self.pub.publish("STARTED") - - -if __name__ == '__main__': - Bagger() - rospy.spin() diff --git a/src/talker.py~ b/src/talker.py~ deleted file mode 100644 index e69de29..0000000