pkg resources & transformation tools

Author: unknown

MANIFEST.in

@@ -4,4 +4,6 @@ include d3dslic3r/meta/dippy.png
 include d3dslic3r/meta/Logo.png
 include d3dslic3r/meta/noslice.png
 include d3dslic3r/meta/sys_icon.png
+include d3dslic3r/meta/translate_icon.png
+include d3dslic3r/meta/rotate_icon.png
 include README.MD

README.md

@@ -2,7 +2,7 @@
 
 <span>![<span>Logo</span>](assets/Logo.png)</span> 
 
-DED SLICER (ded ˈslaɪ.sər) or dee three dee slick three arrr is a utility for discombobulating geometry into paths for direct energy deposition that might work. Garantees are as firm as the current documentation. Start it up, click the buttons, read the tool tips and see what it does.
+DED SLICER (ded ˈslaɪ.sər) or dee three dee slick three arrr is a utility for discombobulating geometry into paths for direct energy deposition. Guarantees of it working are as firm as the extent of the current documentation. Start it up, click the buttons, read the tool tips and see what it does.
 
 # Installation
 Install it from source using the tarball in the dist folder:

d3dslic3r.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: d3dslic3r
-Version: 0.1
+Version: 0.2
 Summary: DED SLICER
 Home-page: https://github.com/majroy/d3dslic3r
 Author: M J Roy
@@ -16,5 +16,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Natural Language :: English
 License-File: LICENSE
+Requires-Dist: vtk>=6.0
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: pyyaml>=5.0
+Requires-Dist: matplotlib
+Requires-Dist: PyQt5>=5
+Requires-Dist: h5py
+Requires-Dist: scikit-learn
+Requires-Dist: shapely
+Requires-Dist: pyclipper
 
 https://github.com/majroy/d3dslic3r

d3dslic3r.egg-info/SOURCES.txt

@@ -5,9 +5,11 @@ README.md
 setup.py
 d3dslic3r/__init__.py
 d3dslic3r/d3dslic3r_common.py
+d3dslic3r/d3dslic3r_gui_common.py
 d3dslic3r/export_widget.py
 d3dslic3r/main.py
 d3dslic3r/slic3_widget.py
+d3dslic3r/transform_widget.py
 d3dslic3r.egg-info/PKG-INFO
 d3dslic3r.egg-info/SOURCES.txt
 d3dslic3r.egg-info/dependency_links.txt
@@ -20,4 +22,6 @@ d3dslic3r/meta/clippy.png
 d3dslic3r/meta/dippy.png
 d3dslic3r/meta/nogeometry.png
 d3dslic3r/meta/noslice.png
-d3dslic3r/meta/sys_icon.png
+d3dslic3r/meta/rotate_icon.png
+d3dslic3r/meta/sys_icon.png
+d3dslic3r/meta/translate_icon.png

d3dslic3r/d3dslic3r_common.py

@@ -1,52 +1,16 @@
-import os
-import vtk
 import numpy as np
+import vtk
 from scipy.spatial.distance import cdist
 from scipy.spatial import Delaunay
 from vtk.util.numpy_support import vtk_to_numpy as v2n
 from vtk.util.numpy_support import numpy_to_vtk as n2v
-from PyQt5 import QtCore, QtGui, QtWidgets
 from sklearn.cluster import AgglomerativeClustering
 from shapely.ops import unary_union, polygonize
 import shapely.geometry as geometry
 from pyclipper import PyclipperOffset, scale_to_clipper, scale_from_clipper, JT_SQUARE, ET_CLOSEDPOLYGON
 from scipy.interpolate import interp1d
