From dc1ba63fefe4ffc0b5a39c22afa359f252ad3bb7 Mon Sep 17 00:00:00 2001
From: danii <daniil.savitski@stud.hs-kempten.de>
Date: Mon, 29 Apr 2024 19:33:00 +0200
Subject: [PATCH] Lesson commit

---
 HNC/Exercises/Ship_Battle/ShipDirection.py    |  11 ++++++++++-
 HNC/Exercises/Ship_Battle/ShipField.py        |  13 +++++++++++--
 .../__pycache__/ShipDirection.cpython-311.pyc | Bin 535 -> 999 bytes
 .../__pycache__/ShipField.cpython-311.pyc     | Bin 13269 -> 13698 bytes
 HNC/Exercises/Ship_Battle/main.py             |  12 +++++-------
 HNC/Exercises/Ship_Battle/test.json           |   1 -
 test.json                                     |   1 +
 7 files changed, 27 insertions(+), 11 deletions(-)
 delete mode 100644 HNC/Exercises/Ship_Battle/test.json
 create mode 100644 test.json

diff --git a/HNC/Exercises/Ship_Battle/ShipDirection.py b/HNC/Exercises/Ship_Battle/ShipDirection.py
index 72f4354..163f2f1 100644
--- a/HNC/Exercises/Ship_Battle/ShipDirection.py
+++ b/HNC/Exercises/Ship_Battle/ShipDirection.py
@@ -3,4 +3,13 @@ from enum import Enum
 class ShipDirection(Enum):
     VERTICAL = "VERTICAL"
     HORIZONTAL = "HORIZONTAL"
-    UNKNOWN = "UNKNOWN"
\ No newline at end of file
+    UNKNOWN = "UNKNOWN"
+
+
+    @staticmethod
+    def from_string(raw_value):
+        if raw_value:
+            value = raw_value.lower().capitalize()
+            if value in ShipDirection.__members__:
+                return ShipDirection[value]
+        return ShipDirection.UNKNOWN
\ No newline at end of file
diff --git a/HNC/Exercises/Ship_Battle/ShipField.py b/HNC/Exercises/Ship_Battle/ShipField.py
index 50a9e9a..3045881 100644
--- a/HNC/Exercises/Ship_Battle/ShipField.py
+++ b/HNC/Exercises/Ship_Battle/ShipField.py
@@ -25,6 +25,15 @@ class ShipField:
         self.ship_direction = ShipDirection.VERTICAL
 
     
+    def from_json(self, obj):
+        self.field = obj['field']
+        self.ships = obj['ships']
+        self.field_size = obj['field_size']
+        self.field_mode = obj['field_mode']
+        self.ship_size = obj['ship_size']
+        self.ship_direction = obj['ship_direction']
+    
+    
     def __getitem__(self, item):
         if item is None:
             return None
@@ -244,8 +253,8 @@ class ShipField:
                 ship_string += self.field[r * self.field_size + c] + ', '
             print(blocked_string[:-2] + '          ' + ship_string[:-2])
         print("********************************************************************")  
-
-
+    
+    
     @staticmethod
     def convert_to_json(obj):
         if isinstance(obj, ShipField):
