Skip to content

Commit

Permalink
Whitespace cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeremysanders
jeremysanders committed Mar 18, 2017
1 parent 6bd24b5 commit 0e978ad
Showing 1 changed file with 139 additions and 108 deletions.
247 changes: 139 additions & 108 deletions veusz/setting/collections.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,38 @@ class Line(Settings):
def __init__(self, name, **args):
Settings.__init__(self, name, **args)

self.add( setting.Color('color',
setting.Reference('/StyleSheet/Line/color'),
descr = _('Color of line'),
usertext=_('Color')) )
self.add( setting.DistancePt('width',
setting.Reference('/StyleSheet/Line/width'),
descr = _('Width of line'),
usertext=_('Width')) )
self.add( setting.LineStyle('style', 'solid',
descr = _('Line style'),
usertext=_('Style')) )
self.add( setting.Int( 'transparency', 0,
descr = _('Transparency percentage'),
usertext = _('Transparency'),
minval = 0,
maxval = 100 ) )
self.add( setting.Bool('hide', False,
descr = _('Hide the line'),
usertext=_('Hide')) )
self.add( setting.Color(
'color',
setting.Reference('/StyleSheet/Line/color'),
descr = _('Color of line'),
usertext = _('Color')) )
self.add( setting.DistancePt(
'width',
setting.Reference('/StyleSheet/Line/width'),
descr = _('Width of line'),
usertext = _('Width')) )
self.add( setting.LineStyle(
'style', 'solid',
descr = _('Line style'),
usertext = _('Style')) )
self.add( setting.Int(
'transparency', 0,
descr = _('Transparency percentage'),
usertext = _('Transparency'),
minval = 0,
maxval = 100 ) )
self.add( setting.Bool(
'hide', False,
descr = _('Hide the line'),
usertext = _('Hide')) )

