From e958fe298a23189c77a57146e7c22179d826efe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20W=C3=BCst?= Date: Sun, 17 Nov 2013 20:12:57 +0100 Subject: changed unit calculation to regard doc unit (bzr r12817) --- share/extensions/hpgl_encoder.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'share') diff --git a/share/extensions/hpgl_encoder.py b/share/extensions/hpgl_encoder.py index b4191e7c0..e053751b9 100644 --- a/share/extensions/hpgl_encoder.py +++ b/share/extensions/hpgl_encoder.py @@ -62,13 +62,15 @@ class hpglEncoder: self.sizeY = 'False' self.dryRun = True self.lastPoint = [0, 0, 0] - self.scaleX = self.options.resolutionX / 90 # inch to pixels - self.scaleY = self.options.resolutionY / 90 # inch to pixels - self.options.offsetX = self.options.offsetX * 3.5433070866 * self.scaleX # mm to dots (plotter coordinate system) - self.options.offsetY = self.options.offsetY * 3.5433070866 * self.scaleY # mm to dots - self.options.overcut = self.options.overcut * 3.5433070866 * ((self.scaleX + self.scaleY) / 2) # mm to dots - self.options.toolOffset = self.options.toolOffset * 3.5433070866 * ((self.scaleX + self.scaleY) / 2) # mm to dots - self.options.flat = ((self.options.resolutionX + self.options.resolutionY) / 2) * self.options.flat / 1000 # scale flatness to resolution + 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 + 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.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 if self.options.mirrorX: @@ -83,8 +85,8 @@ class hpglEncoder: if viewBox: viewBox = string.split(viewBox, ' ') if viewBox[2] and viewBox[3]: - self.viewBoxTransformX = float(effect.unittouu(self.doc.get('width'))) / float(viewBox[2]) - self.viewBoxTransformY = float(effect.unittouu(self.doc.get('height'))) / float(viewBox[3]) + self.viewBoxTransformX = effect.unittouu(self.doc.get('width')) / effect.unittouu(viewBox[2]) + self.viewBoxTransformY = effect.unittouu(self.doc.get('height')) / effect.unittouu(viewBox[3]) def getHpgl(self): # dryRun to find edges -- cgit v1.2.3 From dcfb31842ef9a0c1f53ad65cd08188a7ba447b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20W=C3=BCst?= Date: Sun, 17 Nov 2013 20:13:45 +0100 Subject: added missing documentation (bzr r12818) --- share/extensions/hpgl_decoder.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/extensions/hpgl_decoder.py b/share/extensions/hpgl_decoder.py index 0af2d5f5f..96571df94 100644 --- a/share/extensions/hpgl_decoder.py +++ b/share/extensions/hpgl_decoder.py @@ -33,6 +33,8 @@ class hpglDecoder: "resolutionX":float "resolutionY":float "showMovements":bool + "docWidth":float + "docHeight":float ''' self.hpglString = hpglString self.options = options -- cgit v1.2.3 From 87006b84d98fe828a38069b0e706a55113acb736 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sun, 17 Nov 2013 23:32:04 +0100 Subject: adhere to Python "convention" of using double underscore to indicate class private members (bzr r12819) --- share/extensions/inkex.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 4542bc418..5333ef52b 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -269,11 +269,11 @@ class Effect: return 'px' #a dictionary of unit to user unit conversion factors - uuconv = {'in':90.0, 'pt':1.25, 'px':1, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866, + __uuconv = {'in':90.0, 'pt':1.25, 'px':1, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866, 'km':3543307.0866, 'pc':15.0, 'yd':3240 , 'ft':1080} def unittouu(self, string): '''Returns userunits given a string representation of units in another system''' - unit = re.compile('(%s)$' % '|'.join(self.uuconv.keys())) + unit = re.compile('(%s)$' % '|'.join(self.__uuconv.keys())) param = re.compile(r'(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)') p = param.match(string) @@ -284,16 +284,16 @@ class Effect: retval = 0.0 if u: try: - return retval * (self.uuconv[u.string[u.start():u.end()]] / self.uuconv[self.getDocumentUnit()]) + return retval * (self.__uuconv[u.string[u.start():u.end()]] / self.__uuconv[self.getDocumentUnit()]) except KeyError: pass else: # default assume 'px' unit - return retval / self.uuconv[self.getDocumentUnit()] + return retval / self.__uuconv[self.getDocumentUnit()] return retval def uutounit(self, val, unit): - return val / (self.uuconv[unit] / self.uuconv[self.getDocumentUnit()]) + return val / (self.__uuconv[unit] / self.__uuconv[self.getDocumentUnit()]) # vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 -- cgit v1.2.3 From 59d29d9954ee7e93872b8ccc994a001366c61c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20W=C3=BCst?= Date: Mon, 18 Nov 2013 22:29:32 +0100 Subject: removed access to private member, fixed dpi calculation (bzr r12821) --- share/extensions/hpgl_encoder.py | 13 ++++++------- share/extensions/plotter.py | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'share') 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 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 -- cgit v1.2.3 From 31874237bd212ff8a933da4b71aa33569a077501 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 19 Nov 2013 20:33:30 +0100 Subject: BalloonSymbols.svg rewritten. Balloon symbols should render properly in all browsers. (bzr r12825) --- share/symbols/BalloonSymbols.svg | 261 ++++++++++++++++++++------------------- 1 file changed, 136 insertions(+), 125 deletions(-) (limited to 'share') diff --git a/share/symbols/BalloonSymbols.svg b/share/symbols/BalloonSymbols.svg index 8c7e840e2..0244f2f3a 100644 --- a/share/symbols/BalloonSymbols.svg +++ b/share/symbols/BalloonSymbols.svg @@ -1,128 +1,139 @@ - + + Word Balloons + Ballons for holding text. + + + + image/svg+xml + + Word Balloons + 2013-04-22 + + + Martin Owens, Tavmjong Bah + + + + + Public Domain + + + English + + + word + balloon + comic + cartoon + speach + exclaim + + + + + + + + + + + + + + + Thought Balloon + + + + + + + + + + + + + Dream Speaking + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -Word Balloons - - -Exclaim Balloon - - - -Exclaim Balloon!! - -Speaking Dream - - - - - -Dream Speaking - - -Squared Balloon - - - - - -Squared Balloon - - -Rounded Balloon - - - - - -Rounded Balloon - - -Cricle Balloon - - - - - -Circle Balloon - - -Hip Balloon - - - - - -Hip Balloon - - -Electronic Balloon - - - - - -Over the Phone - - -Thought Balloon - - - - - -Think Balloon - - - - - - - - -image/svg+xml - -Word Balloons -2013-04-22 - - -Martin Owens - - - - -Public Domain - - -English - - -word -balloon -comic -cartoon -speach -exclaim - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3