diff --git a/s360/cell.py b/s360/cell.py index c34460b3..387feeff 100644 --- a/s360/cell.py +++ b/s360/cell.py @@ -64,11 +64,11 @@ class Cell(): stroke(0, 0, 200, 50) rect(0, 0, siz, siz) #text(self.type, 0, 0) - if self.type == "11110": # inv t + if self.type == "11110": # inv t rotate(PI) - if self.type == "11101": # t r + if self.type == "11101" or self.type == "01110": # t r & i rotate(HALF_PI) - if self.type == "10111": # t r + if self.type == "10111": # t l rotate(PI + HALF_PI) for i in range(-4, 5, 4): # (-28, 29, 7): @@ -100,16 +100,16 @@ class Cell(): quarter_circle(-l, l, c + i, TOP + RIGHT) #quarter_circle(l, -l, c + i, BOTTOM + LEFT) ellipse(0, 0, (a + i) * 2, (a + i) * 2) - elif self.type == "10101": - line(a + i, -l, a + i, l) + elif self.type == "10101" or self.type == "01110": + line(+a - i, -l, +a - i, l) line(-a + i, -l, -a + i, l) #half_circle(0, l, a - i, TOP) #half_circle(0, -l, a - i, BOTTOM) - elif self.type == "01110": - line(-l, a + i, l, a + i) - line(-l, -a + i, l, -a + i) - #half_circle(-l, 0, a - i, RIGHT) - #half_circle(l, 0, a - i, LEFT) + # elif self.type == "01110": + # line(-l, a + i, l, a + i) + # line(-l, -a + i, l, -a + i) + # half_circle(-l, 0, a - i, RIGHT) + # half_circle(l, 0, a - i, LEFT) elif self.type == "11100": half_circle(-l, 0, a - i, RIGHT) half_circle(0, -l, a - i, BOTTOM) @@ -131,7 +131,7 @@ class Cell(): elif self.type == "10100": half_circle(0, -l, a - i, BOTTOM) elif self.type == "00100": - ellipse(0, 0, (a - i) * 2, (a -d i) * 2) + ellipse(0, 0, (a - i) * 2, (a - i) * 2) # ellipse(0, 0, (a + i) * 2.0, (a + i) * 2.0) # ellipse(0, 0, (a - i) * 2.5, (a - i) * 2.5) diff --git a/s360/s360.gif b/s360/s360.gif new file mode 100644 index 00000000..68941b5e Binary files /dev/null and b/s360/s360.gif differ diff --git a/s360/s360_530.png b/s360/s360_530.png new file mode 100644 index 00000000..9b178f81 Binary files /dev/null and b/s360/s360_530.png differ diff --git a/s360/s360_568.png b/s360/s360_568.png new file mode 100644 index 00000000..0b14b909 Binary files /dev/null and b/s360/s360_568.png differ diff --git a/s360/s360_643.png b/s360/s360_643.png new file mode 100644 index 00000000..531d1cd5 Binary files /dev/null and b/s360/s360_643.png differ diff --git a/s360/s360_706.png b/s360/s360_706.png new file mode 100644 index 00000000..e1f7248d Binary files /dev/null and b/s360/s360_706.png differ diff --git a/s360/s360_729.png b/s360/s360_729.png new file mode 100644 index 00000000..05ef49f7 Binary files /dev/null and b/s360/s360_729.png differ diff --git a/s360/s360_758.png b/s360/s360_758.png new file mode 100644 index 00000000..0961b53b Binary files /dev/null and b/s360/s360_758.png differ diff --git a/s360/s360_785.png b/s360/s360_785.png new file mode 100644 index 00000000..c042b84f Binary files /dev/null and b/s360/s360_785.png differ diff --git a/s360/s360_804.png b/s360/s360_804.png new file mode 100644 index 00000000..a439fd80 Binary files /dev/null and b/s360/s360_804.png differ diff --git a/s360/s360_821.png b/s360/s360_821.png new file mode 100644 index 00000000..936e7c03 Binary files /dev/null and b/s360/s360_821.png differ diff --git a/s360/s360_910.png b/s360/s360_910.png new file mode 100644 index 00000000..936e7c03 Binary files /dev/null and b/s360/s360_910.png differ