diff --git a/HNC/Exercises/Ship_Battle/__pycache__/ShipDirection.cpython-311.pyc b/HNC/Exercises/Ship_Battle/__pycache__/ShipDirection.cpython-311.pyc
index d82802b35b45f8a9de82d66a7ef0997b9ce925e7..1dbdd7708495c7cf0923ca70a393dd936a418b04 100644
GIT binary patch
literal 999
zcmZuv&r2IY6n>N4jWL==%eE?1@SulaYpusp1gk-<Wdr_bVF?V|ov~Tj-PqZUwvs{)
z7J8Ikaw>ST6#tpn1{wy0LQlO#(o;{JNz!eCeY^Y3d+&Sm-o7{UDV0iskau72@17ul
zAJX_MT32b!38e}I2y($gCPEN{RUolrAPPli3c$JeI%39%x&;~Sr!+H&t69I~*<G@|
z#JWanUMN+dU?Kuy8!{CVGgYFP8jTb67|sNL-VFvY2Z$yT$9Zb2;OwtBjM|}7^m*c0
zc5{1udFd%nuH`n@&783<^no2?!^k~1Y|&ICva<Zq)~SFhlz}akLF(6~zxHWwmMFMC
z<}E6tP>o2~i$-z)EY-`D(L@xs1-;B(v|n_JjEu%Lw|GbyPukYL6I!lwM43DmK7_GH
zy%&@P7_)@%WMX`fS%>(*a!ZtJ?In;6Pfh(^ClB*WEG#j+<A;<n$1a5Vf^Xj=mhU)j
ze$80UXJ1ohI{^*ya=iGl6^1Tt>(Qv^_TTWKT~_pP5HiPqc{I^?5_3J&peP)y3aG&M
zA-xI8;N6BkS<QXOUFb7)ede1!|3#m_&=>0Z!uxC^t$$3_#~;+v^1U3JKHaI0&DKU{
zFVlDG>FHWxx+PM9kxB3b#=hlIjCoQ_ph!xt)Q2&CRkGX;!{Q>A4M>oK;ln{_g^umf
zuuvpyM7TZ!8<ligf*fZX<aq^)0xHqdNKaJO8l#hyCyg6pmDOe(;y0TyO`B<gfGb6q
z$N7Jbwzrd7W;HSjSE;!EOs4J>x-GS+`0vD{P7jN0ToCe>1sejI3PPv>w`%=wQyoU4
R^mRB{xsu*r|DoE&{s4^0;V=LI

delta 231
zcmaFPKAnYcIWI340}$LhqMz2rFp)2fixI>Hg3nSD>m=DySb`ZeStoARWA@Wzo4kR^
zn0+O~XOQ&dr;OeiMXW#;m|zAnie-UB103Gqmu&F3At>A6b%Rg5!5svPcwy@OG?{O)
zq~?|87J+m^%;5pCz$*BFtX~{9x%nxjIjMF<0+YL$Rn3_hB|b1<5))iLf<(VykpdeA
E0IZTS#Q*>R

diff --git a/HNC/Exercises/Ship_Battle/__pycache__/ShipField.cpython-311.pyc b/HNC/Exercises/Ship_Battle/__pycache__/ShipField.cpython-311.pyc
index c3e554da5f91b5b4cd1fcb2a6fcb832c9fe2d8f8..857639c1d4ef50ef384fdc292c4294800a2dfa3e 100644
GIT binary patch
delta 1605
zcmah}Z)jUp6o2RCPuFRhw0&utb`5E^(!69%n|7UXe{`XeiIYz4p!<hm&3kRrCVl0;
zR3r>Kq(~K!l`GgU`{D-$9nATVIoX$e-56Hvw(>*}1V6}N{{&G`Jm;oOQm1%HemVDd
z&OPVcbI#4}$+u=2KJj?AOSl%l>ziP^mK(l+cbBgh!dl~^bh24jw5CPrV^n`eHe#Lh
zYt5sQs#q^Ur*lC@&Vk>@A0d1wodpd7!i?aol&Q*~$y+qAslqdkEgJGE7HXVZG!$u5
z<04Jl##YKW%Mu0!%^i^VW$-UZm}lJx^P-CR2pS2R2^4}B1l9dNdYMrW+hL4Po0M57
z#3-^|Kf#PbX4*7nOU<KGxw&*s&uj4txkHkUOXe$Rc}`mQx2?2(aC*u4-u7Cty>lhM
z)*eIJyIv~?cC4IQ3#iC9tOvVR!vkx<!6oO~wvJWtVI9_(>wSQ3>u0wu!+>?Ye!}68
zV5IWZs1mG+AjS`PQcv}hm>?M9OP)SBWPRoNQV#4941z7Oz4)U#*)v4#<Zt^T5aE}6
z9WZ9y^eK*`f)`axk_DC0b~C+TyrE<Hs64C^#CGLoHT_LCMC?8U(~S@kOB9an=5eJJ
zGFDodbHPD=B@pq604kmE6D0Zl!2Xen%WAV~yw+8`mixh?NR*nYotV^%858?5kGz?Z
z`O8Yu`n-MBQGXB#8~Ry_zY|OiR-+7)Ar+5uEvFjCUCCSZX-*kN@l)&1;Hxm4LY?X;
z5099u5hPe2f=Odq@j=%rDODfYDLp$QGP`OmhaN$kE^m9v^myLL&gdEwb$*t7xyrsa
zGm7!c;ZC?_eG@(^FVIaG^)Y>HvwI>F(JD&kiSASjXgjldKL12>M)6ds^`F^pq;(6G
z<{gA{(hrR-=dBCfKY=fVd)r|a84IJty7>8?oxvATtaW2<G$Ui?O8On^+nz?~?Liw%
zJ4C1GmMl#`Z;~BHsC{hgF!!om@S~Mb6@VU|j_!gapNSrUU-*^iz19s^;$>IIzn6a<
z8-|D0U$L8jgLb3$OhgQtsL>e3q1%cM+O9d4n=PuY@-z?e(Rdf^<MZ*o@SAlpeiwWv
z$W;7c$gC4(&ifC^GVt5|<IuvBiD)KB7Tp8`1p5iZtK3ZzjVGgdVq(r?B#H1;Dt4IQ
zG{Nfx8iM__Sv*tBWea+7%Fx&}zm^EX5dS_A^txSp9!M2vvVKpr!Qdnvq{(BV0-~aI
sv^5Ai2<U(7k8KAEhBlwqpJQ|Ug~8XJPdTCef%NbAQ1HM0hgLZK8_WArCjbBd

delta 1094
zcmZ{iNla5g7{~i{0kqN`WNAw&rSz4SV#_8Pgs_B2)GA0~J&@A(prsp`R)ZWg8V+8`
z96WnL6Av0Do(+kKM&rQ)A$b?#%>yxDyy(gKrYt7v9DZ-!xBX|n`5tAr7fsJ<Yfo$V
zT6-5+m~2}&ZNl36R^F-DW$T(|gF9ZJSFD6XwoPj!JBx!$zgc}Bz{wues9KO%!nmM=
zcDiM<Lx66ZMvP&eLAnr8+G>tKKf7*zt!+FfEF7wa#P~<jlO8mAXp1f2YUkV4`ss9L
zc_O3a<gQdsNs_sIl4KQfmB}`TZc#*=F{Kw_;ZUoHk}uv>q$<*Ywqt44kSWN@3W=h%
zpQBX8;Sq~8qEX^lwVeo-l=57O%g?gix@7|l(s*;gA|(A7UWe$VkDD({9*YnM8tV}!
zI@SEQqT{Iub#TL<LW_q&Ic9X4^rr^7TZL{iM7^F7_et$xZZGLMuvn#1Cw=H~R6j+>
zdkwWZ?d+vz0Hh&qkaR?J#>)3(3K7CE9mjFHpIW?)@QMY!-=Pa{rq-s?N-8@ypDU)a
zid<=HALbb<c}KzldfDd!#?roP+Vgl|f{!^dbM%BlRp_JiUypIv9lGytf;csHIN>b|
zbR2-i#iLbSsZ2-<7IjleYJ+ilMRLL?wj^00?8AC`f`J4NMMe>#<v01Rq~$m|<rsY)
zY=s^6A?N_`(cMlT^iq9j3ck>IXz%P{DLWRxz7iWENT<W2@RdCYe+2&MsYo&)9$j2%
z1|#AKyqs!SCYeH6GE`<QO7|kI&`(X>eejKqckh5@7DMrHl2+9f=a*<GI;{Pvp@rx?
z)X~q;V8V+L5ySujr(R4V!6_k~2r+H}+zI7z+>Ie_A#Nj*9O{`;Ia$u6@=7^flu4Q<
zVs7x$doefLh&2Gn^i5AgQy#;c5jga}YA)uB@|~PAL<;nv=f<TK9W?E0{>=kn|M4HM
GDEb?-_v`-v

diff --git a/HNC/Exercises/Ship_Battle/main.py b/HNC/Exercises/Ship_Battle/main.py
index cbe06d1..a5c85ac 100644
--- a/HNC/Exercises/Ship_Battle/main.py
+++ b/HNC/Exercises/Ship_Battle/main.py
@@ -84,14 +84,12 @@ def savebutton_click(event):
 
 
 def loadbutton_click(event):
-    data_list = []
-    with open('test.json') as lines:
-        data = json.load(lines)
-    for i in data['shapes']:
-        sh1 = create_shape(i)
-        data_list.append(sh1)
+    global my_field
 
-    return data_list
+    with open('test.json') as lines:
+        my_field.from_json(json.load(lines)["my_field"])
+
+    colorize(my_field, my_buttons)
 
 
 window = Tk()
diff --git a/HNC/Exercises/Ship_Battle/test.json b/HNC/Exercises/Ship_Battle/test.json
deleted file mode 100644
index 3041a88..0000000
--- a/HNC/Exercises/Ship_Battle/test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shapes": {"field": ["1", "1", "1", "1", " ", " ", " ", " ", "", "1", "", "", " ", " ", " ", "1", " ", "", "", "1", "", "", "", "", "", "", "", "1", "", "", "1", "", "", "", "", "1", "", "", "", "", "1", "", "", "1", "", "", "", "1", " ", " ", "1", "", "", "1", " ", " ", " ", "", "", "", " ", "", "", "", " ", " ", "", "", "", "", " ", "1", "", " ", " ", " ", " ", " ", "", "", " ", "1", "", " ", " ", " ", " ", " ", " ", " ", " ", "1", "", " ", " ", " ", "r", "", "1", "1"], "ships": [], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file
diff --git a/test.json b/test.json
new file mode 100644
index 0000000..085d319
--- /dev/null
+++ b/test.json
@@ -0,0 +1 @@
+{"my_field": {"field": ["1", "", "", " ", " ", "1", "1", "1", " ", "1", " ", " ", " ", "", " ", " ", "", "", " ", "1", " ", "1", "", "", "", " ", "", "1", "", "", " ", "1", "", "", "", "", "", "", "", "", " ", "1", "", "", "", "1", "", "", "", "", " ", "1", "", "", "", "1", "", "", "", "", "", "", "", "", "", "", "", "", "1", "", "", "", "", "", "", "", "", "", "", "", "1", "", "1", "", "r", " ", " ", " ", " ", " ", "1", " ", "", " ", " ", " ", " ", "1", "1", "1"], "ships": [], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file