def makeQPen(self, painter):
'''Make a QPen from the description.
This currently ignores the hide attribute
'''Make a QPen from the settings (ignoring hide).
'''

color = painter.docColor(self.color)
color = self.get('color').color(painter)
if self.transparency > 0:
color.setAlphaF( (100-self.transparency) / 100.)
color.setAlphaF((100-self.transparency) / 100.)
width = self.get('width').convert(painter)
style, dashpattern = setting.LineStyle._linecnvt[self.style]
pen = qt4.QPen( color, width, style )
Expand All @@ -82,21 +86,24 @@ def makeQPenWHide(self, painter):
class XYPlotLine(Line):
'''A plot line for plotting data, allowing histogram-steps
to be plotted.'''

def __init__(self, name, **args):
Line.__init__(self, name, **args)

self.add( setting.Choice('steps',
['off', 'left', 'centre', 'right',
'left-shift-points', 'right-shift-points',
'vcentre'],
'off',
descr=_('Plot horizontal steps '
'instead of a line'),
usertext=_('Steps')), 0 )
self.add( setting.Bool('bezierJoin', False,
descr=_('Connect points with a cubic Bezier curve'),
usertext=_('Bezier join')), 1 )
self.add( setting.Choice(
'steps',
[
'off', 'left', 'centre', 'right',
'left-shift-points', 'right-shift-points',
'vcentre'
],
'off',
descr = _('Plot 90 degree steps instead of a line'),
usertext = _('Steps')), 0 )
self.add( setting.Bool(
'bezierJoin', False,
descr=_('Connect points with a cubic Bezier curve'),
usertext = _('Bezier join')), 1 )
self.get('color').newDefault( Reference('../color') )

class MarkerLine(Line):
Expand All @@ -105,52 +112,60 @@ class MarkerLine(Line):
def __init__(self, name, **args):
Line.__init__(self, name, **args)

self.add( setting.Bool('scaleLine', True,
descr=_('Scale line width with marker if scaling'
' enabled'),
usertext=_('Scale')), 4 )
self.add( setting.Bool(
'scaleLine', True,
descr=_('Scale line width with marker if scaling'
' enabled'),
usertext=_('Scale')), 4 )

class ErrorBarLine(Line):
'''A line style for error bar plotting.'''

def __init__(self, name, **args):
Line.__init__(self, name, **args)

self.add( setting.Float('endsize', 1.0,
minval = 0.,
descr=_('Scale ends of error bars by this factor'),
usertext = _('End size')) )
self.add( setting.Bool('hideHorz', False,
descr = _('Hide horizontal errors'),
usertext=_('Hide horz.')) )
self.add( setting.Bool('hideVert', False,
descr = _('Hide vertical errors'),
usertext=_('Hide vert.')) )
self.add( setting.Float(
'endsize', 1.0,
minval = 0.,
descr = _('Scale ends of error bars by this factor'),
usertext = _('End size')) )
self.add( setting.Bool(
'hideHorz', False,
descr = _('Hide horizontal errors'),
usertext = _('Hide horz.')) )
self.add( setting.Bool(
'hideVert', False,
descr = _('Hide vertical errors'),
usertext=_('Hide vert.')) )

class Brush(Settings):
'''Settings of a fill.'''

def __init__(self, name, **args):
Settings.__init__(self, name, **args)

self.add( setting.Color( 'color', 'black',
descr = _('Fill colour'),
usertext=_('Color')) )
self.add( setting.FillStyle( 'style', 'solid',
descr = _('Fill style'),
usertext=_('Style')) )
self.add( setting.Int( 'transparency', 0,
descr = _('Transparency percentage'),
usertext = _('Transparency'),
minval = 0,
maxval = 100 ) )
self.add( setting.Bool( 'hide', False,
descr = _('Hide the fill'),
usertext=_('Hide')) )
self.add( setting.Color(
'color', 'foreground',
descr = _('Fill colour'),
usertext = _('Color')) )
self.add( setting.FillStyle(
'style', 'solid',
descr = _('Fill style'),
usertext = _('Style')) )
self.add( setting.Int(
'transparency', 0,
descr = _('Transparency percentage'),
usertext = _('Transparency'),
minval = 0,
maxval = 100 ) )
self.add( setting.Bool(
'hide', False,
descr = _('Hide the fill'),
usertext = _('Hide')) )

def makeQBrush(self, painter):
'''Make a QBrush from the settings.'''
color = painter.docColor(self.color)
color = self.get('color').color(painter)
if self.transparency > 0:
color.setAlphaF((100-self.transparency) / 100.)
return qt4.QBrush(color, self.get('style').qtStyle())
Expand All @@ -169,7 +184,7 @@ def __init__(self, name, **args):
Settings.__init__(self, name, **args)

self.add( setting.Color(
'color', 'black',
'color', 'foreground',
descr = _('Fill colour'),
usertext=_('Color')) )
self.add( setting.FillStyleExtended(
Expand Down Expand Up @@ -201,7 +216,7 @@ def __init__(self, name, **args):
descr = _('Hatch or pattern spacing'),
usertext = _('Spacing')) )
self.add( setting.Color(
'backcolor', 'white',
'backcolor', 'background',
descr = _('Hatch or pattern background color'),
usertext = _('Back color') ) )
self.add( setting.Int(
Expand All @@ -221,23 +236,23 @@ class KeyBrush(BrushExtended):
def __init__(self, name, **args):
BrushExtended.__init__(self, name, **args)

self.get('color').newDefault('white')
self.get('color').newDefault('background')

class BoxPlotMarkerFillBrush(Brush):
'''Fill used for points on box plots.'''

def __init__(self, name, **args):
Brush.__init__(self, name, **args)

self.get('color').newDefault('white')
self.get('color').newDefault('background')

class GraphBrush(BrushExtended):
'''Fill used for back of graph.'''

def __init__(self, name, **args):
BrushExtended.__init__(self, name, **args)

self.get('color').newDefault('white')
self.get('color').newDefault('background')

class PlotterFill(BrushExtended):
'''Filling used for filling on plotters.'''
Expand All @@ -262,7 +277,7 @@ def __init__(self, name, **args):
self.get('color').newDefault('grey')

self.add( setting.Choice(
'fillto',
'fillto',
['top', 'bottom', 'left', 'right'],
'top',
descr=_('Edge to fill towards'),
Expand All @@ -280,16 +295,16 @@ def __init__(self, name, **args):
BrushExtended.__init__(self, name, **args)

self.get('hide').newDefault(True)
self.get('color').newDefault('white')
self.get('color').newDefault('background')

class ArrowFill(Brush):
"""Brush for filling arrow heads"""
def __init__(self, name, **args):
Brush.__init__(self, name, **args)

self.get('color').newDefault( setting.Reference(
'../Line/color') )

class Text(Settings):
'''Text settings.'''

Expand All @@ -301,24 +316,37 @@ class Text(Settings):
def __init__(self, name, **args):
Settings.__init__(self, name, **args)

self.add( setting.FontFamily('font',
setting.Reference('/StyleSheet/Font/font'),
descr = _('Font name'),
usertext=_('Font')) )
self.add( setting.DistancePt('size',
setting.Reference('/StyleSheet/Font/size'),
descr = _('Font size'), usertext=_('Size') ) )
self.add( setting.Color( 'color',
setting.Reference('/StyleSheet/Font/color'),
descr = _('Font color'), usertext=_('Color') ) )
self.add( setting.Bool( 'italic', False,
descr = _('Italic font'), usertext=_('Italic') ) )
self.add( setting.Bool( 'bold', False,
descr = _('Bold font'), usertext=_('Bold') ) )
self.add( setting.Bool( 'underline', False,
descr = _('Underline font'), usertext=_('Underline') ) )
self.add( setting.Bool( 'hide', False,
descr = _('Hide the text'), usertext=_('Hide')) )
self.add( setting.FontFamily(
'font',
setting.Reference('/StyleSheet/Font/font'),
descr = _('Font name'),
usertext = _('Font')) )
self.add( setting.DistancePt(
'size',
setting.Reference('/StyleSheet/Font/size'),
descr = _('Font size'),
usertext = _('Size') ) )
self.add( setting.Color(
'color',
setting.Reference('/StyleSheet/Font/color'),
descr = _('Font color'),
usertext = _('Color') ) )
self.add( setting.Bool(
'italic', False,
descr = _('Italic font'),
usertext = _('Italic') ) )
self.add( setting.Bool(
'bold', False,
descr = _('Bold font'),
usertext = _('Bold') ) )
self.add( setting.Bool(
'underline', False,
descr = _('Underline font'),
usertext = _('Underline') ) )
self.add( setting.Bool(
'hide', False,
descr = _('Hide the text')
usertext = _('Hide')) )

def copy(self):
"""Make copy of settings."""
Expand All @@ -329,7 +357,7 @@ def copy(self):

def makeQFont(self, painthelper):
'''Return a qt4.QFont object corresponding to the settings.'''

size = self.get('size').convertPts(painthelper)
weight = qt4.QFont.Normal
if self.bold:
Expand All @@ -345,27 +373,30 @@ def makeQFont(self, painthelper):
def makeQPen(self):
""" Return a qt4.QPen object for the font pen """
return qt4.QPen(qt4.QColor(self.color))

class PointLabel(Text):
"""For labelling points on plots."""

def __init__(self, name, **args):
Text.__init__(self, name, **args)

self.add( setting.Float('angle', 0.,
descr=_('Angle of the labels in degrees'),
usertext=_('Angle'),
formatting=True), 0 )
self.add( setting.AlignVert('posnVert',
'centre',
descr=_('Vertical position of label'),
usertext=_('Vert position'),
formatting=True), 0 )
self.add( setting.AlignHorz('posnHorz',
'right',
descr=_('Horizontal position of label'),
usertext=_('Horz position'),
formatting=True), 0 )

self.add( setting.Float(
'angle', 0.,
descr = _('Angle of the labels in degrees'),
usertext = _('Angle'),
formatting = True), 0 )
self.add( setting.AlignVert(
'posnVert',
'centre',
descr = _('Vertical position of label'),
usertext = _('Vert position'),
formatting = True), 0 )
self.add( setting.AlignHorz(
'posnHorz',
'right',
descr = _('Horizontal position of label'),
usertext = _('Horz position'),
formatting = True), 0 )

class MarkerColor(Settings):
"""Settings for a coloring points using data values."""
Expand Down

0 comments on commit 0e978ad

Please sign in to comment.