[Bf-extensions-cvs] [37939a3] master: updating to newest version of dxfgrabber; needed for further updates regarding inf.0 problem.
Lukas Treyer
noreply at git.blender.org
Tue Aug 16 18:24:41 CEST 2016
Commit: 37939a32083be2ca80b296bd8b030bffaf65928d
Author: Lukas Treyer
Date: Tue Aug 16 18:24:32 2016 +0200
Branches: master
https://developer.blender.org/rBA37939a32083be2ca80b296bd8b030bffaf65928d
updating to newest version of dxfgrabber; needed for further updates regarding inf.0 problem.
===================================================================
M io_import_dxf/__init__.py
M io_import_dxf/dxfgrabber/__init__.py
M io_import_dxf/dxfgrabber/acdsdata.py
M io_import_dxf/dxfgrabber/blockssection.py
M io_import_dxf/dxfgrabber/codepage.py
M io_import_dxf/dxfgrabber/color.py
M io_import_dxf/dxfgrabber/const.py
D io_import_dxf/dxfgrabber/cydxfentity.py
D io_import_dxf/dxfgrabber/cytags.py
M io_import_dxf/dxfgrabber/decode.py
M io_import_dxf/dxfgrabber/defaultchunk.py
M io_import_dxf/dxfgrabber/drawing.py
D io_import_dxf/dxfgrabber/dxf12.py
D io_import_dxf/dxfgrabber/dxf13.py
D io_import_dxf/dxfgrabber/dxfattr.py
D io_import_dxf/dxfgrabber/dxfentity.py
D io_import_dxf/dxfgrabber/entities.py
M io_import_dxf/dxfgrabber/entitysection.py
M io_import_dxf/dxfgrabber/headersection.py
M io_import_dxf/dxfgrabber/juliandate.py
M io_import_dxf/dxfgrabber/layers.py
M io_import_dxf/dxfgrabber/linetypes.py
D io_import_dxf/dxfgrabber/pytags.py
M io_import_dxf/dxfgrabber/sections.py
M io_import_dxf/dxfgrabber/styles.py
M io_import_dxf/dxfgrabber/tablessection.py
M io_import_dxf/dxfgrabber/tags.py
M io_import_dxf/dxfimport/convert.py
M io_import_dxf/dxfimport/do.py
M io_import_dxf/dxfimport/fake_entities.py
M io_import_dxf/dxfimport/is_.py
===================================================================
diff --git a/io_import_dxf/__init__.py b/io_import_dxf/__init__.py
index 5d588f7..d768d62 100644
--- a/io_import_dxf/__init__.py
+++ b/io_import_dxf/__init__.py
@@ -22,7 +22,6 @@ import bpy
import os
from bpy.props import StringProperty, BoolProperty, EnumProperty, IntProperty, FloatProperty
from .dxfimport.do import Do, Indicator
-from .dxfgrabber.headersection import MinVersionError
from .transverse_mercator import TransverseMercator
@@ -114,20 +113,18 @@ def read(report, filename, obj_merge=BY_LAYER, import_text=True, import_light=Tr
thicknessWidth=True, but_group_by_att=True, dxf_unit_scale=1.0):
# import dxf and export nurbs types to sat/sab files
# because that's how autocad stores nurbs types in a dxf...
- try:
- do = Do(filename, obj_merge, import_text, import_light, export_acis, merge_lines, do_bbox, block_rep, recenter,
- projDXF, projSCN, thicknessWidth, but_group_by_att, dxf_unit_scale)
- errors = do.entities(os.path.basename(filename).replace(".dxf", ""), new_scene)
-
- # display errors
- for error in errors:
- report({'ERROR', 'INFO'}, error)
-
- # inform the user about the sat/sab files
- if len(do.acis_files) > 0:
- report({'INFO'}, "Exported %d NURBS objects to sat/sab files next to your DXF file" % len(do.acis_files))
- except MinVersionError as minv:
- report({'ERROR', 'INFO'}, str(minv))
+ do = Do(filename, obj_merge, import_text, import_light, export_acis, merge_lines, do_bbox, block_rep, recenter,
+ projDXF, projSCN, thicknessWidth, but_group_by_att, dxf_unit_scale)
+
+ errors = do.entities(os.path.basename(filename).replace(".dxf", ""), new_scene)
+
+ # display errors
+ for error in errors:
+ report({'ERROR', 'INFO'}, error)
+
+ # inform the user about the sat/sab files
+ if len(do.acis_files) > 0:
+ report({'INFO'}, "Exported %d NURBS objects to sat/sab files next to your DXF file" % len(do.acis_files))
def display_groups_in_outliner():
diff --git a/io_import_dxf/dxfgrabber/__init__.py b/io_import_dxf/dxfgrabber/__init__.py
old mode 100755
new mode 100644
index 9d3da9d..2581a40
--- a/io_import_dxf/dxfgrabber/__init__.py
+++ b/io_import_dxf/dxfgrabber/__init__.py
@@ -3,7 +3,7 @@
# Created: 21.07.2012
# License: MIT License
-version = (0, 7, 4)
+version = (0, 8, 1)
VERSION = "%d.%d.%d" % version
__author__ = "mozman <mozman at gmx.at>"
diff --git a/io_import_dxf/dxfgrabber/acdsdata.py b/io_import_dxf/dxfgrabber/acdsdata.py
old mode 100755
new mode 100644
index 60538d5..b864fff
--- a/io_import_dxf/dxfgrabber/acdsdata.py
+++ b/io_import_dxf/dxfgrabber/acdsdata.py
@@ -21,10 +21,10 @@ class AcDsDataSection(object):
@classmethod
def from_tags(cls, tags, drawing):
data_section = cls()
- data_section._build(tags, drawing.dxfversion)
+ data_section._build(tags)
return data_section
- def _build(self, tags, dxfversion):
+ def _build(self, tags):
if len(tags) == 3: # empty entities section
return
diff --git a/io_import_dxf/dxfgrabber/blockssection.py b/io_import_dxf/dxfgrabber/blockssection.py
old mode 100755
new mode 100644
index d8f6b05..a64a364
--- a/io_import_dxf/dxfgrabber/blockssection.py
+++ b/io_import_dxf/dxfgrabber/blockssection.py
@@ -21,17 +21,17 @@ class BlocksSection(object):
def from_tags(tags, drawing):
blocks_section = BlocksSection()
if drawing.grab_blocks:
- blocks_section._build(tags, drawing.dxfversion)
+ blocks_section._build(tags)
return blocks_section
- def _build(self, tags, dxfversion):
+ def _build(self, tags):
if len(tags) == 3: # empty block section
return
groups = list()
for group in TagGroups(islice(tags, 2, len(tags)-1)):
groups.append(group)
if group[0].value == 'ENDBLK':
- entities = build_entities(groups, dxfversion)
+ entities = build_entities(groups)
block = entities[0]
block.set_entities(entities[1:-1])
self._add(block)
diff --git a/io_import_dxf/dxfgrabber/codepage.py b/io_import_dxf/dxfgrabber/codepage.py
old mode 100755
new mode 100644
diff --git a/io_import_dxf/dxfgrabber/color.py b/io_import_dxf/dxfgrabber/color.py
old mode 100755
new mode 100644
diff --git a/io_import_dxf/dxfgrabber/const.py b/io_import_dxf/dxfgrabber/const.py
old mode 100755
new mode 100644
diff --git a/io_import_dxf/dxfgrabber/cydxfentity.py b/io_import_dxf/dxfgrabber/cydxfentity.py
deleted file mode 100755
index be39b48..0000000
--- a/io_import_dxf/dxfgrabber/cydxfentity.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def __bootstrap__():
- global __bootstrap__, __loader__, __file__
- import sys, pkg_resources, imp
- __file__ = pkg_resources.resource_filename(__name__,'cydxfentity.so')
- __loader__ = None; del __bootstrap__, __loader__
- imp.load_dynamic(__name__,__file__)
-__bootstrap__()
diff --git a/io_import_dxf/dxfgrabber/cytags.py b/io_import_dxf/dxfgrabber/cytags.py
deleted file mode 100755
index 071cea0..0000000
--- a/io_import_dxf/dxfgrabber/cytags.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def __bootstrap__():
- global __bootstrap__, __loader__, __file__
- import sys, pkg_resources, imp
- __file__ = pkg_resources.resource_filename(__name__,'cytags.so')
- __loader__ = None; del __bootstrap__, __loader__
- imp.load_dynamic(__name__,__file__)
-__bootstrap__()
diff --git a/io_import_dxf/dxfgrabber/decode.py b/io_import_dxf/dxfgrabber/decode.py
old mode 100755
new mode 100644
diff --git a/io_import_dxf/dxfgrabber/defaultchunk.py b/io_import_dxf/dxfgrabber/defaultchunk.py
old mode 100755
new mode 100644
index 5a280bd..1df9969
--- a/io_import_dxf/dxfgrabber/defaultchunk.py
+++ b/io_import_dxf/dxfgrabber/defaultchunk.py
@@ -9,14 +9,13 @@ from .tags import Tags, DXFTag
class DefaultChunk(object):
- def __init__(self, tags, drawing):
+ def __init__(self, tags):
assert isinstance(tags, Tags)
self.tags = tags
- self._drawing = drawing
@staticmethod
def from_tags(tags, drawing):
- return DefaultChunk(tags, drawing)
+ return DefaultChunk(tags)
@property
def name(self):
diff --git a/io_import_dxf/dxfgrabber/drawing.py b/io_import_dxf/dxfgrabber/drawing.py
old mode 100755
new mode 100644
index 1b275e8..f9a01fa
--- a/io_import_dxf/dxfgrabber/drawing.py
+++ b/io_import_dxf/dxfgrabber/drawing.py
@@ -5,7 +5,7 @@
__author__ = "mozman <mozman at gmx.at>"
-from .tags import TagIterator
+from .tags import stream_tagger
from .sections import Sections
DEFAULT_OPTIONS = {
@@ -23,7 +23,7 @@ class Drawing(object):
self.assure_3d_coords = options.get('assure_3d_coords', False)
self.resolve_text_styles = options.get('resolve_text_styles', True)
- tagreader = TagIterator(stream, self.assure_3d_coords)
+ tagreader = stream_tagger(stream, self.assure_3d_coords)
self.dxfversion = 'AC1009'
self.encoding = 'cp1252'
self.filename = None
diff --git a/io_import_dxf/dxfgrabber/dxf12.py b/io_import_dxf/dxfgrabber/dxf12.py
deleted file mode 100755
index 7663ae4..0000000
--- a/io_import_dxf/dxfgrabber/dxf12.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# Purpose: DXF12 tag wrapper
-# Created: 21.07.2012, taken from my ezdxf project
-# Copyright (C) 2012, Manfred Moitzi
-# License: MIT License
-from __future__ import unicode_literals
-__author__ = "mozman <mozman at gmx.at>"
-
-
-from .dxfattr import DXFAttr, DXFAttributes, DefSubclass
-from .dxfentity import DXFEntity
-from . import const
-from .const import XTYPE_3D, XTYPE_2D_3D
-
-def make_attribs(additional=None):
- dxfattribs = {
- 'handle': DXFAttr(5),
- 'layer': DXFAttr(8), # layername as string, default is '0'
- 'linetype': DXFAttr(6), # linetype as string, special names BYLAYER/BYBLOCK, default is BYLAYER
- 'thickness': DXFAttr(39),
- 'color': DXFAttr(62), # dxf color index, 0 .. BYBLOCK, 256 .. BYLAYER, default is 256
- 'paperspace': DXFAttr(67), # 0 .. modelspace, 1 .. paperspace, default is 0
- 'extrusion': DXFAttr(210, XTYPE_3D),
- }
- if additional:
- dxfattribs.update(additional)
- return DXFAttributes(DefSubclass(None, dxfattribs))
-
-
-class Line(DXFEntity):
- DXFATTRIBS = make_attribs({
- 'start': DXFAttr(10, XTYPE_2D_3D),
- 'end': DXFAttr(11, XTYPE_2D_3D),
- })
-
-
-class Point(DXFEntity):
- DXFATTRIBS = make_attribs({
- 'point': DXFAttr(10, XTYPE_2D_3D),
- })
-
-
-class Circle(DXFEntity):
- DXFATTRIBS = make_attribs({
- 'center': DXFAttr(10, XTYPE_2D_3D),
- 'radius': DXFAttr(40),
- })
-
-
-class Arc(DXFEntity):
- DXFATTRIBS = make_attribs({
- 'center': DXFAttr(10, XTYPE_2D_3D),
- 'radius': DXFAttr(40),
- 'startangle': DXFAttr(50),
- 'endangle': DXFAttr(51),
- })
-
-
-class Trace(DXFEntity):
- DXFATTRIBS = make_attribs({
- 'vtx0': DXFAttr(10, XTYPE_2D_3D),
- 'vtx1': DXFAttr(11, XTYPE_2D_3D),
- 'vtx2': DXFAttr(12, XTYPE_2D_3D),
- 'vtx3': DXFAttr(13, XTYPE_2D_3D),
- })
-
-
-Solid = Trace
-
-
-class Face(DXFEntity):
- DXFATTRIBS = make_attribs({
- 'vtx0': DXFAttr(10, XTYPE_2D_3D),
- 'vtx1': DXFAttr(11, XTYPE_2D_3D),
- 'vtx2': DXFAttr(12, XTYPE_2D_3D),
- 'vtx3': DXFAttr(13, XTYPE_2D_3D),
- 'invisible_edge': DXFAttr(70),
- })
-
-
-class Text(DXFEntity):
- DXFATTRIBS = make_attribs({
- 'insert': DXFAttr(10, XTYPE_2D_3D),
- 'height': DXFAttr(40),
- 'text': DXFAttr(1),
- 'rotation': DXFAttr(50), # in degrees (circle = 360deg)
- 'oblique': DXFAttr(51), # in degrees, vertical = 0deg
- 'style': DXFAttr(7), # text style
- 'width': DXFAttr(41), # width FACTOR!
- 'textgenerationflag': DXFAttr(71), # 2 = backward (mirr-x), 4 = upside down (mirr-y)
- 'halign': DXFAttr(72), # horizontal justification
- 'valign': DXFAttr(73), # vertical justification
- 'alignpoint': DXFAttr(11, XTYPE_2D_3D),
- })
-
-
-class Insert(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list