From 8bd6089f9aa2657939db9f794f43e9f89978cb8e Mon Sep 17 00:00:00 2001
From: Justyna Att Ilczuk <justyna.ilczuk@gmail.com>
Date: Sun, 11 Nov 2012 18:06:19 +0100
Subject: [PATCH] Camera is working!

---
 Lasers_und_stuff/main.py               |  38 +++++++++++++--
 Lasers_und_stuff/main.pyc              | Bin 9032 -> 9997 bytes
 Lasers_und_stuff/templates/status.html |  64 +++++++++++++++++++------
 3 files changed, 85 insertions(+), 17 deletions(-)

diff --git a/Lasers_und_stuff/main.py b/Lasers_und_stuff/main.py
index 55962e4..f652b37 100644
--- a/Lasers_und_stuff/main.py
+++ b/Lasers_und_stuff/main.py
@@ -14,10 +14,15 @@ import json
 from pygame.locals import *
 from Cannon import HackWAWCannonController
 from Cannon import Gunpoint
+import pygame.camera
 
 app = flask.Flask(__name__)
 app.debug = True
 pygame.init()
+pygame.camera.init()
+
+CAMERA_X = 400
+CAMERA_Y = 30
 
 cannon = None
 
@@ -41,17 +46,32 @@ def move_down(amount):
     cannon.move_down(amount)
     return "OK"
 
+@app.route("/fire/", methods=["POST"])
+def fire():
+    cannon.fire();
+    
+@app.route("/stop_fire/", methods=["POST"])
+def stop_fire():
+    cannon.fired = False;
+    
 @app.route("/status")
 def status():
     return json.dumps(cannon.get_data())
 
 @app.route("/")
 def root():
-    
     return flask.render_template("status.html", data=cannon.get_data())
+
+
+#Camera stuff
+
+camera = pygame.camera.Camera("/dev/video0", (640, 480))
+camera.start()
+
+
 def main():
     #create the screen
-    window = pygame.display.set_mode((800, 600))
+    window = pygame.display.set_mode((1200, 800))
     
     GRAY = ( 182, 182, 182)
     VIOLET = (150, 100, 190)
@@ -71,6 +91,7 @@ def main():
     
     gunpoint = Gunpoint((5, 4), (200, 4), (5, 210))
     
+    
     keep_running = True
     while keep_running:
         screen.draw_surface(cannon)
@@ -115,6 +136,14 @@ def main():
                     screen.communicates.append("Calibrated")
  
             elif event.type == MOUSEBUTTONUP:
+                mousex, mousey = pygame.mouse.get_pos()
+                print mousex, mousey
+                x =  (mousex  - CAMERA_X)/640.0
+                y = (CAMERA_Y + 480 - mousey)/480.0
+                print x, y
+                position = gunpoint.aim((x, y))
+                print position
+                cannon.position = position
                 screen.change_color()
     print "Pygame thread exited."
     os.kill(os.getpid(), signal.SIGINT)
@@ -202,7 +231,10 @@ class Screen:
         if cannon.fired:
             self.print_text("Fired!", 20, 150, (150, 20, 40), 40, self.window) 
         
-        self.print_text([str(x) for x in cannon.get_data()].__str__(), 20, 300, (0, 0, 0), 30, self.window)               
+        self.print_text([str(x) for x in cannon.get_data()].__str__(), 20, 300, (0, 0, 0), 30, self.window)  
+        image = camera.get_image()
+        self.window.blit(image, (CAMERA_X, CAMERA_Y))
+                     
         pygame.display.flip() 
     
     def print_text(self, text,xx,yy,color,text_size, screen):
diff --git a/Lasers_und_stuff/main.pyc b/Lasers_und_stuff/main.pyc
index 223d4cb84d08afc98cadc670ef8007951836380d..5cec598d5dc2a40f5274266291a53f77893819b2 100644
GIT binary patch
delta 3123
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

