fixes in dxf2papercraft

This commit is contained in:
Mario Voigt 2021-05-06 16:00:57 +02:00
parent 88eb5d0a89
commit e6db17cdd3
4 changed files with 16 additions and 13 deletions

View File

@ -0,0 +1,4 @@
#VRML V1.0 ascii
Separator {
}

View File

@ -9,7 +9,7 @@
<param name="number" type="bool" gui-text="Print face numbers (labels)" gui-description="Disable this if you want to split custom faces">false</param> <param name="number" type="bool" gui-text="Print face numbers (labels)" gui-description="Disable this if you want to split custom faces">false</param>
<param name="divide" type="bool" gui-text="Draw each face separate">false</param> <param name="divide" type="bool" gui-text="Draw each face separate">false</param>
<param name="overlap" type="bool" gui-text="Allow overlapping faces in cut-out sheet">false</param> <param name="overlap" type="bool" gui-text="Allow overlapping faces in cut-out sheet">false</param>
<param name="hide" type="bool" gui-text="Hide glue tabs">false</param> <param name="hide" type="bool" gui-text="Hide glue tabs. Does not work if 'Print face numbers (labels)' is activated">false</param>
<param name="force" type="bool" gui-text="Force glue tabs, even if intersecting faces">false</param> <param name="force" type="bool" gui-text="Force glue tabs, even if intersecting faces">false</param>
<param name="split" type="string" gui-text="Comma separated list of face numbers to disconnect from the rest" gui-description="Enable face numbers tp have a view on it. If face number option is activated the splitting will not be performed!"></param> <param name="split" type="string" gui-text="Comma separated list of face numbers to disconnect from the rest" gui-description="Enable face numbers tp have a view on it. If face number option is activated the splitting will not be performed!"></param>
<param name="strategy" type="optiongroup" appearance="combo" gui-text="Generation strategy"> <param name="strategy" type="optiongroup" appearance="combo" gui-text="Generation strategy">

View File

@ -121,29 +121,28 @@ class PapercraftUnfold(inkex.EffectExtension):
p = etree.XMLParser(huge_tree=True) p = etree.XMLParser(huge_tree=True)
doc = etree.parse(stream, parser=etree.XMLParser(huge_tree=True)).getroot() doc = etree.parse(stream, parser=etree.XMLParser(huge_tree=True)).getroot()
stream.close() stream.close()
doc.set('id', self.svg.get_unique_id('dxf2papercraft-'))
self.document.getroot().append(doc) dxfGroup = inkex.Group(id=self.svg.get_unique_id("dxf2papercraft-"))
for element in doc.iter("{http://www.w3.org/2000/svg}g"):
#do some viewport adjustments if element.get('id') != "draft":
doc.set('width','') dxfGroup.append(element)
doc.set('height','') self.document.getroot().add(dxfGroup)
doc.set('viewBox','')
doc.getchildren()[1].set('transform','') #this removes the "transform:scale(1, -1)" from <svg:g id="draft"> child within dxf2papercraft-<id> group
#apply scale factor #apply scale factor
node = doc.getchildren()[1]
translation_matrix = [[self.options.scalefactor, 0.0, 0.0], [0.0, self.options.scalefactor, 0.0]] translation_matrix = [[self.options.scalefactor, 0.0, 0.0], [0.0, self.options.scalefactor, 0.0]]
node.transform = Transform(translation_matrix) * node.transform dxfGroup.transform = Transform(translation_matrix) * dxfGroup.transform
#Adjust viewport and width/height to have the import at the center of the canvas #Adjust viewport and width/height to have the import at the center of the canvas
if self.options.resizetoimport: if self.options.resizetoimport:
bbox = inkex.elements._selected.ElementList.bounding_box(node) bbox = dxfGroup.bounding_box() #does not work. why?
if bbox is not None: if bbox is not None:
root = self.svg.getElement('//svg:svg'); root = self.svg.getElement('//svg:svg');
offset = self.svg.unittouu(str(self.options.extraborder) + self.options.extraborder_units) offset = self.svg.unittouu(str(self.options.extraborder) + self.options.extraborder_units)
root.set('viewBox', '%f %f %f %f' % (bbox.left - offset, bbox.top - offset, bbox.width + 2 * offset, bbox.height + 2 * offset)) root.set('viewBox', '%f %f %f %f' % (bbox.left - offset, bbox.top - offset, bbox.width + 2 * offset, bbox.height + 2 * offset))
root.set('width', bbox.width + 2 * offset) root.set('width', bbox.width + 2 * offset)
root.set('height', bbox.height + 2 * offset) root.set('height', bbox.height + 2 * offset)
else:
self.msg("Error resizing to bounding box.")
if __name__ == '__main__': if __name__ == '__main__':
PapercraftUnfold().run() PapercraftUnfold().run()