diff options
| author | Sebastian Wüst <sebi@timewaster.de> | 2013-11-18 21:29:32 +0000 |
|---|---|---|
| committer | Sebastian Wüst <sebi@timewaster.de> | 2013-11-18 21:29:32 +0000 |
| commit | 59d29d9954ee7e93872b8ccc994a001366c61c10 (patch) | |
| tree | b39be8681b7879725bc89bfa6d2e8871727756fc | |
| parent | i18n. Fix for Bug #1252229 (As for the verb name XXX (No preferences), XXX ar... (diff) | |
| download | inkscape-59d29d9954ee7e93872b8ccc994a001366c61c10.tar.gz inkscape-59d29d9954ee7e93872b8ccc994a001366c61c10.zip | |
removed access to private member, fixed dpi calculation
(bzr r12821)
| -rw-r--r-- | share/extensions/hpgl_encoder.py | 13 | ||||
| -rw-r--r-- | share/extensions/plotter.py | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/share/extensions/hpgl_encoder.py b/share/extensions/hpgl_encoder.py index e053751b9..692f11cd4 100644 --- a/share/extensions/hpgl_encoder.py +++ b/share/extensions/hpgl_encoder.py @@ -62,14 +62,13 @@ class hpglEncoder: self.sizeY = 'False' self.dryRun = True self.lastPoint = [0, 0, 0] - self.scaleX = self.options.resolutionX / effect.uuconv['in'] * effect.uuconv[effect.getDocumentUnit()] # inch to document unit - self.scaleY = self.options.resolutionY / effect.uuconv['in'] * effect.uuconv[effect.getDocumentUnit()] # inch to document unit - mmToDocUnit = effect.uuconv['mm'] / effect.uuconv[effect.getDocumentUnit()] - self.options.offsetX = self.options.offsetX * mmToDocUnit * self.scaleX # mm to dots (plotter coordinate system) - self.options.offsetY = self.options.offsetY * mmToDocUnit * self.scaleY # mm to dots + self.scaleX = self.options.resolutionX / effect.unittouu("1.0in") # dots per inch to dots per user unit + self.scaleY = self.options.resolutionY / effect.unittouu("1.0in") # dots per inch to dots per user unit scaleXY = (self.scaleX + self.scaleY) / 2 - self.options.overcut = self.options.overcut * mmToDocUnit * scaleXY # mm to dots - self.options.toolOffset = self.options.toolOffset * mmToDocUnit * scaleXY # mm to dots + self.options.offsetX = effect.unittouu(str(self.options.offsetX) + "mm") * self.scaleX # mm to dots (plotter coordinate system) + self.options.offsetY = effect.unittouu(str(self.options.offsetY) + "mm") * self.scaleY # mm to dots + self.options.overcut = effect.unittouu(str(self.options.overcut) + "mm") * scaleXY # mm to dots + self.options.toolOffset = effect.unittouu(str(self.options.toolOffset) + "mm") * scaleXY # mm to dots self.options.flat = self.options.flat / (1016 / ((self.options.resolutionX + self.options.resolutionY) / 2)) # scale flatness to resolution self.toolOffsetFlat = self.options.flat / self.options.toolOffset * 4.5 # scale flatness to offset self.mirrorX = 1.0 diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index f57057435..78d480f05 100644 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -79,6 +79,7 @@ class MyEffect(inkex.Effect): raise ValueError, ('', type, value), traceback # TODO: Get preview to work. This requires some work on the C++ side to be able to determine if it is # a preview or a final run. (Remember to set <effect needs-live-preview='false'> to true) + # This outcommented code has a user unit issue (getSvg produces px, docWidth could be mm or something else) ''' # reparse data for preview self.options.showMovements = True |