Torsten Simon 2 gadi atpakaļ
vecāks
revīzija
621de5a95c
3 mainītis faili ar 14 papildinājumiem un 5 dzēšanām
  1. 1 0
      Dockerfile
  2. 10 2
      docker-compose.yml
  3. 3 3
      src/data-writer-opencv.py

+ 1 - 0
Dockerfile

@@ -5,6 +5,7 @@ RUN apt-get update && apt-get -y install wget git gcc python3-pip tesseract-ocr
 WORKDIR /tmp
 RUN git clone https://github.com/adrianlazaro8/Tesseract_sevenSegmentsLetsGoDigital && cd Tesseract_sevenSegmentsLetsGoDigital && mv 'Trained data'/* /usr/share/tesseract-ocr/4.00/tessdata/
 WORKDIR /app
+RUN mkdir images
 RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh
 RUN chmod +x wait-for-it.sh
 COPY src/requirements.txt . 

+ 10 - 2
docker-compose.yml

@@ -4,7 +4,14 @@ services:
       build: 
         context: .
       restart: unless-stopped
-
+      volumes:
+          - images-data:/app/images
+  fileserver:
+      image: halverneus/static-file-server:v1.8.9
+      ports:
+        - 80:80
+      volumes:
+        - images-data:/web
   grafana:
       image: grafana/grafana:7.5.7
       ports:
@@ -40,4 +47,5 @@ services:
 
 volumes:
   influx-data:
-  grafana-data:
+  grafana-data:
+  images-data:

+ 3 - 3
src/data-writer-opencv.py

@@ -100,8 +100,8 @@ class SolarMonitor:
         self.camera.iso = 800
 
     def capture(self): 
-        file = "/home/pi/solar-monitor/camera/" + str(datetime.now()) + ".jpg"
-        self.camera.capture(file)
+        file = "images/" + str(datetime.now()) + ".jpg"
+        self.camera.capture(file, format="jpeg", quality=25)
         print("Captured.")
         img = cv2.imread(file)
         img = self.crop(img)
@@ -147,7 +147,7 @@ class SolarMonitor:
             print(results)
             if results:
                 self.writeData(results)
-            cv2.imwrite(file + '_r.jpg', img)
+            cv2.imwrite(file + '_r.jpg', img, [cv2.IMWRITE_JPEG_QUALITY, 25])
             # os.unlink(file)
             time.sleep(2)