diff --git a/WKNcharts/TODO b/WKNcharts/TODO index 9295a3a..7b59164 100644 --- a/WKNcharts/TODO +++ b/WKNcharts/TODO @@ -1,13 +1,13 @@ -##TODO fuer WKNcharts 02006-06 - += TODO = +[ ] download abbrechenbar machen [ ] intervallcheckboxen auswerten [ ] zielverzeichnis auswerten [ ] dateinamen besser vergeben [ ] datum einbringen [ ] bilder im programm anzeigen -[!] loggen in threads erzeugt Speicherzugriffsfehler - += DONE = +[*] loggen in threads erzeugt Speicherzugriffsfehler ----- diff --git a/WKNcharts/WknCharts.py b/WKNcharts/WknCharts.py index 60032d2..054749e 100755 --- a/WKNcharts/WknCharts.py +++ b/WKNcharts/WknCharts.py @@ -18,8 +18,11 @@ class WknCharts: import wknGUI wg = wknGUI.WknGUI(gtk) + # this is necessary for using threads later gtk.gdk.threads_init() + gtk.gdk.threads_enter() gtk.main() + gtk.gdk.threads_leave() if __name__ == "__main__": wc = WknCharts() diff --git a/WKNcharts/getWKNcharts.py b/WKNcharts/getWKNcharts.py index e709e18..632aded 100755 --- a/WKNcharts/getWKNcharts.py +++ b/WKNcharts/getWKNcharts.py @@ -46,28 +46,28 @@ class WKNCharts: }) #print "ich hole jetzt \"%s\" %i:" % (self.wkn_dict[wkn], time) #print host + params - self.gui.add_log(host + params) + self.gui.add_log("%s %s" % (host, params)) try: + ''' f = urllib.urlopen(host + params) png = open("images/"+self.wkn_dict[wkn]+str(time)+".png", "w") png.write(f.read()) png.close() + ''' + import time + time.sleep(2) except IOError, e: - #self.gui.add_log(e) print e def set_times(self, times): self.times = times - def getallcharts(self, gui): + def getallcharts(self, gui) : self.gui = gui for wkn in self.wkn_dict.keys(): + self.gui.add_log("hole: %s (%s)" % (self.wkn_dict[wkn], wkn)) for time in self.times: - #gui.gtk.gdk.threads_enter() - ##TODO: logbuch killt den thread - ##gui.add_log("hole: %s %i" % (wkn, time)) self.getchart(wkn, time) - #gui.gtk.gdk.threads_leave() print "Download fertig" return diff --git a/WKNcharts/wknGUI.py b/WKNcharts/wknGUI.py index cacfed5..ae9b532 100644 --- a/WKNcharts/wknGUI.py +++ b/WKNcharts/wknGUI.py @@ -38,6 +38,7 @@ class WknGUI: charts.set_times([30, 300]) self.add_log("beginne Download der WKNS") ## downlaoding in threads, so the gui won't hang + ## giving it 'self', so that it can use the logging window Thread(target=charts.getallcharts,args=(self,)).start() ## unthreaded version #charts.getallcharts(self) diff --git a/WKNcharts/wknGUI.pyc b/WKNcharts/wknGUI.pyc index add0ca0..a6f2918 100644 Binary files a/WKNcharts/wknGUI.pyc and b/WKNcharts/wknGUI.pyc differ diff --git a/WKNcharts/wkncharts.glade.bak b/WKNcharts/wkncharts.glade.bak index 225ff2e..acd4ac4 100644 --- a/WKNcharts/wkncharts.glade.bak +++ b/WKNcharts/wkncharts.glade.bak @@ -4,7 +4,7 @@ - 300 + 500 400 True WKN Charts diff --git a/WKNcharts/wkns.txt b/WKNcharts/wkns.txt index f5062f4..520dd3e 100644 --- a/WKNcharts/wkns.txt +++ b/WKNcharts/wkns.txt @@ -1,2 +1,9 @@ 881823 samsung -661823 sumsang +621823 sumsang +631823 sumsang +841823 samsung +181823 samsung +851823 samsung +666823 sumsang +663823 sumsang +661323 sumsang