Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy Code To Follow PEP8 and work with FLAKE8 #106

Closed
wants to merge 4 commits into from
Closed

Tidy Code To Follow PEP8 and work with FLAKE8 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b290cdd
Tidied Code for PEP8
Richienb Jul 3, 2018
c809ec2
Tidied Code
Richienb Jul 7, 2018
015a9fe
Only Optimize Tests Folder And Fix PR Conflict
Richienb Jul 11, 2018
2130223
Merge branch 'master' into master
Richienb Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Demo/applet/deprecated/ButtonDemo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,28 @@

from java import awt, applet


class ButtonDemo(applet.Applet):
def init(self):
self.b1 = awt.Button('Disable middle button',
actionPerformed=self.disable)
self.b2 = awt.Button('Middle button')
self.b3 = awt.Button('Enable middle button',
enabled=0, actionPerformed=self.enable)
self.b1 = awt.Button('Disable middle button',
actionPerformed=self.disable)
self.b2 = awt.Button('Middle button')
self.b3 = awt.Button('Enable middle button',
enabled=0, actionPerformed=self.enable)

self.add(self.b1)
self.add(self.b2)
self.add(self.b3)
self.add(self.b1)
self.add(self.b2)
self.add(self.b3)

def enable(self, event):
self.b1.enabled = self.b2.enabled = 1
self.b3.enabled = 0
self.b1.enabled = self.b2.enabled = 1
self.b3.enabled = 0

def disable(self, event):
self.b1.enabled = self.b2.enabled = 0
self.b3.enabled = 1
self.b1.enabled = self.b2.enabled = 0
self.b3.enabled = 1


if __name__ == '__main__':
if __name__ == '__main__':
import pawt
pawt.test(ButtonDemo())
29 changes: 15 additions & 14 deletions Demo/applet/deprecated/ButtonFontDemo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,29 @@

from java import awt, applet


class ButtonFontDemo(applet.Applet):
def init(self):
self.font = awt.Font('Serif', 0, 24)
self.b1 = awt.Button('Disable middle button',
actionPerformed=self.disable)
self.b2 = awt.Button('Middle button')
self.b3 = awt.Button('Enable middle button',
enabled=0, actionPerformed=self.enable)
self.font = awt.Font('Serif', 0, 24)
self.b1 = awt.Button('Disable middle button',
actionPerformed=self.disable)
self.b2 = awt.Button('Middle button')
self.b3 = awt.Button('Enable middle button',
enabled=0, actionPerformed=self.enable)

self.add(self.b1)
self.add(self.b2)
self.add(self.b3)
self.add(self.b1)
self.add(self.b2)
self.add(self.b3)

def enable(self, event):
self.b1.enabled = self.b2.enabled = 1
self.b3.enabled = 0
self.b1.enabled = self.b2.enabled = 1
self.b3.enabled = 0

def disable(self, event):
self.b1.enabled = self.b2.enabled = 0
self.b3.enabled = 1
self.b1.enabled = self.b2.enabled = 0
self.b3.enabled = 1


if __name__ == '__main__':
if __name__ == '__main__':
import pawt
pawt.test(ButtonFontDemo())
42 changes: 21 additions & 21 deletions Demo/applet/deprecated/CheckboxDemo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,36 @@

from java import awt, applet


class CheckboxDemo(applet.Applet):
def init(self):
cb1 = awt.Checkbox('Checkbox 1')
cb2 = awt.Checkbox('Checkbox 2')
cb3 = awt.Checkbox('Checkbox 3', state=1)
cb1 = awt.Checkbox('Checkbox 1')
cb2 = awt.Checkbox('Checkbox 2')
cb3 = awt.Checkbox('Checkbox 3', state=1)

p1 = awt.Panel(layout=awt.FlowLayout())
p1 = awt.Panel(layout=awt.FlowLayout())

p1.add(cb1)
p1.add(cb2)
p1.add(cb3)
p1.add(cb1)
p1.add(cb2)
p1.add(cb3)

cbg = awt.CheckboxGroup()
cb4 = awt.Checkbox('Checkbox 4', cbg, 0)
cb5 = awt.Checkbox('Checkbox 5', cbg, 0)
cb6 = awt.Checkbox('Checkbox 6', cbg, 0)
cbg = awt.CheckboxGroup()
cb4 = awt.Checkbox('Checkbox 4', cbg, 0)
cb5 = awt.Checkbox('Checkbox 5', cbg, 0)
cb6 = awt.Checkbox('Checkbox 6', cbg, 0)

p2 = awt.Panel(layout=awt.FlowLayout())
p2.add(cb4)
p2.add(cb5)
p2.add(cb6)
p2 = awt.Panel(layout=awt.FlowLayout())
p2.add(cb4)
p2.add(cb5)
p2.add(cb6)

self.setLayout(awt.GridLayout(0, 2))
self.add(p1)
self.add(p2)
self.setLayout(awt.GridLayout(0, 2))
self.add(p1)
self.add(p2)

self.validate()
self.validate()


if __name__ == '__main__':
if __name__ == '__main__':
import pawt
pawt.test(CheckboxDemo())

21 changes: 11 additions & 10 deletions Demo/applet/deprecated/ChoiceDemo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@

from java import awt, applet

class ChoiceDemo(applet.Applet):

