Trying to clean up github

Author: cindygr

.gitignore

@@ -0,0 +1,9 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+
+# Made files
+.vscode
+
+# data
+/Image_based/data/forcindy/CalculatedData/
+/Image_based/data/forcindy/DebugImages/

list_read_write.py

@@ -73,7 +73,7 @@ def get_class_member(self, l_str):
                 ret_list = {}
             elif type_check == "ndarray":
                 dim_two = int(check_type[2])
-                if dim_two is 0:
+                if dim_two == 0:
                     ret_list = array([0 for _ in range(0, n_read)])
                 else:
                     ret_list = zeros([n_read, dim_two])

sketch_curves_gui/Draw_spline_3D.py

@@ -1,16 +1,22 @@
+import os
 import sys
+sys.path.insert(0, os.path.abspath('./'))
+sys.path.insert(0, os.path.abspath('../'))
+sys.path.insert(0, os.path.abspath('../Image_based'))
 
 from PyQt5.QtCore import pyqtSignal, QPoint, QSize, Qt
 from PyQt5.QtWidgets import (QApplication, QHBoxLayout, QOpenGLWidget, QSlider,
                              QWidget)
-
+from PyQt5.QtGui import QPainter, QBrush, QPen, QFont, QColor
 import OpenGL.GL as GL
 import cv2
 from ctypes import c_uint8
 
 from bezier_cyl_3d_with_detail import BezierCyl3DWithDetail
 import numpy as np
 
+from SketchesForCurves import SketchesForCurves
+
 
 class DrawSpline3D(QOpenGLWidget):
     upDownRotationChanged = pyqtSignal(int)
@@ -36,6 +42,7 @@ def __init__(self, gui, parent=None):
         self.gui = gui
         self.crvs = []
 
+        self.firstPos = QPoint()
         self.lastPos = QPoint()
 
         self.show = True
@@ -44,6 +51,8 @@ def __init__(self, gui, parent=None):
         self.aspect_ratio = 1.0
         self.im_size = (0, 0)
 
