From 4ed16744e8fe256cda65b7a64bce7c90807edfd3 Mon Sep 17 00:00:00 2001
From: age <bagel@systemausfall.org>
Date: Sat, 10 Jun 2006 12:18:28 +0000
Subject: [PATCH] thread bug gefixt

---
 WKNcharts/TODO                |   8 ++++----
 WKNcharts/WknCharts.py        |   3 +++
 WKNcharts/getWKNcharts.py     |  14 +++++++-------
 WKNcharts/wknGUI.py           |   1 +
 WKNcharts/wknGUI.pyc          | Bin 4561 -> 4561 bytes
 WKNcharts/wkncharts.glade.bak |   2 +-
 WKNcharts/wkns.txt            |   9 ++++++++-
 7 files changed, 24 insertions(+), 13 deletions(-)

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 add0ca025d7589d092afe82d6784d559847e86ef..a6f291893a4cf213489a49cd459c1df085ee7d86 100644
GIT binary patch
delta 62
zcmV-E0Kxy!Bhe!VJMs+*7`KYC2j2z(1GDD_JOcqQvm^=v0Rcg?CkqS$0Y|em4XgnH
UQj_5h)&W_wxDQ7G0T7ZA(N?t*ivR!s

delta 62
zcmV-E0Kxy!Bhe!VJMs+*3sZ@)2j2z(0<-4^JOcqPvm^=v0Rcd>CkqS$0Y<Yl4XgnH
UQIp{g)&W?vxDQ7G0S}T9(LUD_5&!@I

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 @@
 <glade-interface>
 
 <widget class="GtkWindow" id="window1">
-  <property name="width_request">300</property>
+  <property name="width_request">500</property>
   <property name="height_request">400</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">WKN Charts</property>
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