[Draft] Cleanup of Annotation style branch
Further cleanup and guarded imports of Gui in modules. .
This commit is contained in:
committed by
Yorik van Havre
parent
cb4295fd8a
commit
a4f7bc43f6
@@ -25,7 +25,7 @@
|
||||
|
||||
"""This module provides the object code for Draft Dimension.
|
||||
"""
|
||||
## @package style_dimension
|
||||
## @package dimension
|
||||
# \ingroup DRAFT
|
||||
# \brief This module provides the object code for Draft Dimension.
|
||||
|
||||
@@ -36,9 +36,11 @@ import DraftGeomUtils
|
||||
import draftutils.gui_utils as gui_utils
|
||||
import draftutils.utils as utils
|
||||
from draftobjects.draft_annotation import DraftAnnotation
|
||||
from draftviewproviders.view_dimension import ViewProviderDimensionBase
|
||||
from draftviewproviders.view_dimension import ViewProviderLinearDimension
|
||||
from draftviewproviders.view_dimension import ViewProviderAngularDimension
|
||||
|
||||
if App.GuiUp:
|
||||
from draftviewproviders.view_dimension import ViewProviderDimensionBase
|
||||
from draftviewproviders.view_dimension import ViewProviderLinearDimension
|
||||
from draftviewproviders.view_dimension import ViewProviderAngularDimension
|
||||
|
||||
def make_dimension(p1,p2,p3=None,p4=None):
|
||||
"""makeDimension(p1,p2,[p3]) or makeDimension(object,i1,i2,p3)
|
||||
|
||||
@@ -22,19 +22,19 @@
|
||||
|
||||
"""This module provides the object code for Draft DimensionStyle.
|
||||
"""
|
||||
## @package style_dimension
|
||||
## @package dimensionstyle
|
||||
# \ingroup DRAFT
|
||||
# \brief This module provides the object code for Draft DimensionStyle.
|
||||
|
||||
import FreeCAD as App
|
||||
from draftobjects.draft_annotation import DraftAnnotation
|
||||
from PySide.QtCore import QT_TRANSLATE_NOOP
|
||||
from draftviewproviders.view_dimensionstyle import ViewProviderDraftDimensionStyle
|
||||
from draftviewproviders.view_dimensionstyle import ViewProviderDimensionStylesContainer
|
||||
from draftobjects.draft_annotation import AnnotationStylesContainer
|
||||
|
||||
if App.GuiUp:
|
||||
import FreeCADGui as Gui
|
||||
from draftviewproviders.view_dimensionstyle import ViewProviderDraftDimensionStyle
|
||||
from draftviewproviders.view_dimensionstyle import ViewProviderDimensionStylesContainer
|
||||
|
||||
def make_dimension_style(existing_dimension = None):
|
||||
"""
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
# * *
|
||||
# ***************************************************************************
|
||||
|
||||
"""This module provides the object code for Draft DimensionStyle.
|
||||
"""This module provides the object code for Draft Annotation.
|
||||
"""
|
||||
## @package style_dimension
|
||||
## @package annotation
|
||||
# \ingroup DRAFT
|
||||
# \brief This module provides the object code for Draft DimensionStyle.
|
||||
# \brief This module provides the object code for Draft Annotation.
|
||||
|
||||
import FreeCAD as App
|
||||
from PySide.QtCore import QT_TRANSLATE_NOOP
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# ***************************************************************************
|
||||
# * Copyright (c) 2009, 2010 Yorik van Havre <yorik@uncreated.net> *
|
||||
# * Copyright (c) 2009, 2010 Ken Cline <cline@frii.com> *
|
||||
@@ -35,7 +36,9 @@ import DraftGeomUtils
|
||||
import draftutils.gui_utils as gui_utils
|
||||
import draftutils.utils as utils
|
||||
from draftobjects.draft_annotation import DraftAnnotation
|
||||
from draftviewproviders.view_label import ViewProviderLabel
|
||||
|
||||
if App.GuiUp:
|
||||
from draftviewproviders.view_label import ViewProviderLabel
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
# * *
|
||||
# ***************************************************************************
|
||||
|
||||
"""This module provides the object code for Draft Label.
|
||||
"""This module provides the object code for Draft Text.
|
||||
"""
|
||||
## @package label
|
||||
## @package text
|
||||
# \ingroup DRAFT
|
||||
# \brief This module provides the object code for Draft Label.
|
||||
# \brief This module provides the object code for Draft Text.
|
||||
|
||||
import FreeCAD as App
|
||||
import math
|
||||
@@ -35,8 +35,9 @@ import DraftGeomUtils
|
||||
import draftutils.gui_utils as gui_utils
|
||||
import draftutils.utils as utils
|
||||
from draftobjects.draft_annotation import DraftAnnotation
|
||||
from draftviewproviders.view_text import ViewProviderText
|
||||
|
||||
if App.GuiUp:
|
||||
from draftviewproviders.view_text import ViewProviderText
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user