Kaynağa Gözat

fix lib path

Tobias Simetsreiter 4 yıl önce
ebeveyn
işleme
40418f7177
5 değiştirilmiş dosya ile 48 ekleme ve 3 silme
  1. 2 1
      Makefile
  2. 1 1
      bin/image.py
  3. 1 1
      bin/nametag.py
  4. 0 0
      simpilib/.gitignore
  5. 44 0
      simpilib/__init__.py

+ 2 - 1
Makefile

@@ -7,8 +7,9 @@ test:
 deply: bcmlib wiringpi pythonlib
 
 update: wavesharelib
+	rsync -ai Makefile bin/ pi@${RASPI_IP}:raspi-zero-waveshare/Makefile
 	rsync -ai --delete bin/ pi@${RASPI_IP}:raspi-zero-waveshare/bin/
-	rsync -ai --delete lib/ pi@${RASPI_IP}:raspi-zero-waveshare/lib/
+	rsync -ai --delete simpilib/ pi@${RASPI_IP}:raspi-zero-waveshare/simpilib/
 	rsync -ai --delete wavesharelib/RaspberryPi\&JetsonNano/python/ pi@${RASPI_IP}:raspi-zero-waveshare/wavesharelib/
 
 run/%:

+ 1 - 1
bin/image.py

@@ -4,7 +4,7 @@ import sys
 import os
 pydir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'lib')
 picdir = os.path.join(pydir, 'pic')
-libdir = os.path.join(pydir, 'lib')
+libdir = os.path.join(pydir)
 libdir = os.path.join(pydir, 'wavesharelib')
 print(picdir)
 print(libdir)

+ 1 - 1
bin/nametag.py

@@ -5,7 +5,7 @@ import os
 pydir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 picdir = os.path.join(pydir, "wavesharelib",'pic')
 libdirs = [
-    os.path.join(pydir, 'lib'),
+    os.path.join(pydir),
     os.path.join(pydir, 'wavesharelib','lib'),
 ]
 for d in libdirs:

+ 0 - 0
simpilib/.gitignore


+ 44 - 0
simpilib/__init__.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+# -*- coding:utf-8 -*-
+
+def loadFontSize(text, draw, image, fontpath):
+    from PIL import ImageFont
+    fontsize = 1  # starting font size
+    img_fraction = (1,1) # fraction of screen covered
+    font = ImageFont.truetype(fontpath, fontsize)
+    fsize = (0,0)
+    imgsize = (0.9,0.9)
+    longline = getLongLine(text.splitlines())
+    while True:
+        font_last = font
+        fontsize += 1
+        font = ImageFont.truetype(fontpath, fontsize)
+        fsize = draw.textsize(text, font=font)
+        imgsize = (img_fraction[0]*image.size[0], img_fraction[1]*image.size[1])
+
+        if (fsize[0] > imgsize[0] or fsize[1] > imgsize[1]):
+                break
+        print("Fontsize:", fontsize, fsize, imgsize)
+    return font_last
+
+
+def wrapText(text):
+    import textwrap
+    splittext = []
+    longline = ""
+    iter_width = 500
+    line_width_factor = 5
+    while len(splittext)*line_width_factor < iter_width:
+        iter_width -= 1
+        splittext = textwrap.wrap(text, width=iter_width)
+        longline = getLongLine(splittext)
+        print("Wrap:", iter_width, len(splittext))
+    return "\n".join(splittext), longline
+
+
+def getLongLine(split):
+    longline = ""
+    for l in split:
+        if len(l) > len(longline):
+            longline = l
+    return longline