From 9e505e512f5e7921aebbb8600db9a31049b8d2ee Mon Sep 17 00:00:00 2001
From: weckyy702 <weckyy702@gmail.com>
Date: Tue, 9 Feb 2021 15:07:12 +0100
Subject: [PATCH] fix for @oleting

---
 draw/Iinstruction.py             |  7 ++--
 interpreter/NassiShneidermann.py |  5 +--
 res/input/input.java             | 69 +++++++++++++++++---------------
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/draw/Iinstruction.py b/draw/Iinstruction.py
index ad9c575..fa7b94f 100644
--- a/draw/Iinstruction.py
+++ b/draw/Iinstruction.py
@@ -25,7 +25,7 @@ class Iinstruction(metaclass=ABCMeta):
         pass
 
     def _getblkheight(self) -> float:
-        return cti.get_text_size(self.instruction_text)[1]
+        return cti.get_text_size(self.instruction_text)[1] + 5#padding
 
     def _getblkwidth(self) -> float:
         return cti.get_text_size(self.instruction_text)[0]+50 #padding
@@ -92,7 +92,7 @@ class if_instruction(Iinstruction):
         return w
 
     def getblkheight(self) -> float:
-        return max(self.get_trueheight(), self.get_falseheight())
+        return self._getblkheight() + max(self.get_trueheight(), self.get_falseheight())
 
     def getblkwidth(self) -> float:
         return max(self._getblkwidth(), self.get_truewidth() + self.get_falsewidth())
@@ -101,7 +101,7 @@ class if_instruction(Iinstruction):
     def to_image(self, x:int, y:int, x_sz: int) -> Iterable[float]:
         true_w = self.get_truewidth()
         false_w = self.get_falsewidth()
-        true_x, true_y, _, _, false_x, false_y, _, _ = cti.draw_if_statement(
+        true_x, true_y, false_x, false_y = cti.draw_if_statement(
             self.instruction_text, x, y, true_w, false_w, self.getblkheight()
         )
         self.draw_true_case(true_x, true_y, true_w)
@@ -130,7 +130,6 @@ class if_instruction(Iinstruction):
             res += "}"
         return res
 
-#TODO
 # class switch_instruction(Iinstruction):
 #     """Switch structure"""
 
diff --git a/interpreter/NassiShneidermann.py b/interpreter/NassiShneidermann.py
index d0fb910..33cc220 100644
--- a/interpreter/NassiShneidermann.py
+++ b/interpreter/NassiShneidermann.py
@@ -1,5 +1,3 @@
-from os import stat
-from interpreter.interpret_source import Function_scope
 from typing import Dict, List, Optional
 from PySimpleGUI import one_line_progress_meter
 import logging
@@ -8,6 +6,7 @@ import os.path
 import secrets
 
 from interpreter.interpret_source import JavaInterpreter
+from interpreter.function_scope import Function_scope
 from draw.code_to_image_wrapper import NSD_writer
 import draw.code_to_image as cti
 
@@ -50,7 +49,7 @@ class NassiShneidermanDiagram:
                 return filepath
             else:
                 while os.path.exists(filepath+".png"):
-                    filepath = filepath + str(secrets.token_hex(1))
+                    filepath += str(secrets.token_hex(1))
                 return filepath
         return filepath
 
diff --git a/res/input/input.java b/res/input/input.java
index 1030306..2cff765 100644
--- a/res/input/input.java
+++ b/res/input/input.java
@@ -329,47 +329,52 @@
 //         final int value;
 //     };
 // }
-public void test_function() {
-    int rot = getRotation();
 
-    if (richtung=="vorne" && rot==0 || richtung=="rechts" && rot==270 || richtung=="links" && rot==90)
-    {
-        if(getOneObjectAtOffset(1,0,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(1,0,Huegel.class)).getSteigung() >30)
-        {
-            return true;
-        }
-    }
+class Testing {
 
-    if (richtung=="vorne" && rot==180 || richtung=="rechts" && rot==90 || richtung=="links" && rot==270)
-    {
-        if(getOneObjectAtOffset(-1,0,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(-1,0,Huegel.class)).getSteigung() >30)
-        {
-            return true;
-        }
-    }
+    public void test_function() {
+        int rot = getRotation();
 
-    if (richtung=="vorne" && rot==90 || richtung=="rechts" && rot==0 || richtung=="links" && rot==180)
-    {
-        if(getOneObjectAtOffset(0,1,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(0,1,Huegel.class)).getSteigung() >30)
+        if (richtung=="vorne" && rot==0 || richtung=="rechts" && rot==270 || richtung=="links" && rot==90)
         {
-            return true;
+            if(getOneObjectAtOffset(1,0,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(1,0,Huegel.class)).getSteigung() >30)
+            {
+                return true;
+            }
         }
 
-    }
-
-    if (richtung=="vorne" && rot==270 || richtung=="rechts" && rot==180 || richtung=="links" && rot==0)
-    {
-        if(getOneObjectAtOffset(0,-1,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(0,-1,Huegel.class)).getSteigung() >30)
+        if (richtung=="vorne" && rot==180 || richtung=="rechts" && rot==90 || richtung=="links" && rot==270)
         {
-            return true;
+            if(getOneObjectAtOffset(-1,0,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(-1,0,Huegel.class)).getSteigung() >30)
+            {
+                return true;
+            }
         }
 
+        // if (richtung=="vorne" && rot==90 || richtung=="rechts" && rot==0 || richtung=="links" && rot==180)
+        // {
+        //     if(getOneObjectAtOffset(0,1,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(0,1,Huegel.class)).getSteigung() >30)
+        //     {
+        //         return true;
+        //     }
+
+        // }
+
+        // if (richtung=="vorne" && rot==270 || richtung=="rechts" && rot==180 || richtung=="links" && rot==0)
+        // {
+        //     if(getOneObjectAtOffset(0,-1,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(0,-1,Huegel.class)).getSteigung() >30)
+        //     {
+        //         return true;
+        //     }
+
+        // }
+
+        // if(richtung!="vorne" && richtung!="links" && richtung!="rechts")
+        // {
+        //     nachricht("Befehl nicht korrekt!");
+        // }
+
+        // return false;
     }
 
-    if(richtung!="vorne" && richtung!="links" && richtung!="rechts")
-    {
-        nachricht("Befehl nicht korrekt!");
-    }
-
-    return false;
 }
\ No newline at end of file