class ChoiceDemo(applet.Applet):
def init(self):
self.choices = awt.Choice(itemStateChanged = self.change)
for item in ['ichi', 'ni', 'san', 'yon']:
self.choices.addItem(item)
self.choices = awt.Choice(itemStateChanged=self.change)
for item in ['ichi', 'ni', 'san', 'yon']:
self.choices.addItem(item)

self.label = awt.Label()
self.change()
self.label = awt.Label()
self.change()

self.add(self.choices)
self.add(self.label)
self.add(self.choices)
self.add(self.label)

def change(self, event=None):
selection = self.choices.selectedIndex, self.choices.selectedItem
self.label.text = 'Item #%d selected. Text = "%s".' % selection
selection = self.choices.selectedIndex, self.choices.selectedItem
self.label.text = 'Item #%d selected. Text = "%s".' % selection


if __name__ == '__main__':
Expand Down
112 changes: 54 additions & 58 deletions Demo/applet/deprecated/Converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,102 +10,98 @@
from pawt import GridBag

basicUnits = [['Metric System', [('Centimeters', 0.01),
('Meters', 1.0),
('Kilometers', 1000.0)]],
['U.S. System', [('Inches', 0.0254),
('Feet', 0.305),
('Yards', 0.914),
('Miles', 1613.0)]]
]

('Meters', 1.0),
('Kilometers', 1000.0)]],
['U.S. System', [('Inches', 0.0254),
('Feet', 0.305),
('Yards', 0.914),
('Miles', 1613.0)]]
]


class SimpleBorder:
def paint(self, g):
g.drawRect(0,0,self.size.width-1, self.size.height-1)
g.drawRect(0, 0, self.size.width-1, self.size.height-1)

def getInsets(self):
return awt.Insets(5,5,5,5)

return awt.Insets(5, 5, 5, 5)


class Converter(Applet, SimpleBorder):
def init(self, unitSets=basicUnits):
self.setLayout(awt.GridLayout(2,0,5,5))
self.panels = []
for name, units in unitSets:
panel = ConversionPanel(name, units, self)
self.panels.append(panel)
self.add(panel)
self.setLayout(awt.GridLayout(2, 0, 5, 5))
self.panels = []
for name, units in unitSets:
panel = ConversionPanel(name, units, self)
self.panels.append(panel)
self.add(panel)

def convert(self, master):
value = master.getValue()
multiplier = master.getMultiplier()

for panel in self.panels:
if panel is not master:
panel.setValue(multiplier/panel.getMultiplier()*value)
value = master.getValue()
multiplier = master.getMultiplier()

for panel in self.panels:
if panel is not master:
panel.setValue(multiplier/panel.getMultiplier()*value)


class ConversionPanel(awt.Panel, SimpleBorder,
ActionListener, AdjustmentListener, ItemListener):
ActionListener, AdjustmentListener, ItemListener):
max, block = 10000, 100

def __init__(self, title, units, controller):
self.units = units
self.controller = controller
self.units = units
self.controller = controller

bag = GridBag(self, fill='HORIZONTAL')
bag = GridBag(self, fill='HORIZONTAL')

label = awt.Label(title, awt.Label.CENTER)
bag.addRow(label)
label = awt.Label(title, awt.Label.CENTER)
bag.addRow(label)

self.text = awt.TextField('0', 10, actionListener=self)
bag.add(self.text, weightx=1.0)
self.text = awt.TextField('0', 10, actionListener=self)
bag.add(self.text, weightx=1.0)

self.chooser = awt.Choice(itemListener=self)
for name, multiplier in units:
self.chooser.add(name)
bag.addRow(self.chooser)
self.chooser = awt.Choice(itemListener=self)
for name, multiplier in units:
self.chooser.add(name)
bag.addRow(self.chooser)

self.slider = awt.Scrollbar(awt.Scrollbar.HORIZONTAL,
maximum=self.max+10,
blockIncrement=self.block,
adjustmentListener=self)
bag.add(self.slider)
self.slider = awt.Scrollbar(awt.Scrollbar.HORIZONTAL,
maximum=self.max+10,
blockIncrement=self.block,
adjustmentListener=self)
bag.add(self.slider)

def getMultiplier(self):
return self.units[self.chooser.selectedIndex][1]
return self.units[self.chooser.selectedIndex][1]

def getValue(self):
try:
return float(self.text.getText())
except:
return 0.0
try:
return float(self.text.getText())
except:
return 0.0

def actionPerformed(self, e):
self.setSlider(self.getValue())
self.controller.convert(self)
self.setSlider(self.getValue())
self.controller.convert(self)

def itemStateChanged(self, e):
self.controller.convert(self)
self.controller.convert(self)

def adjustmentValueChanged(self, e):
self.text.setText(str(e.getValue()))
self.controller.convert(self)
self.text.setText(str(e.getValue()))
self.controller.convert(self)

def setValue(self, v):
self.text.setText(str(v))
self.setSlider(v)
self.text.setText(str(v))
self.setSlider(v)

def setSlider(self, f):
if f > self.max:
f = self.max
if f < 0:
f = 0
self.slider.value = int(f)

if f > self.max:
f = self.max
if f < 0:
f = 0
self.slider.value = int(f)


if __name__ == '__main__':
Expand Down
Loading