griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

standard set of minor improvements, tho this is a good script and not much to change.

Browse Source 
faster dict/list operations.
use layer flags ratehr then lists.
This commit is contained in:
Campbell Barton
2007-01-05 03:49:54 +00:00
parent ea71aeb254
commit 330efd46fa
3 changed files with 93 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
release/scripts/bpymodules/dxfImportObjects.py
View File

@@ -162,8 +162,9 @@ class Line:
else:
self.color_index = BYLAYER
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.points = self.get_points(obj.data)
@@ -238,8 +239,8 @@ class LWpolyline:
self.flags = 0
self.closed = self.flags&1 # byte coded, 1 = closed, 128 = plinegen
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.points = self.get_points(obj.data)
self.extrusion = self.get_extrusion(obj.data)
@@ -341,8 +342,8 @@ class Polyline:
self.closed = self.flags&1 # byte coded, 1 = closed, 128 = plinegen
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.extrusion = self.get_extrusion(obj.data)
@@ -531,8 +532,8 @@ class Text:
else:
self.valignment = self.valignment[0]
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.loc = self.get_loc(obj.data, self.halignment, self.valignment)
self.extrusion = self.get_extrusion(obj.data)
@@ -638,8 +639,8 @@ class Mtext:
else:
self.line_space = self.line_space[0]
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.loc = self.get_loc(obj.data)
self.extrusion = self.get_extrusion(obj.data)
@@ -730,8 +731,8 @@ class Circle:
else:
self.color_index = BYLAYER
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.loc = self.get_loc(obj.data)
self.extrusion = self.get_extrusion(obj.data)
@@ -805,8 +806,8 @@ class Arc:
else:
self.color_index = BYLAYER
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.loc = self.get_loc(obj.data)
self.extrusion = self.get_extrusion(obj.data)
@@ -923,8 +924,8 @@ class Block:
else:
self.discription = ''
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.loc = self.get_loc(obj.data)
@@ -984,9 +985,9 @@ class Insert:
self.color_index = self.color_index[0]
else:
self.color_index = BYLAYER
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.loc = self.get_loc(obj.data)
self.scale = self.get_scale(obj.data)
self.rows, self.columns = self.get_array(obj.data)
@@ -1097,8 +1098,8 @@ class Ellipse:
else:
self.color_index = BYLAYER
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.loc = self.get_loc(obj.data)
self.major = self.get_major(obj.data)
self.extrusion = self.get_extrusion(obj.data)
@@ -1185,8 +1186,8 @@ class Face:
else:
self.color_index = BYLAYER
discard, self.layer = get_layer(obj.data)
obj.data.remove(discard)
discard, self.layer, discard_index = get_layer(obj.data)
del obj.data[discard_index]
self.points = self.get_points(obj.data)
@@ -1242,7 +1243,6 @@ class Face:
return "%s: layer - %s, points - %s" %(self.__class__.__name__, self.layer, self.points)
def get_name(data):
"""Get the name of an object from its object data.
@@ -1251,23 +1251,23 @@ def get_name(data):
name not None before using the returned values!
"""
value = None
for item in data:
for i, item in enumerate(data):
if item[0] == 2:
value = item[1]
break
return item, value
return item, value, i
def get_layer(data):
"""Expects object data as input.
Returns (entry, layer_name) where entry is the data item that provided the layer name.
Returns (entry, layer_name, entry_index) where entry is the data item that provided the layer name.
"""
value = None
for item in data:
for i, item in enumerate(data):
if item[0] == 8:
value = item[1]
break
return item, value
return item, value, i
# type to object map

15
release/scripts/bpymodules/dxfReader.py
View File

@@ -26,6 +26,9 @@
# ***** END GPL LICENCE BLOCK *****
# --------------------------------------------------------------------------
# development
#import dxfImportObjects
#reload(dxfImportObjects)
from dxfImportObjects import *
@@ -141,9 +144,9 @@ def handleObject(infile):
def handleTable(table, infile):
"""Special handler for dealing with nested table objects."""
item, name = get_name(table.data)
item, name, item_index = get_name(table.data)
if name: # We should always find a name
table.data.remove(item)
del table.data[item_index]
table.name = name.lower()
# This next bit is from handleObject
# handleObject should be generalized to work with any section like object
@@ -162,9 +165,9 @@ def handleTable(table, infile):
def handleBlock(block, infile):
"""Special handler for dealing with nested table objects."""
item, name = get_name(block.data)
item, name, item_index = get_name(block.data)
if name: # We should always find a name
block.data.remove(item)
del block.data[item_index]
block.name = name.lower()
# This next bit is from handleObject
# handleObject should be generalized to work with any section like object
@@ -302,9 +305,9 @@ def readDXF(filename):
if drawing:
drawing.name = filename
for obj in drawing.data:
item, name = get_name(obj.data)
item, name, item_index = get_name(obj.data)
if name:
obj.data.remove(item)
del obj.data[item_index]
obj.name = name.lower()
setattr(drawing, name.lower(), obj)
# Call the objectify function from dxfImportObjects to cast