diff --git a/data/resolution_5/Map.png b/data/resolution_5/Map.png index 8749714..b8af2c6 100644 Binary files a/data/resolution_5/Map.png and b/data/resolution_5/Map.png differ diff --git a/data/resolution_5/aletter.png b/data/resolution_5/aletter.png index dd69278..c2f55d4 100644 Binary files a/data/resolution_5/aletter.png and b/data/resolution_5/aletter.png differ diff --git a/data/resolution_5/eletter.png b/data/resolution_5/eletter.png index 332b81b..a1653e3 100644 Binary files a/data/resolution_5/eletter.png and b/data/resolution_5/eletter.png differ diff --git a/data/resolution_5/gletter.png b/data/resolution_5/gletter.png index a09b9a5..3ac91f5 100644 Binary files a/data/resolution_5/gletter.png and b/data/resolution_5/gletter.png differ diff --git a/data/resolution_6/Map.png b/data/resolution_6/Map.png index 0559506..8749714 100644 Binary files a/data/resolution_6/Map.png and b/data/resolution_6/Map.png differ diff --git a/data/resolution_6/aletter.png b/data/resolution_6/aletter.png index 3719b8e..dd69278 100644 Binary files a/data/resolution_6/aletter.png and b/data/resolution_6/aletter.png differ diff --git a/data/resolution_6/eletter.png b/data/resolution_6/eletter.png index f607450..332b81b 100644 Binary files a/data/resolution_6/eletter.png and b/data/resolution_6/eletter.png differ diff --git a/data/resolution_6/gletter.png b/data/resolution_6/gletter.png index 88fa248..a09b9a5 100644 Binary files a/data/resolution_6/gletter.png and b/data/resolution_6/gletter.png differ diff --git a/data/resolution_7/Map.png b/data/resolution_7/Map.png new file mode 100644 index 0000000..0559506 Binary files /dev/null and b/data/resolution_7/Map.png differ diff --git a/data/resolution_7/aletter.png b/data/resolution_7/aletter.png new file mode 100644 index 0000000..3719b8e Binary files /dev/null and b/data/resolution_7/aletter.png differ diff --git a/data/resolution_7/eletter.png b/data/resolution_7/eletter.png new file mode 100644 index 0000000..f607450 Binary files /dev/null and b/data/resolution_7/eletter.png differ diff --git a/data/resolution_7/gletter.png b/data/resolution_7/gletter.png new file mode 100644 index 0000000..88fa248 Binary files /dev/null and b/data/resolution_7/gletter.png differ diff --git a/distance/code/distanceFinder.py b/distance/code/distanceFinder.py index cbc5a9c..ccc7ee0 100644 --- a/distance/code/distanceFinder.py +++ b/distance/code/distanceFinder.py @@ -17,9 +17,10 @@ def read_config(name): '2': [1234,604,444,444,444,444], #1680x1050 '3': [1462,622,456,456,456,456], #1920x1080 #'3': [1034,436,329,329,329,329], #2560x1080 - '4': [1952,832,605,605,465,605], #2560x1440 - '5': [2940,1260,900,900,480,900], #3840x2160 - '6': [3924,1684,1196,1196,460,1196], #5120x2280 + '4': [1955,835,605,605,465,605], #2560x1440 + '5': [2835,835,605,605,465,605], #3440x1440 + '6': [2940,1260,900,900,480,900], #3840x2160 + '7': [3924,1684,1196,1196,460,1196], #5120x2280 } def checkDistance(model, queue1): diff --git a/distance/code/scale.py b/distance/code/scale.py index aed8096..babc43a 100644 --- a/distance/code/scale.py +++ b/distance/code/scale.py @@ -27,9 +27,10 @@ def read_config(name): '2': [1234,604,444,444,444,444], #1680x1050 '3': [1462,622,456,456,456,456], #1920x1080 #'3': [1034,436,329,329,329,329], #2560x1080 - '4': [1952,832,605,605,465,605], #2560x1440 - '5': [2940,1260,900,900,480,900], #3840x2160 - '6': [3924,1684,1196,1196,460,1196], #5120x2280 + '4': [1955,835,605,605,465,605], #2560x1440 + '5': [2835,835,605,605,465,605], #3440x1440 + '6': [2940,1260,900,900,480,900], #3840x2160 + '7': [3924,1684,1196,1196,460,1196], #5120x2280 } resolutionX = resolutionObject[resolution][0] diff --git a/distance/settings.pyw b/distance/settings.pyw index 3d8d57b..5c13cef 100644 --- a/distance/settings.pyw +++ b/distance/settings.pyw @@ -230,10 +230,12 @@ try: #a3_btn.pack(anchor=W) a4_btn = tk.Radiobutton(master=resolution_form, text='2560x1440', value='4', variable=lang, font=('Roboto','14')) a4_btn.pack(anchor=W) - a5_btn = tk.Radiobutton(master=resolution_form, text='3840x2160', value='5', variable=lang, font=('Roboto','14')) + a5_btn = tk.Radiobutton(master=resolution_form, text='3440x1440', value='5', variable=lang, font=('Roboto','14')) a5_btn.pack(anchor=W) - a6_btn = tk.Radiobutton(master=resolution_form, text='5120x2280', value='6', variable=lang, font=('Roboto','14')) + a6_btn = tk.Radiobutton(master=resolution_form, text='3840x2160', value='6', variable=lang, font=('Roboto','14')) a6_btn.pack(anchor=W) + a7_btn = tk.Radiobutton(master=resolution_form, text='5120x2280', value='7', variable=lang, font=('Roboto','14')) + a7_btn.pack(anchor=W) distance_form_1 = tk.Frame(master=distance_form) distance_form_1.pack(anchor=W)