WORKING Dj2.2.24 & 2.2.25 py3.7

This commit is contained in:
Philip Sargent
2022-03-02 21:15:24 +00:00
parent af50d4912d
commit 601fc2cffc
12 changed files with 97 additions and 29 deletions
-1
View File
@@ -5,7 +5,6 @@ import settings
import urllib.parse
import subprocess
from pathlib import Path
#from PIL import Image, ImageDraw, ImageFont
from django import forms
from django.conf import settings
+2 -4
View File
@@ -1,10 +1,8 @@
import os
import string
import re
#import settings
import urllib.parse
# from pathlib import Path
from PIL import Image, ImageDraw, ImageFont
from django.http import HttpResponse
from django.shortcuts import render
@@ -18,7 +16,7 @@ from troggle.parsers.survex import MapLocations
''' Generates the prospecting guide document.
Also produces the overlay of points on top of a prospecting_image map - to be deleted.
I have tried to make this work with the version of PIL we have installed but something is missing still.
Not working with recent PIL aka Pillow image package - removed.
'''
AREANAMES = [
@@ -143,7 +141,7 @@ for FONT in [
TEXTSIZE = 16
CIRCLESIZE =8
LINEWIDTH = 2
myFont = ImageFont.truetype(FONT, TEXTSIZE)
#myFont = ImageFont.truetype(FONT, TEXTSIZE) # disabled as not importing PIL
#print(f' - myFont {myFont} {FONT} {TEXTSIZE}')
def mungecoord(x, y, mapcode, img):