diff --git a/NassiShneidermann.py b/NassiShneidermann.py index c2b1a7d..c24a085 100644 --- a/NassiShneidermann.py +++ b/NassiShneidermann.py @@ -1,7 +1,9 @@ -from Iinstruction import Iinstruction -import interpret_source as itp -import logging from typing import List +from Iinstruction import Iinstruction +import logging +import interpret_source as itp +import code_to_image as cti + class NassiShneidermanDiagram: @@ -26,7 +28,7 @@ class NassiShneidermanDiagram: cti.NSD_init(x_size, 5000) x, y, x_sz = 0, 0, x_size for _k, instruction in self.instructions.items(): - x, y = instruction.to_image(x, y, x_sz, 750) + x, y = instruction.to_image(x, y, x_sz, 800) cti.NSD_save(filename) def load_from_file(self, filepath:str): @@ -41,9 +43,6 @@ class NassiShneidermanDiagram: if __name__ == "__main__": - #for debugging - from Iinstruction import * - NSD = NassiShneidermanDiagram(True) NSD.load_from_file("res/input/input.java") diff --git a/__pycache__/code_to_image.cpython-39.pyc b/__pycache__/code_to_image.cpython-39.pyc index a01154a..41d516a 100644 Binary files a/__pycache__/code_to_image.cpython-39.pyc and b/__pycache__/code_to_image.cpython-39.pyc differ diff --git a/res/input/input.java b/res/input/input.java index c74e76e..9879351 100644 --- a/res/input/input.java +++ b/res/input/input.java @@ -10,27 +10,10 @@ while(shouldNiet()) { niet10(); niet11(); } - if(if13) { - niet14(); - niet15(); - if(if16) { - niet17(); - niet18(); - } else { - niet20(); - niet21(); - if(if22) { - niet23() - } - } - } else { - niet27(); - niet28(); - } - niet30(); + niet13(); } -niet32(); -niet33(); +niet15(); +niet16(); // drehe("links"); // while(huegelVorhanden("rechts")) diff --git a/res/output/Nina.png b/res/output/Nina.png index d089719..01f6fe4 100644 Binary files a/res/output/Nina.png and b/res/output/Nina.png differ