-from pkg_resources import Requirement, resource_filename
 
 
-def make_splash():
-    '''
-    Makes and returns a Qt splash window object
-    '''
-    spl_fname=resource_filename("d3dslic3r","meta/Logo.png")
-    splash_pix = QtGui.QPixmap(spl_fname,'PNG')
-    splash = QtWidgets.QSplashScreen(splash_pix, QtCore.Qt.SplashScreen)
-    splash.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint | QtCore.Qt.FramelessWindowHint)
-    
-    font = splash.font()
-    font.setPixelSize(20)
-    font.setWeight(QtGui.QFont.Bold)
-    splash.setFont(font)
-    
-    # splash.showMessage('v%s'%(version('d3dslic3r')),QtCore.Qt.AlignRight | QtCore.Qt.AlignBottom, QtCore.Qt.lightGray)
-    splash.showMessage('v%s'%("0.0.1"),QtCore.Qt.AlignRight | QtCore.Qt.AlignTop, QtCore.Qt.darkGray)
-    return splash
-
-def make_logo(ren):
-    spl_fname=resource_filename("d3dslic3r","meta/background.png")
-    img_reader = vtk.vtkPNGReader()
-    img_reader.SetFileName(spl_fname)
-    img_reader.Update()
-    logo = vtk.vtkLogoRepresentation()
-    logo.SetImage(img_reader.GetOutput())
-    logo.ProportionalResizeOn()
-    logo.SetPosition( 0.1, 0.1 ) #lower left
-    logo.SetPosition2( 0.8, 0.8 ) #upper right
-    logo.GetImageProperty().SetDisplayLocationToBackground()
-    ren.AddViewProp(logo)
-    logo.SetRenderer(ren)
-    return logo
-
 def get_slice_data(polydata,param,num_slices = True):
     """
     Obtains x,y pairs corresponding to a vtkCutter operation on input polydata 
@@ -144,29 +108,6 @@ def actor_from_polydata(polydata):
 
     return stl_actor
 
-def get_file(*args):
-    '''
-    Returns absolute path to filename and the directory it is located in from a PyQt5 filedialog. First value is file extension, second is a string which overwrites the window message.
-    '''
-    ext = args
-    launchdir = os.getcwd()
-    ftypeName={}
-    ftypeName['*.stl']=["STereoLithography file", "*.stl","STL file"]
-    
-    filter_str = ""
-    for entry in args:
-        filter_str += ftypeName[entry][2] + ' ('+ftypeName[entry][1]+');;'
-    filter_str += ('All Files (*.*)')
-    
-    filer = QtWidgets.QFileDialog.getOpenFileName(None, ftypeName[ext[0]][0], 
-         os.getcwd(),(filter_str))
-
-    if filer[0] == '':
-        return None
-        
-    else: #return the filename/path
-        return filer[0]
-
 def gen_outline_actor(pts, color = (1,1,1), size = 2):
     '''
     Returns an outline actor with specified numpy array of points, color and size. pts should be ordered
@@ -459,26 +400,3 @@ def offset_poly(poly, offset):
     two_d = respace_equally(two_d,len(poly))[0]
 
     return np.column_stack((two_d,np.ones(len(two_d))*zval)) 
-    
-
-def xyview(ren):
-    camera = ren.GetActiveCamera()
-    camera.SetPosition(0,0,1)
-    camera.SetFocalPoint(0,0,0)
-    camera.SetViewUp(0,1,0)
-    ren.ResetCamera()
-
-def yzview(ren):
-    camera = ren.GetActiveCamera()
-    camera.SetPosition(1,0,0)
-    camera.SetFocalPoint(0,0,0)
-    camera.SetViewUp(0,0,1)
-    ren.ResetCamera()
-
-def xzview(ren):
-    vtk.vtkObject.GlobalWarningDisplayOff() #mapping from '3' triggers an underlying stereoview that most displays do not support for trackball interactors
-    camera = ren.GetActiveCamera()
-    camera.SetPosition(0,1,0)
-    camera.SetFocalPoint(0,0,0)
-    camera.SetViewUp(0,0,1)
-    ren.ResetCamera()

d3dslic3r/d3dslic3r_gui_common.py

@@ -0,0 +1,175 @@
+import os
+import vtk
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+import importlib.resources
+
+class collapsible_box(QtWidgets.QWidget):
+    def __init__(self, title="", parent=None):
+        super(collapsible_box, self).__init__(parent)
+
+        self.toggle_button = QtWidgets.QToolButton(
+            text=title, checkable=True, checked=False
+        )
+        self.toggle_button.setStyleSheet("QToolButton { border: none; }")
+        self.toggle_button.setToolButtonStyle(
+            QtCore.Qt.ToolButtonTextBesideIcon
+        )
+        self.toggle_button.setArrowType(QtCore.Qt.RightArrow)
+        self.toggle_button.pressed.connect(self.on_pressed)
+
+        self.toggle_animation = QtCore.QParallelAnimationGroup(self)
+
+        self.content_area = QtWidgets.QScrollArea(
+            maximumHeight=0, minimumHeight=0
+        )
+        self.content_area.setSizePolicy(
+            QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed
+        )
+        self.content_area.setFrameShape(QtWidgets.QFrame.NoFrame)
+
+        lay = QtWidgets.QVBoxLayout(self)
+        lay.setSpacing(0)
+        lay.setContentsMargins(0, 0, 0, 0)
+        lay.addWidget(self.toggle_button)
+        lay.addWidget(self.content_area)
+
+        self.toggle_animation.addAnimation(
+            QtCore.QPropertyAnimation(self, b"minimumHeight")
+        )
+        self.toggle_animation.addAnimation(
+            QtCore.QPropertyAnimation(self, b"maximumHeight")
+        )
+        self.toggle_animation.addAnimation(
+            QtCore.QPropertyAnimation(self.content_area, b"maximumHeight")
+        )
+
+    @QtCore.pyqtSlot()
+    def on_pressed(self):
+        checked = self.toggle_button.isChecked()
+        self.toggle_button.setArrowType(
+            QtCore.Qt.DownArrow if not checked else QtCore.Qt.RightArrow
+        )
+        self.toggle_animation.setDirection(
+            QtCore.QAbstractAnimation.Forward
+            if not checked
+            else QtCore.QAbstractAnimation.Backward
+        )
+        self.toggle_animation.start()
+
+    def set_content_layout(self, layout):
+        lay = self.content_area.layout()
+        del lay
+        self.content_area.setLayout(layout)
+        collapsed_height = (
+            self.sizeHint().height() - self.content_area.maximumHeight()
+        )
+        content_height = layout.sizeHint().height()
+        for i in range(self.toggle_animation.animationCount()):
+            animation = self.toggle_animation.animationAt(i)
+            animation.setDuration(500)
+            animation.setStartValue(collapsed_height)
+            animation.setEndValue(collapsed_height + content_height)
+
+        content_animation = self.toggle_animation.animationAt(
+            self.toggle_animation.animationCount() - 1
+        )
+        content_animation.setDuration(500)
+        content_animation.setStartValue(0)
+        content_animation.setEndValue(content_height)
+
+def make_splash():
+    '''
+    Makes and returns a Qt splash window object
+    '''
+    spl_fname = importlib.resources.files('d3dslic3r') / 'meta/Logo.png'
+    splash_pix = QtGui.QPixmap(spl_fname,'PNG')
+    splash = QtWidgets.QSplashScreen(splash_pix, QtCore.Qt.SplashScreen)
+    splash.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint | QtCore.Qt.FramelessWindowHint)
+    
+    font = splash.font()
+    font.setPixelSize(20)
+    font.setWeight(QtGui.QFont.Bold)
+    splash.setFont(font)
+    
+    # splash.showMessage('v%s'%(version('d3dslic3r')),QtCore.Qt.AlignRight | QtCore.Qt.AlignBottom, QtCore.Qt.lightGray)
+    splash.showMessage('v%s'%("0.0.1"),QtCore.Qt.AlignRight | QtCore.Qt.AlignTop, QtCore.Qt.darkGray)
+    return splash
+
+def make_logo(ren):
+    spl_fname = importlib.resources.files('d3dslic3r') / 'meta/background.png'
+    # spl_fname=resource_filename("d3dslic3r","meta/background.png")
+    img_reader = vtk.vtkPNGReader()
+    img_reader.SetFileName(spl_fname)
+    img_reader.Update()
+    logo = vtk.vtkLogoRepresentation()
+    logo.SetImage(img_reader.GetOutput())
+    logo.ProportionalResizeOn()
+    logo.SetPosition( 0.1, 0.1 ) #lower left
+    logo.SetPosition2( 0.8, 0.8 ) #upper right
+    logo.GetImageProperty().SetDisplayLocationToBackground()
+    ren.AddViewProp(logo)
+    logo.SetRenderer(ren)
+    return logo
+
+def get_file(*args):
+    '''
+    Returns absolute path to filename and the directory it is located in from a PyQt5 filedialog. First value is file extension, second is a string which overwrites the window message.
+    '''
+    ext = args
+    launchdir = os.getcwd()
+    ftypeName={}
+    ftypeName['*.stl']=["STereoLithography file", "*.stl","STL file"]
+    
+    filter_str = ""
+    for entry in args:
+        filter_str += ftypeName[entry][2] + ' ('+ftypeName[entry][1]+');;'
+    filter_str += ('All Files (*.*)')
+    
+    filer = QtWidgets.QFileDialog.getOpenFileName(None, ftypeName[ext[0]][0], 
+         os.getcwd(),(filter_str))
+
+    if filer[0] == '':
+        return None
+        
+    else: #return the filename/path
+        return filer[0]
+
+def generate_sphere(center, radius, color):
+    source = vtk.vtkSphereSource()
+    source.SetCenter(*center)
+    source.SetRadius(radius)
+    source.SetThetaResolution(20)
+    source.SetPhiResolution(20)
+    source.Update()
+    
+    mapper = vtk.vtkPolyDataMapper()
+    mapper.SetInputData(source.GetOutput())
+    
+    actor = vtk.vtkActor()
+    actor.SetMapper(mapper)
+    actor.GetProperty().SetColor(*color)
+    
+    return actor
+
+def xyview(ren):
+    camera = ren.GetActiveCamera()
+    camera.SetPosition(0,0,1)
+    camera.SetFocalPoint(0,0,0)
+    camera.SetViewUp(0,1,0)
+    ren.ResetCamera()
+
+def yzview(ren):
+    camera = ren.GetActiveCamera()
+    camera.SetPosition(1,0,0)
+    camera.SetFocalPoint(0,0,0)
+    camera.SetViewUp(0,0,1)
+    ren.ResetCamera()
+
+def xzview(ren):
+    vtk.vtkObject.GlobalWarningDisplayOff() #mapping from '3' triggers an underlying stereoview that most displays do not support for trackball interactors
+    camera = ren.GetActiveCamera()
+    camera.SetPosition(0,1,0)
+    camera.SetFocalPoint(0,0,0)
+    camera.SetViewUp(0,0,1)
+    ren.ResetCamera()