delta 2414
zcmZ`)U2Kz87=F*!pY`k7wcTI4u4QdESYeD`FBFgv*vb&t#@S#$Lh9`IZG2tVj(*?9
z7%MZIKZy|%I5AupW8#Gv;*B9uNt8qrqFG`hCPt!Oc;|&)n8=0k%J)6pHweac=jr=*
z&Uw%KKIimm|2LVK<1fGWi~H{l=3xELf!~L4n18eDu^Y>}6Y_r0>tL0^cmVVu=mE%v
zKvy7N532x7Q(&TztobI;+!UwPz^fo9G~0HMw5zr~Y}>ukUTfPUw%sS~epp^#sKs{3
zM6`fCA!^%$aze<qw}Mtr@^}oi1}VfrYm~w!(3+&s23oTe5}<{pkOVCP8mcX%;^D@Y
z$5V88Eeg{LlpiszRR*?$?t**=Xfe>+F_4XK1}!dKTb^)jk*-eAHo?(8eKX|Kv?$Zs
zNbR)MA^_HKD4nFLZ$t1NDeDuKt|dxE@q?06&3ZKMEa;PBw{yRE$8p)^LPJEfI(Y}R
zE3F`KCxYcgm?_Qc*|ITp-byoaxW#qnG12U-7k@YpC!d;7V^5fyeInZBL32vH>pIo`
zRJ>}(Yo&|D$1_g)JJDfM4xsp%__}78IYrE)v+ZKVv*IQP_lbMSlV>fG%cYXF3%^ZD
z9UM8r01h{fBRI@Q=&%6t4Dt%~329ZqI)$Nv{E9#YjV(}dP-iMmz_wIe*bVWm+Is*y
zjXiFIRR>g5usl%l!a|R-<c0DBWyu41H((C9AY0g`&>kw}k%s_1=UPO+cXD}6S*nG6
z5Ud8-^?eM(^NpZM?y(CS?k4FTlkVpKy2H}FAl*o-r)RfF_f6@JKIs;FYei^dlavfw
zQ^b$8Gh=JYg^z)fs|Bl5I#9(ERe6Oz{2#e+4MvdSNBgX;klzM`U35HaJLJ1zRY3v*
z(k+2y?l%$+0Ao}U|M-Ns=}*+y`aS=LY=@Yt>&7;|U3bcB5#=%y1ydKl*KN;8b<!y7
znnescp5@1m_6>8AE$ZR%?1|pYFsDhf-^a732RV^y-P<!T($7^f8dwuk!NV*dZU<js
zanTj(5W77Y@p;JOeg>n>f>;a1m?C})4T|3Sp`Bqg^0>X~Y^hM-ZKTO0ddK9l9cZXB
zGmgyf6M+UFTe=f#xXM^q+-^MC7_sM17L3_6<;XLlwrPdEdgofxrz|Bm8MK3pqG9oK
zww5m$MLr;=!rcwTUkl3zx%1_;BzQ*L3NNzjA{DvI4Dm~3S0aOMK1P8)gjt+yWlgJW
z6sIh@n+t*^GOoQSeIVvr9<sa`h{lrz)cI)wdJ^Q>3{x|vFpn9s#>CZVu5B8{k8qel
z1YiMH&zvlUV-yFE-U+l0vEUALaY~dQB<L08*dF(~h_$K1+X0Zx(iyYa&u+wrq9(=R
zt-xS{IfQC4=jj<qJ&XERII0(y<>>xW1!<ilWdBJ#jDN4>ed58Uxn)0E<j#@=lLoen
z7PROU(Tj64dKuq2PD#p_YZeP*Wi5Td;#+7Y)l60xOD4;ZrQ&6?Ty}`s$VU;XEu1Hn
z+8`@y(2g}A*D6uwt*z*~kHf4(0M@`_tV>Z@O6g%@GBG{!xa&lwp-X0_RJ1rpnU4^h
zK}b{LT<&y*q;Y~52{w*JJ7!H|QRlMvgCd<g<yyp$@5GhluHZ!qrXq66hcDuj*xwXI
z@e>>-Rne`eUe%%2ie&2j?h|N`)#_cy>9dwmD)P%{;?EK6BiK)HfZ%!YXG&)e#hLb>
zcMx&-YXtuvj^1i#UzgY9R!4~aD(-e1qP!u!6=A*RS}BJ$m&BkVRXcLY<U~A~oOK?5
zurwrfH7}WsSM+c0S|(~_3KQluUqOk#Nf4uH<k0k&=cf2eWRqo<%_B#-G>5bxNxmrZ
z;o!3Ll2G(>$f+`XfPn5MHwfq=ak>|rD$3sgJcN93hGl}17#4pEeHQW7+9T62t%<TF
zzD&MwR^EmKGbL@VpdX~|O{#_4(ZPHhA1@2Cpb}sz^D1s7;#&VWBTltX^{9TeNp-8<
RhNO?F?s|oWi+P!g{R`RM#Wnx{

diff --git a/Lasers_und_stuff/templates/status.html b/Lasers_und_stuff/templates/status.html
index 233476b..0b1b24d 100644
--- a/Lasers_und_stuff/templates/status.html
+++ b/Lasers_und_stuff/templates/status.html
@@ -2,33 +2,69 @@
 {% block body %}
 <script type=text/javascript src="{{url_for('static', filename='jquery.min.js') }}"> </script>
 <script type=text/javascript>
-	$(document).ready(function(){
-	//
-	$('#dupa').text("I like bananas");
-	});
 	
-	function pop_banana() {
-		$('#banana').html('<a href="http://ranchochilamate.com/wp/wp-content/uploads/2010/10/banana.jpg">Click</a>');
+	function update() {
+  		update_status();
+    	window.setTimeout(update, 100000000);
 	}
 	
+	$("document").ready(function(data) {
+		update();
+	});
+	
+	function move_right() {
 		$.post("/right/20", function(data) {
-  			$('#dupa').html(data);
+  			update_status();
 		});
+	}
+	
+	function move_left() {
+		$.post("/left/20", function(data) {
+  			update_status();
+		});
+	}
+	
+	function move_down() {
+		$.post("/down/20", function(data) {
+  			update_status();
+		});
+	}
 	
 	function move_up() {
 		$.post("{{url_for('move_up', amount="20")}}", function(data) {
-  			$('#dupa').html(data);
+			update_status();
 		});
 	}
+	
+	function fire() {
+		$.post("/fire", function(data) {
+			
+		});
+	}
+	
+	function stop_fire() {
+		$.post("/stop_fire", function(data) {
+			
+		});
+	}
+	
+	function update_status() {
+		$.get("/status", function(data) {
+				$('#status').html(data);
+  			});
+	}
+	
 </script>
   	<div style="width: 400px; height: 400px; margin-top: -200px; margin-left: -200px; position: absolute; top: 50%; left: 50%;">
+            <h2>Hello in cannon controller, adjust angles!</h2>
+            <p>Angles can be in range 0:255</p>
             <a  onclick="move_up()">Up</a>
-            <a href="/down/20">Down</a>
-            <a href="/left/20">Left</a>
-            <a href ="/right/20"" onclick="move_right()">Right</a>
-            <p id="dupa" onclick="move_right()"></p>
-            <p id="banana"></p>
-            <h2>Status</h2> <p>{{data}}</p></div>
+            <a onclick="move_down()">Down</a>
+            <a onclick="move_left()">Left</a>
+            <a onclick="move_right()">Right</a>
+            <p><a onclick="fire()">Fire!</a> <a onclick="stop_fire()">Stop</a></p>
+            
+            <h2>Status: </h2> <p id="status">{{data}}</p></div>
     </body>
     
 {% endblock %}
\ No newline at end of file