__str__ methods redefined

Author: denismaggior8

diagrams/rotors.drawio

@@ -16,4 +16,7 @@ def __init__(self, wiring, alphabet=Alphabets.lookup.get("latin_i18n_26chars_low
  self.alphabet_list = list(alphabet)
 
  def __str__(self):
- return self.wiring
+ str = Scrambler.__str__(self)
+ str += "\n"
+ str += self.wiring
+ return str

src/enigma/enigmapython/Etw.py

@@ -17,4 +17,7 @@ def __init__(self, wiring, alphabet):
 
 
  def __str__(self):
- return self.wiring
+ str = Scrambler.__str__(self)
+ str += "\n"
+ str += self.wiring
+ return str

src/enigma/enigmapython/Plugboard.py

@@ -1,4 +1,10 @@
 from .Scrambler import Scrambler
 
 class Reflector(Scrambler):
- tag = None
+ tag = None
+
+ def __str__(self):
+ str = Scrambler.__str__(self)
+ str += "\n"
+ str += self.wiring
+ return str

src/enigma/enigmapython/Reflector.py

@@ -40,11 +40,11 @@ def __init__(self, wiring, notch_indexes, alphabet, position = 0, ring = 0):
 
 
  def __str__(self):
- pointer = ' ' * self.position + '^'
  str = Scrambler.__str__(self)
  str += "\n"
- str += pointer 
- str += "\n"
+ # Slice the wiring, in order to left-rotate it according to the position
+ n = self.position % len(self.wiring)
+ str += self.wiring[n:] + self.wiring[:n]
  return str
 
 

src/enigma/enigmapython/Rotor.py

@@ -65,6 +65,4 @@ def __str__(self):
  str += char
  str += "\n"
  str += "|" * len(self.alphabet_list)
- str += "\n"
- str += self.wiring
  return str

src/enigma/enigmapython/Scrambler.py

@@ -15,15 +15,17 @@
 
 
 plugboard = PlugboardPassthrough()
-rotor1 = EnigmaM4RotorI(1)
+rotor1 = EnigmaM4RotorI(position=1, ring=0)
 rotor2 = EnigmaM4RotorII(15)
-rotor3 = EnigmaM4RotorIII(26)
+rotor3 = EnigmaM4RotorIII(1)
+print(rotor1)
 rotor4 = EnigmaM4RotorBeta(4)
 reflector = ReflectorUKWBThin()
 etw = EtwPassthrough()
 enigma = EnigmaM4(plugboard, rotor1, rotor2, rotor3, rotor4, reflector, etw, True)
 enigma.input_char("c")
 XRay.render_enigma_xray(enigma)
+print(rotor1)
 
 
 rotor1 = EnigmaZRotorI(1)
@@ -34,4 +36,4 @@
 enigma = EnigmaZ(rotor3, rotor2, rotor1, reflector, etw, True)
 enigma.input_char("8")
 XRay.render_enigma_xray(enigma)
-#print("1".upper())
+print(rotor3)