From ea19060f6472512e316d8dce7ae0451daa329960 Mon Sep 17 00:00:00 2001 From: carlopav Date: Thu, 30 Apr 2020 10:37:42 +0200 Subject: [PATCH] Draft: fix bspline and bezcurve viewproviders Finished to fix bspline and bezcurve wiewproviders. --- src/Mod/Draft/CMakeLists.txt | 2 +- src/Mod/Draft/Draft.py | 8 ++++---- src/Mod/Draft/draftmake/make_bezcurve.py | 2 +- .../{view_bezier.py => view_bezcurve.py} | 3 +++ src/Mod/Draft/draftviewproviders/view_bspline.py | 3 +++ 5 files changed, 12 insertions(+), 6 deletions(-) rename src/Mod/Draft/draftviewproviders/{view_bezier.py => view_bezcurve.py} (97%) diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index 99aadd4aae..338cee7245 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -113,7 +113,7 @@ SET(Draft_objects SET(Draft_view_providers draftviewproviders/__init__.py draftviewproviders/view_base.py - draftviewproviders/view_bezier.py + draftviewproviders/view_bezcurve.py draftviewproviders/view_bspline.py draftviewproviders/view_circulararray.py draftviewproviders/view_clone.py diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 0e282950da..2c4caf1dce 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -222,15 +222,15 @@ if FreeCAD.GuiUp: from draftmake.make_bspline import make_bspline, makeBSpline from draftobjects.bspline import BSpline, _BSpline if FreeCAD.GuiUp: - # for compatibility with older versions - _ViewProviderBSpline = ViewProviderWire + from draftviewproviders.view_bspline import ViewProviderBSpline + from draftviewproviders.view_bspline import _ViewProviderBSpline # bezcurve from draftmake.make_bezcurve import make_bezcurve, makeBezCurve from draftobjects.bezcurve import BezCurve, _BezCurve if FreeCAD.GuiUp: - # for compatibility with older versions - _ViewProviderBezCurve = ViewProviderWire + from draftviewproviders.view_bezcurve import ViewProviderBezCurve + from draftviewproviders.view_bezcurve import _ViewProviderBezCurve # clone from draftmake.make_clone import make_clone, clone diff --git a/src/Mod/Draft/draftmake/make_bezcurve.py b/src/Mod/Draft/draftmake/make_bezcurve.py index 0f8892592b..ea6d39137d 100644 --- a/src/Mod/Draft/draftmake/make_bezcurve.py +++ b/src/Mod/Draft/draftmake/make_bezcurve.py @@ -36,7 +36,7 @@ from draftutils.translate import translate from draftobjects.bezcurve import BezCurve if App.GuiUp: - from draftviewproviders.view_bezier import ViewProviderBezCurve + from draftviewproviders.view_bezcurve import ViewProviderBezCurve def make_bezcurve(pointslist, closed=False, placement=None, face=None, support=None, degree=None): diff --git a/src/Mod/Draft/draftviewproviders/view_bezier.py b/src/Mod/Draft/draftviewproviders/view_bezcurve.py similarity index 97% rename from src/Mod/Draft/draftviewproviders/view_bezier.py rename to src/Mod/Draft/draftviewproviders/view_bezcurve.py index e3f2394a6e..502ef3caa4 100644 --- a/src/Mod/Draft/draftviewproviders/view_bezier.py +++ b/src/Mod/Draft/draftviewproviders/view_bezcurve.py @@ -36,3 +36,6 @@ class ViewProviderBezCurve(ViewProviderWire): def __init__(self, vobj): super(ViewProviderBezCurve, self).__init__(vobj) + + +_ViewProviderBezCurve = ViewProviderBezCurve \ No newline at end of file diff --git a/src/Mod/Draft/draftviewproviders/view_bspline.py b/src/Mod/Draft/draftviewproviders/view_bspline.py index 4fb0d35724..0bb162a012 100644 --- a/src/Mod/Draft/draftviewproviders/view_bspline.py +++ b/src/Mod/Draft/draftviewproviders/view_bspline.py @@ -36,3 +36,6 @@ class ViewProviderBSpline(ViewProviderWire): def __init__(self, vobj): super(ViewProviderBSpline, self).__init__(vobj) + + +_ViewProviderBSpline = ViewProviderBSpline \ No newline at end of file