.

Signed-off-by: Thxios <[email protected]>
Thxios · Mar 7, 2020 · 1cb6646 · 1cb6646
1 parent de0c69d
commit 1cb6646
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 19 deletions.
diff --git a/src/Brush.py b/src/Brush.py
@@ -46,7 +46,7 @@ def OnMouseDown(self, clickedPixel, layer: Layer) -> (int, int, int, int):
 
 
 class Brush:
-    _layer = None
+    _layer: Layer
 
     pencil = _PencilBrush()
     eraser = _EraserBrush()

diff --git a/src/Window.py b/src/Window.py
@@ -15,6 +15,10 @@ class MainWindow:
 
     originX, originY = 200, 800
 
+    Brush.SetBrush('Pencil')
+    # ----- for test -----
+    Brush.pencil.SetCurrentColor((255, 0, 127, 255))
+
     CanvasSection.Setup(originX, 0, w - originX, originY)
     CanvasSection.SetupCanvas(64, 64)
 
@@ -29,10 +33,6 @@ class MainWindow:
     mouseButtonCount = len(mouseButton)
     mouseX, mouseY = 0, 0
     mousePreviousX, mousePreviousY = 0, 0
-
-    Brush.SetBrush('Pencil')
-    # ----- for test -----
-    Brush.pencil.SetCurrentColor((255, 0, 127, 255))
     currentSection = None
 
     def Run(self):

diff --git a/src/numpy_test.py b/src/numpy_test.py
@@ -11,17 +11,44 @@ def End():
     print(time() - t)
 
 
-class Boo:
-    def DoSomething(self):
-        return
-
-
-class TestClass:
-    member: [Boo]
-
-    def __init__(self):
-        self.member = []
-
-
-a = TestClass()
-print(a.member)
+def draw(arr, x0, y0, x1, y1):
+    dx = x1 - x0
+    dy = y1 - y0
+    e = 0
+    if abs(dy) > abs(dx):
+        if y0 > y1:
+            x0, x1 = x1, x0
+            y0, y1 = y1, y0
+        x = x0
+        slope = abs(dx / dy)
+        print(slope)
+        for y in range(y0, y1 + 1):
+            arr[x, y] = 1
+            print(x, y, e)
+            e += slope
+            if e > 0.5:
+                x += 1
+                e -= 1
+    else:
+        if x0 > x1:
+            x0, x1 = x1, x0
+            y0, y1 = y1, y0
+        y = y0
+        slope = abs(dy / dx)
+        print(slope)
+        for x in range(x0, x1 + 1):
+            arr[x, y] = 1
+            print(x, y, e)
+            e += slope
+            if e > 0.5:
+                y += 1
+                e -= 1
+
+
+a = np.zeros((32, 32), dtype=np.int8)
+for i in a:
+    print(*i)
+print('------------------------------------')
+draw(a, 31, 0, 10, 31)
+for i in a:
+    print(*i)