From a3afed06db3733dcbecb405793f7eafa81182af3 Mon Sep 17 00:00:00 2001
From: Julius Riegel <trivernis@hotmail.de>
Date: Sat, 13 Jan 2018 17:04:47 +0100
Subject: [PATCH] Fixing the camera 1

---
 .idea/workspace.xml | 43 +++++++++++++++++++++++++++++++++++--------
 lib/graphiclib.py   | 29 +++++++++++++++++------------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0a19557..ee69ff0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="49388e57-2b9e-468a-b880-1d7fb243112d" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/graphiclib.py" afterPath="$PROJECT_DIR$/lib/graphiclib.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -26,11 +26,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="main.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="40" column="28" lean-forward="false" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" />
+            <state relative-caret-position="493">
+              <caret line="41" column="28" lean-forward="true" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
               <folding>
                 <element signature="e#0#19#0" expanded="true" />
               </folding>
@@ -38,6 +38,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="graphiclib.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/graphiclib.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="474">
+              <caret line="85" column="24" lean-forward="false" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
+              <folding>
+                <element signature="e#0#28#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="update.sh" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/update.sh">
           <provider selected="true" editor-type-id="text-editor">
@@ -87,6 +99,7 @@
         <option value="$PROJECT_DIR$/thermo.py" />
         <option value="$PROJECT_DIR$/update.sh" />
         <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/lib/graphiclib.py" />
       </list>
     </option>
   </component>
@@ -136,6 +149,11 @@
               <item name="spydian" type="b2602c69:ProjectViewProjectNode" />
               <item name="spydian" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="spydian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="spydian" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -282,12 +300,11 @@
           </properties>
         </breakpoint>
       </default-breakpoints>
-      <option name="time" value="3" />
+      <option name="time" value="4" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/ultrasonic_test.py" />
     <entry file="file://$PROJECT_DIR$/gyro.py" />
     <entry file="file://$PROJECT_DIR$/install.sh">
       <provider selected="true" editor-type-id="text-editor">
@@ -466,13 +483,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="40" column="28" lean-forward="false" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" />
+        <state relative-caret-position="493">
+          <caret line="41" column="28" lean-forward="true" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
           <folding>
             <element signature="e#0#19#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/graphiclib.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="85" column="24" lean-forward="false" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/lib/graphiclib.py b/lib/graphiclib.py
index e056a3b..b129672 100644
--- a/lib/graphiclib.py
+++ b/lib/graphiclib.py
@@ -1,24 +1,26 @@
 import pygame, pygame.camera
+import picamera
+import picamera.array
 from pygame import *
 
-def render_text_line(image, color, font, text, pos = (0,0)):
+
+def render_text_line(image, color, font, text, pos=(0, 0)):
     render_text = font.render(text, 1, color)
     image.blit(render_text, pos)
 
+
 class Screen:
     """The Screen for the Terminal"""
 
-    def __init__(self, size = (100,100), title = "Screen"):
+    def __init__(self, size=(100, 100), title="Screen"):
         pygame.display.init()
         self.size = size
         self.screen = pygame.display.set_mode(self.size)
         pygame.display.set_caption(title)
 
-
     def refresh(self, rectangles=None):
         pygame.display.update(rectangles)
 
-
     def toggle_fullscreen(self):
         if self.fullscreen:
             pygame.display.set_mode(self.size)
@@ -38,15 +40,14 @@ class List(pygame.sprite.Sprite):
         pygame.font.init()
         self.size = size
         self.image = pygame.Surface(self.size)
-        self.image.fill((0,0,0))
+        self.image.fill((0, 0, 0))
         self.rect = self.image.get_rect()
         self.rect.topleft = position
-        self.font = pygame.font.SysFont('Arial',25)
+        self.font = pygame.font.SysFont('Arial', 25)
         self.dict = {}
         self.updated = True
         self.txtsize = self.font.size('__||__')
 
-
     def set_dict(self, dict):
         self.dict = dict
         self.updated = True
@@ -57,10 +58,12 @@ class List(pygame.sprite.Sprite):
 
             for key in self.dict.keys():
                 line = '{}: {}'.format(key, self.dict[key])
-                render_text_line(self.image, (255, 255, 255), self.font, line, (0,height))
-                height+=self.txtsize[1]
+                render_text_line(self.image, (255, 255, 255), self.font, line, (0, height))
+                height += self.txtsize[1]
 
             self.updated = False
+        print('update function called')
+
 
 class PiCamera(pygame.sprite.Sprite):
     """The Picamera as pygame cam"""
@@ -68,8 +71,7 @@ class PiCamera(pygame.sprite.Sprite):
     def __init__(self, position, size):
         pygame.sprite.Sprite.__init__(self)
         pygame.camera.init()
-        cam_list = pygame.camera.list_cameras()
-        camera = pygame.camera.Camera(cam_list[0], size)
+        camera = picamera.PiCamera()
         self.camera = camera
         self.size = size
         self.image = pygame.Surface(self.size)
@@ -78,4 +80,7 @@ class PiCamera(pygame.sprite.Sprite):
         self.rect.topleft = position
 
     def update(self, *args):
-        self.camera.get_image(self.image)
\ No newline at end of file
+        print('updating camera')
+        with picamera.array.PiRGBArray(self.camera, size=self.size) as output:
+            self.camera.capture(output, 'rgb', resize=self.size)
+            print(output)
\ No newline at end of file