+        self.sketch_curve = SketchesForCurves()
+
     @staticmethod
     def get_opengl_info():
         info = """
@@ -379,6 +388,35 @@ def draw_crv_2d(self):
         GL.glMatrixMode(GL.GL_PROJECTION)
         GL.glPopMatrix()
 
+    def draw_sketch(self):
+        """ The marks the user made"""
+        if not self.gui or not self.gui.crv:
+            return
+        qp = QPainter()
+        qp.begin(self)
+        pen_backbone = QPen(Qt.yellow, 3, Qt.SolidLine)
+        pen_cross = QPen(Qt.blue, 4, Qt.SolidLine)
+        brush = QBrush(Qt.CrossPattern)
+        qp.setPen(pen_backbone)
+        qp.setBrush(brush)
+        for pt in self.sketch_curve.backbone_pts:
+            qp.drawLine(int(pt[0] - 5), int(pt[1]), int(pt[0] + 5), int(pt[1]))
+            qp.drawLine(int(pt[0]), int(pt[1] - 5), int(pt[0]), int(pt[1] + 5))
+
+        for pt1, pt2 in zip(self.sketch_curve.backbone_pts[0:-1], self.sketch_curve.backbone_pts[1:]):
+            qp.drawLine(int(pt1[0]), int(pt1[1]), int(pt2[0]), int(pt2[1]))
+
+        qp.setPen(pen_cross)
+        for pts in self.sketch_curve.cross_bars:
+            for pt in pts:
+                qp.drawLine(int(pt[0] - 3), int(pt[1]), int(pt[0] + 3), int(pt[1]))
+                qp.drawLine(int(pt[0]), int(pt[1] - 3), int(pt[0]), int(pt[1] + 3))
+            if len(pts) > 1:
+                pt1 = pts[0]
+                pt2 = pts[1]
+                qp.drawLine(int(pt1[0]), int(pt1[1]), int(pt2[0]), int(pt2[1]))
+        qp.end()
+
     def paintGL(self):
         GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT)
 
@@ -402,6 +440,8 @@ def paintGL(self):
         if self.show and self.crv_gl_list is not None:
             GL.glCallList(self.crv_gl_list)
 
+        self.draw_sketch()
+
     @staticmethod
     def resizeGL(width, height):
         side = min(width, height)
@@ -418,6 +458,7 @@ def resizeGL(width, height):
         DrawSpline3D.gl_inited= True
 
     def mousePressEvent(self, event):
+        self.firstPos = event.pos()
         self.lastPos = event.pos()
 
     def mouseMoveEvent(self, event):
@@ -430,6 +471,26 @@ def mouseMoveEvent(self, event):
 
         self.lastPos = event.pos()
 
+    def mouseReleaseEvent(self, event):
+        """Either add a point to the backbone or a point to the crossbar
+         Shift: Add a cross bar
+         Cntr: Remove a point"""
+        dx = event.x() - self.firstPos.x()
+        dy = event.y() - self.firstPos.y()
+        # Not a click
+        if abs(dx) + abs(dy) > 5:
+            print(f"Big {dx} {dy}")
+            return
+        
+        if event.modifiers() == Qt.ShiftModifier:
+            self.sketch_curve.add_crossbar_point(event.x(), event.y())
+        elif event.modifiers() == Qt.ControlModifier:
+            self.sketch_curve.remove_point(event.x(), event.y())
+        else:
+            self.sketch_curve.add_backbone_point(event.x(), event.y())
+
+        self.update()
+
     def make_crv_gl_list(self):
         if not DrawSpline3D.gl_inited:
             return

sketch_curves_gui/Sketch_curves_main_window.py

@@ -8,6 +8,9 @@
 
 import os
 import sys
+sys.path.insert(0, os.path.abspath('./'))
+sys.path.insert(0, os.path.abspath('./Image_based'))
+sys.path.insert(0, os.path.abspath('./sketch_curves_gui'))
 sys.path.insert(0, os.path.abspath('../'))
 sys.path.insert(0, os.path.abspath('../Image_based'))
 from os.path import exists
@@ -51,7 +54,6 @@ def __init__(self):
         self.in_reset_file_menus = False
         self.in_read_images = False
 
-
     # Set up the left set of sliders/buttons (read/write, camera)
     def _init_left_layout_(self):
         # For reading and writing
@@ -418,14 +420,12 @@ def read_images(self):
                 self.redraw_self()
         self.in_read_images = False
 
-
     def redraw_self(self):
         self.glWidget.update()
         self.repaint()
 
 
 if __name__ == '__main__':
-
     app = QApplication([])
 
     gui = SketchCurvesMainWindow()

sketch_curves_gui/SketchesForCurves.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+
+import math as math
+
+
+# Keep all of the sketching data until it is time to actually make a spline curve
+#  There's the curve backbone (2 o4 more points)
+#  Plus 1 (or more) perpendicular cross bars to indicate width
+#
+# Regular clicking makes more backbone points (needs to bee in order)
+# Shift click does a left-right pair across the backbone
+# Cntrl clicking over a point erases it
+#  Keep all points in width/height - convert at the end
+
+class SketchesForCurves:
+    def __init__(self):
+        """ Nothing in it to start"""
+        self.backbone_pts = []
+        self.cross_bars = []
+
+    def add_backbone_point(self, x, y):
+        """ Add the x,y point to the backbone
+        @param x
+        @param y
+        """
+        self.backbone_pts.append([x, y])
+
+    def add_crossbar_point(self, x, y):
+        """ Add the x,y point to the crossbar
+        @param x
+        @param y
+        """
+        if self.cross_bars == []:
+            self.cross_bars.append([[x, y]])
+        elif len(self.cross_bars[-1]) == 1:
+            self.cross_bars[-1].append([x, y])
+        else:
+            self.cross_bars.append([[x, y]])
+
+    def remove_point(self, x, y, eps=5):
+        """ Remove either a backbone point or a cross bar point
+        @param x
+        @param y
+        """
+        d_closest = 1e30
+        i_closest = -1
+        for i, pt in enumerate(self.backbone_pts):
+            d_dist = math.fabs(pt[0] - x) + math.fabs(pt[1] - y)
+            if d_dist < d_closest:
+                d_closest = d_dist
+                i_closest = i
+
+        d_closest_cross = 1e30
+        i_closest_cross = -1
+        for i, pts in enumerate(self.cross_bars):
+            for pt in pts:
+                d_dist = math.fabs(pt[0] - x) + math.fabs(pt[1] - y)
+                if d_dist < d_closest_cross:
+                    d_closest_cross = d_dist
+                    i_closest_cross = i
+
+        if i_closest == -1 and i_closest_cross == -1:
+            return
+
+        if d_closest > eps and d_closest_cross > eps:
+            return
+
+        if d_closest < d_closest_cross:
+            self.backbone_pts.pop(i_closest)
+        else:
+            self.cross_bars.pop(i_closest_cross)
+
+
+if __name__ == '__main__':
+    sk = SketchesForCurves()
+    sk.add_backbone_point(10, 10)
+    sk.add_backbone_point(100, 20)
+    sk.add_backbone_point(200, 30)
+    sk.add_crossbar_point(-5, 10)
+    sk.add_crossbar_point(25, 10)
+    sk.add_crossbar_point(85, 30)
+    sk.add_crossbar_point(120, 10)
+    sk.remove_point(10, 10, 2)
+    sk.remove_point(120, 10, 2)
+
+    print(sk.backbone_pts)
+    print(sk.cross_bars)
+
+