From 174f2e11dc78895ad649dcc92cde5104aaf81f93 Mon Sep 17 00:00:00 2001 From: Licini Date: Mon, 1 Jul 2024 15:34:08 +0200 Subject: [PATCH] remove duplicated dependencies --- src/compas_viewer/scene/circleobject.py | 5 ++--- src/compas_viewer/scene/ellipseobject.py | 5 ++--- src/compas_viewer/scene/lineobject.py | 5 ++--- src/compas_viewer/scene/nurbscurveobject.py | 5 ++--- src/compas_viewer/scene/nurbssurfaceobject.py | 5 ++--- src/compas_viewer/scene/planeobject.py | 5 ++--- src/compas_viewer/scene/pointcloudobject.py | 5 ++--- src/compas_viewer/scene/pointobject.py | 5 ++--- src/compas_viewer/scene/polygonobject.py | 5 ++--- src/compas_viewer/scene/polyhedronobject.py | 5 ++--- src/compas_viewer/scene/polylineobject.py | 5 ++--- 11 files changed, 22 insertions(+), 33 deletions(-) diff --git a/src/compas_viewer/scene/circleobject.py b/src/compas_viewer/scene/circleobject.py index 3089c503a3..20133e2080 100644 --- a/src/compas_viewer/scene/circleobject.py +++ b/src/compas_viewer/scene/circleobject.py @@ -3,12 +3,11 @@ from compas.geometry import Circle from compas.geometry import Line from compas.geometry import Point -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class CircleObject(ViewerGeometryObject, GeometryObject): +class CircleObject(GeometryObject): """Viewer scene object for displaying COMPAS Circle geometry.""" geometry: Circle diff --git a/src/compas_viewer/scene/ellipseobject.py b/src/compas_viewer/scene/ellipseobject.py index 269d3de321..39a81ceb0e 100644 --- a/src/compas_viewer/scene/ellipseobject.py +++ b/src/compas_viewer/scene/ellipseobject.py @@ -3,12 +3,11 @@ from compas.geometry import Ellipse from compas.geometry import Line from compas.geometry import Point -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class EllipseObject(ViewerGeometryObject, GeometryObject): +class EllipseObject(GeometryObject): """Viewer scene object for displaying COMPAS Ellipse geometry.""" geometry: Ellipse diff --git a/src/compas_viewer/scene/lineobject.py b/src/compas_viewer/scene/lineobject.py index 946d68a8c7..128c412fc7 100644 --- a/src/compas_viewer/scene/lineobject.py +++ b/src/compas_viewer/scene/lineobject.py @@ -2,12 +2,11 @@ from compas.geometry import Line from compas.geometry import Point -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class LineObject(ViewerGeometryObject, GeometryObject): +class LineObject(GeometryObject): """Viewer scene object for displaying COMPAS Line geometry.""" geometry: Line diff --git a/src/compas_viewer/scene/nurbscurveobject.py b/src/compas_viewer/scene/nurbscurveobject.py index 937be7d034..412993e797 100644 --- a/src/compas_viewer/scene/nurbscurveobject.py +++ b/src/compas_viewer/scene/nurbscurveobject.py @@ -5,12 +5,11 @@ from compas.geometry import NurbsCurve from compas.geometry import Point from compas.itertools import pairwise -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class NurbsCurveObject(ViewerGeometryObject, GeometryObject): +class NurbsCurveObject(GeometryObject): """Viewer scene object for displaying COMPAS NurbsCurve geometry.""" geometry: NurbsCurve diff --git a/src/compas_viewer/scene/nurbssurfaceobject.py b/src/compas_viewer/scene/nurbssurfaceobject.py index 2064583f22..8b7e93af7c 100644 --- a/src/compas_viewer/scene/nurbssurfaceobject.py +++ b/src/compas_viewer/scene/nurbssurfaceobject.py @@ -7,13 +7,12 @@ from compas.geometry import NurbsSurface from compas.geometry import Point from compas.itertools import pairwise -from compas.scene import GeometryObject from compas.tolerance import TOL -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class NurbsSurfaceObject(ViewerGeometryObject, GeometryObject): +class NurbsSurfaceObject(GeometryObject): """Viewer scene object for displaying COMPAS NurbsSurface geometry.""" geometry: NurbsSurface diff --git a/src/compas_viewer/scene/planeobject.py b/src/compas_viewer/scene/planeobject.py index 208ae96c25..371a022bef 100644 --- a/src/compas_viewer/scene/planeobject.py +++ b/src/compas_viewer/scene/planeobject.py @@ -5,12 +5,11 @@ from compas.geometry import Line from compas.geometry import Plane from compas.geometry import Point -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class PlaneObject(ViewerGeometryObject, GeometryObject): +class PlaneObject(GeometryObject): """ Viewer scene object for displaying COMPAS Plane geometry. diff --git a/src/compas_viewer/scene/pointcloudobject.py b/src/compas_viewer/scene/pointcloudobject.py index 966c23e7f9..91128ccf15 100644 --- a/src/compas_viewer/scene/pointcloudobject.py +++ b/src/compas_viewer/scene/pointcloudobject.py @@ -1,11 +1,10 @@ from compas.geometry import Point from compas.geometry import Pointcloud -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class PointcloudObject(ViewerGeometryObject, GeometryObject): +class PointcloudObject(GeometryObject): """Viewer scene object for displaying COMPAS Pointcloud geometry.""" geometry: Pointcloud diff --git a/src/compas_viewer/scene/pointobject.py b/src/compas_viewer/scene/pointobject.py index 4080961598..2b4e4cec2d 100644 --- a/src/compas_viewer/scene/pointobject.py +++ b/src/compas_viewer/scene/pointobject.py @@ -2,12 +2,11 @@ from compas.geometry import Line from compas.geometry import Point -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class PointObject(ViewerGeometryObject, GeometryObject): +class PointObject(GeometryObject): """Viewer scene object for displaying COMPAS Point geometry.""" geometry: Point diff --git a/src/compas_viewer/scene/polygonobject.py b/src/compas_viewer/scene/polygonobject.py index 4f66fb5411..865bb57d89 100644 --- a/src/compas_viewer/scene/polygonobject.py +++ b/src/compas_viewer/scene/polygonobject.py @@ -5,12 +5,11 @@ from compas.geometry import Point from compas.geometry import Polygon from compas.geometry import earclip_polygon -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class PolygonObject(ViewerGeometryObject, GeometryObject): +class PolygonObject(GeometryObject): """Viewer scene object for displaying COMPAS Polygon geometry.""" geometry: Polygon diff --git a/src/compas_viewer/scene/polyhedronobject.py b/src/compas_viewer/scene/polyhedronobject.py index ff0a7a27a4..18cfc18b37 100644 --- a/src/compas_viewer/scene/polyhedronobject.py +++ b/src/compas_viewer/scene/polyhedronobject.py @@ -4,12 +4,11 @@ from compas.geometry import Line from compas.geometry import Point from compas.geometry import Polyhedron -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class PolyhedronObject(ViewerGeometryObject, GeometryObject): +class PolyhedronObject(GeometryObject): """Viewer scene object for displaying COMPAS Polyhedron geometry.""" geometry: Polyhedron diff --git a/src/compas_viewer/scene/polylineobject.py b/src/compas_viewer/scene/polylineobject.py index 71c8eb4b5c..bc122a62bb 100644 --- a/src/compas_viewer/scene/polylineobject.py +++ b/src/compas_viewer/scene/polylineobject.py @@ -3,12 +3,11 @@ from compas.geometry import Line from compas.geometry import Point from compas.geometry import Polyline -from compas.scene import GeometryObject -from .geometryobject import GeometryObject as ViewerGeometryObject +from .geometryobject import GeometryObject -class PolylineObject(ViewerGeometryObject, GeometryObject): +class PolylineObject(GeometryObject): """Viewer scene object for displaying COMPAS Polyline geometry.""" geometry: Polyline