diff --git a/bibrecognition/db.sqlite3 b/bibrecognition/db.sqlite3 index 748ac26..a7f9f97 100644 Binary files a/bibrecognition/db.sqlite3 and b/bibrecognition/db.sqlite3 differ diff --git a/bibrecognition/images/bib_01_i38EFwg.jpg b/bibrecognition/images/bib_01_i38EFwg.jpg new file mode 100644 index 0000000..4600e07 Binary files /dev/null and b/bibrecognition/images/bib_01_i38EFwg.jpg differ diff --git a/bibrecognition/images/bib_02.jpg b/bibrecognition/images/bib_02.jpg new file mode 100644 index 0000000..12cb151 Binary files /dev/null and b/bibrecognition/images/bib_02.jpg differ diff --git a/bibrecognition/images/bib_03_G9AxFQY.jpg b/bibrecognition/images/bib_03_G9AxFQY.jpg new file mode 100644 index 0000000..f0ca984 Binary files /dev/null and b/bibrecognition/images/bib_03_G9AxFQY.jpg differ diff --git a/bibrecognition/images/bib_04_mimQ6LJ.jpg b/bibrecognition/images/bib_04_mimQ6LJ.jpg new file mode 100644 index 0000000..c266258 Binary files /dev/null and b/bibrecognition/images/bib_04_mimQ6LJ.jpg differ diff --git a/bibrecognition/images/bib_05.jpg b/bibrecognition/images/bib_05.jpg new file mode 100644 index 0000000..df4cd34 Binary files /dev/null and b/bibrecognition/images/bib_05.jpg differ diff --git a/bibrecognition/images/bib_05_kQ2mqaw.jpg b/bibrecognition/images/bib_05_kQ2mqaw.jpg new file mode 100644 index 0000000..df4cd34 Binary files /dev/null and b/bibrecognition/images/bib_05_kQ2mqaw.jpg differ diff --git a/bibrecognition/images/bib_05_roPy7Ha.jpg b/bibrecognition/images/bib_05_roPy7Ha.jpg new file mode 100644 index 0000000..df4cd34 Binary files /dev/null and b/bibrecognition/images/bib_05_roPy7Ha.jpg differ diff --git a/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc index 3137f72..38b3af6 100644 Binary files a/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/forms.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/functions.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/functions.cpython-38.pyc index 49ddef4..3374974 100644 Binary files a/bibrecognition/imguploader/__pycache__/functions.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/functions.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc index 2d71fee..97d846e 100644 Binary files a/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/models.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc index db3c30d..c51b4be 100644 Binary files a/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc index cbf86ea..04e9881 100644 Binary files a/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc and b/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc differ diff --git a/bibrecognition/imguploader/forms.py b/bibrecognition/imguploader/forms.py index 9adf0d9..e7e9bf1 100644 --- a/bibrecognition/imguploader/forms.py +++ b/bibrecognition/imguploader/forms.py @@ -11,5 +11,14 @@ class PhotoForm(forms.Form): class SearchForm(forms.Form): zawody = forms.ModelChoiceField( - queryset=Competitions.objects.all(), to_field_name="comp_slug") + queryset=Competitions.objects.filter(status="published"), to_field_name="comp_slug") numer = forms.DecimalField(decimal_places=0) + + +class ChangeForm(forms.Form): + zawody = forms.ModelChoiceField( + queryset=Competitions.objects.all(), to_field_name="comp_slug") + + +class ChangeIDForm(forms.Form): + numerki = forms.CharField() diff --git a/bibrecognition/imguploader/functions.py b/bibrecognition/imguploader/functions.py index 231572b..e36ac04 100644 --- a/bibrecognition/imguploader/functions.py +++ b/bibrecognition/imguploader/functions.py @@ -72,7 +72,7 @@ def decode_predictions(scores, geometry): def findNumber(url): - image = cv2.imread(url) + image = cv2.imread("./"+url) orig = image.copy() (origH, origW) = image.shape[:2] (newW, newH) = (320,320) diff --git a/bibrecognition/imguploader/models.py b/bibrecognition/imguploader/models.py index c3a7462..e5cacda 100644 --- a/bibrecognition/imguploader/models.py +++ b/bibrecognition/imguploader/models.py @@ -17,7 +17,7 @@ class Competitions(models.Model): class Photo(models.Model): comp_id = models.ForeignKey(Competitions, on_delete=models.CASCADE) name = models.CharField(max_length=100, default='Zdjecie') - image = models.ImageField(upload_to='images/', default='placeholder.jpg') + image = models.ImageField(upload_to='./', default='placeholder.jpg') # url = models.CharField(max_length=50) objects = PhotoManager() diff --git a/bibrecognition/imguploader/templates/change.html b/bibrecognition/imguploader/templates/change.html new file mode 100644 index 0000000..1cc9000 --- /dev/null +++ b/bibrecognition/imguploader/templates/change.html @@ -0,0 +1,33 @@ + + + +
+ + +{{ nr }}
+ {% endfor %} +Znalezione wartości:
+ + {% for n in numery %} + {{ n }}, + {% endfor %} +Nowe wartości (po przecinku):
+ + + + {% endif %} + + + \ No newline at end of file diff --git a/bibrecognition/imguploader/templates/index.html b/bibrecognition/imguploader/templates/index.html index 3a51633..94131d0 100644 --- a/bibrecognition/imguploader/templates/index.html +++ b/bibrecognition/imguploader/templates/index.html @@ -9,7 +9,8 @@ {% if user.is_authenticated %} Zalogowany 😎