updating to newest version of dxfgrabber; needed for further updates …

…regarding inf.0 problem.

io_import_dxf/__init__.py

@@ -22,7 +22,6 @@
 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():

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 <[email protected]>"

io_import_dxf/dxfgrabber/acdsdata.py

@@ -21,10 +21,10 @@ def __init__(self):
  @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
 

io_import_dxf/dxfgrabber/blockssection.py

@@ -21,17 +21,17 @@ def __init__(self):
  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)

io_import_dxf/dxfgrabber/defaultchunk.py

@@ -9,14 +9,13 @@
 
 
 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):

io_import_dxf/dxfgrabber/drawing.py

@@ -5,7 +5,7 @@
 
 __author__ = "mozman <[email protected]>"
 
-from .tags import TagIterator
+from .tags import stream_tagger
 from .sections import Sections
 
 DEFAULT_OPTIONS = {
@@ -23,7 +23,7 @@ def __init__(self, stream, options=None):
  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