Archimesh: Cleanup - Replace generic import

Replace generic import by the list of used functions or types

1 files changed, 21 insertions, 20 deletions

diff --git a/archimesh/achm_door_maker.py b/archimesh/achm_door_maker.py
index 36eba64e..b0908209 100644
--- a/archimesh/achm_door_maker.py
+++ b/archimesh/achm_door_maker.py
@@ -26,14 +26,15 @@
 import bpy
 import math
 # noinspection PyUnresolvedReferences
-from bpy.props import *
+from bpy.types import Operator, PropertyGroup, Object, Panel
+from bpy.props import FloatProperty, BoolProperty, EnumProperty, FloatVectorProperty, CollectionProperty
 from .achm_tools import *
 
 
 # ------------------------------------------------------------------
 # Define operator class to create object
 # ------------------------------------------------------------------
-class AchmDoor(bpy.types.Operator):
+class AchmDoor(Operator):
     bl_idname = "mesh.archimesh_door"
     bl_label = "Door"
     bl_description = "Door"
@@ -277,50 +278,50 @@ def shape_children(mainobject, update=False):
 # ------------------------------------------------------------------
 # Define property group class to create or modify
 # ------------------------------------------------------------------
-class ObjectProperties(bpy.types.PropertyGroup):
-    frame_width = bpy.props.FloatProperty(
+class ObjectProperties(PropertyGroup):
+    frame_width = FloatProperty(
             name='Frame width',
             min=0.25, max=10,
             default=1, precision=2,
             description='Doorframe width', update=update_object,
             )
-    frame_height = bpy.props.FloatProperty(
+    frame_height = FloatProperty(
             name='Frame height',
             min=0.25, max=10,
             default=2.1, precision=2,
             description='Doorframe height', update=update_object,
             )
-    frame_thick = bpy.props.FloatProperty(
+    frame_thick = FloatProperty(
             name='Frame thickness',
             min=0.05, max=0.50,
             default=0.08, precision=2,
             description='Doorframe thickness', update=update_object,
             )
-    frame_size = bpy.props.FloatProperty(
+    frame_size = FloatProperty(
             name='Frame size',
             min=0.05, max=0.25,
             default=0.08, precision=2,
             description='Doorframe size', update=update_object,
             )
-    crt_mat = bpy.props.BoolProperty(
+    crt_mat = BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             update=update_object,
             )
-    factor = bpy.props.FloatProperty(
+    factor = FloatProperty(
             name='',
             min=0.2, max=1,
             default=0.5, precision=3, description='Door ratio',
             update=update_object,
             )
-    r = bpy.props.FloatProperty(
+    r = FloatProperty(
             name='Rotation', min=0, max=360,
             default=0, precision=1,
             description='Door rotation', update=update_object,
             )
 
-    openside = bpy.props.EnumProperty(
+    openside = EnumProperty(
             name="Open side",
             items=(
                 ('1', "Right open", ""),
@@ -331,7 +332,7 @@ class ObjectProperties(bpy.types.PropertyGroup):
             update=update_object,
             )
 
-    model = bpy.props.EnumProperty(
+    model = EnumProperty(
             name="Model",
             items=(
                 ('1', "Model 01", ""),
@@ -345,7 +346,7 @@ class ObjectProperties(bpy.types.PropertyGroup):
             update=update_object,
             )
 
-    handle = bpy.props.EnumProperty(
+    handle = EnumProperty(
             name="Handle",
             items=(
                 ('1', "Handle 01", ""),
@@ -359,27 +360,27 @@ class ObjectProperties(bpy.types.PropertyGroup):
             )
 
     # opengl internal data
-    glpoint_a = bpy.props.FloatVectorProperty(
+    glpoint_a = FloatVectorProperty(
             name="glpointa",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_b = bpy.props.FloatVectorProperty(
+    glpoint_b = FloatVectorProperty(
             name="glpointb",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_c = bpy.props.FloatVectorProperty(
+    glpoint_c = FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_d = bpy.props.FloatVectorProperty(
+    glpoint_d = FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_e = bpy.props.FloatVectorProperty(
+    glpoint_e = FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
@@ -387,13 +388,13 @@ class ObjectProperties(bpy.types.PropertyGroup):
 
 # Register
 bpy.utils.register_class(ObjectProperties)
-bpy.types.Object.DoorObjectGenerator = bpy.props.CollectionProperty(type=ObjectProperties)
+Object.DoorObjectGenerator = CollectionProperty(type=ObjectProperties)
 
 
 # ------------------------------------------------------------------
 # Define panel class to modify object
 # ------------------------------------------------------------------
-class AchmDoorObjectgeneratorpanel(bpy.types.Panel):
+class AchmDoorObjectgeneratorpanel(Panel):
     bl_idname = "OBJECT_PT_door_generator"
     bl_label = "Door"
     bl_space_type = 'VIEW_3D'