From be671859e75a9c22e99619a8b9ae255d11e4ab87 Mon Sep 17 00:00:00 2001 From: steffen123 Date: Sun, 11 Jul 2010 05:58:00 +0200 Subject: [PATCH] create superclasses for Gui*PlayerStats and *Filters --- pyfpdb/Filters.py | 22 ++++++++++++++++++++++ pyfpdb/GuiPlayerStats.py | 22 ++++++++++++++++++++++ pyfpdb/GuiRingPlayerStats.py | 3 ++- pyfpdb/GuiTourneyPlayerStats.py | 3 ++- pyfpdb/RingFilters.py | 4 ++-- pyfpdb/TourneyFilters.py | 3 ++- 6 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 pyfpdb/Filters.py create mode 100644 pyfpdb/GuiPlayerStats.py diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py new file mode 100644 index 00000000..b211b698 --- /dev/null +++ b/pyfpdb/Filters.py @@ -0,0 +1,22 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +#Copyright 2010 Steffen Schaumburg +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in agpl-3.0.txt. + +import threading + +class Filters(threading.Thread): + pass +#end class Filters diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py new file mode 100644 index 00000000..34e8e122 --- /dev/null +++ b/pyfpdb/GuiPlayerStats.py @@ -0,0 +1,22 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +#Copyright 2010 Steffen Schaumburg +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as published by +#the Free Software Foundation, version 3 of the License. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see . +#In the "official" distribution you can find the license in agpl-3.0.txt. + +import threading + +class GuiPlayerStats(threading.Thread): + pass +#end class GuiPlayerStats diff --git a/pyfpdb/GuiRingPlayerStats.py b/pyfpdb/GuiRingPlayerStats.py index 68878606..29aaf44c 100644 --- a/pyfpdb/GuiRingPlayerStats.py +++ b/pyfpdb/GuiRingPlayerStats.py @@ -29,11 +29,12 @@ import fpdb_import import Database import RingFilters import Charset +import GuiPlayerStats colalias,colshow,colheading,colxalign,colformat,coltype = 0,1,2,3,4,5 ranks = {'x':0, '2':2, '3':3, '4':4, '5':5, '6':6, '7':7, '8':8, '9':9, 'T':10, 'J':11, 'Q':12, 'K':13, 'A':14} -class GuiRingPlayerStats (threading.Thread): +class GuiRingPlayerStats (GuiPlayerStats.GuiPlayerStats): def __init__(self, config, querylist, mainwin, debug=True): self.debug = debug diff --git a/pyfpdb/GuiTourneyPlayerStats.py b/pyfpdb/GuiTourneyPlayerStats.py index 2d901c94..2ce1e2bb 100644 --- a/pyfpdb/GuiTourneyPlayerStats.py +++ b/pyfpdb/GuiTourneyPlayerStats.py @@ -29,10 +29,11 @@ from time import time, strftime #import Database import Charset import TourneyFilters +import GuiPlayerStats colalias,colshow,colheading,colxalign,colformat,coltype = 0,1,2,3,4,5 -class GuiTourneyPlayerStats (threading.Thread): +class GuiTourneyPlayerStats (GuiPlayerStats.GuiPlayerStats): def __init__(self, config, db, sql, mainwin, debug=True): self.conf = config self.db = db diff --git a/pyfpdb/RingFilters.py b/pyfpdb/RingFilters.py index 44fc790a..8c8eae2f 100644 --- a/pyfpdb/RingFilters.py +++ b/pyfpdb/RingFilters.py @@ -35,9 +35,9 @@ import Configuration import Database import SQL import Charset +import Filters - -class RingFilters(threading.Thread): +class RingFilters(Filters.Filters): def __init__(self, db, config, qdict, display = {}, debug=True): # config and qdict are now redundant self.debug = debug diff --git a/pyfpdb/TourneyFilters.py b/pyfpdb/TourneyFilters.py index 36039a4c..977c94ec 100644 --- a/pyfpdb/TourneyFilters.py +++ b/pyfpdb/TourneyFilters.py @@ -34,8 +34,9 @@ log = logging.getLogger("filter") #import Database #import SQL import Charset +import Filters -class TourneyFilters(threading.Thread): +class TourneyFilters(Filters.Filters): def __init__(self, db, config, qdict, display = {}, debug=True): self.debug = debug self.db = db