[Ecell-cvs] SF.net SVN: ecell:[3838] ecell3/trunk/ecell/frontend/session-monitor

[<mor...@us...>]

Revision: 3838
          http://ecell.svn.sourceforge.net/ecell/?rev=3838&view=rev
Author:   moriyoshi
Date:     2010-05-31 07:38:49 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Get LoggerPolicyWindow working.  It turned out that it has never been working as expected.

Modified Paths:
--------------
    ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/GtkSessionMonitor.py
    ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggingPolicy.py
    ecell3/trunk/ecell/frontend/session-monitor/glade/LoggingPolicy.glade

Modified: ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/GtkSessionMonitor.py
===================================================================
--- ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/GtkSessionMonitor.py	2010-05-21 09:42:38 UTC (rev 3837)
+++ ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/GtkSessionMonitor.py	2010-05-31 07:38:49 UTC (rev 3838)
@@ -532,7 +532,6 @@
         """
         saves logging policy into config database
         """
-
         self.setParameter( 'logger_min_step', logPolicy[0] )
         self.setParameter( 'logger_min_interval', logPolicy[1] ) 
         self.setParameter( 'end_policy' , logPolicy[2] )

Modified: ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggingPolicy.py
===================================================================
--- ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggingPolicy.py	2010-05-21 09:42:38 UTC (rev 3837)
+++ ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggingPolicy.py	2010-05-31 07:38:49 UTC (rev 3838)
@@ -69,7 +69,7 @@
 			)
 		self.theSession = aSession
 		# Sets the return number
-		self.___num = CANCEL_PRESSED
+		self.___num = None
 
 		# Create the Dialog
 		self.win = gtk.Dialog("Logging Policy", None, gtk.DIALOG_MODAL)
@@ -113,16 +113,12 @@
 
 		# add handlers
 		self.addHandlers( {
-			"on_space_max_toggled" : self.__buttonChosen,
-			"on_space_no_limit_toggled" : self.__buttonChosen,
-			"on_end_overwrite_toggled" : self.__buttonChosen,
-			"on_end_throw_ex_toggled" : self.__buttonChosen,
-			"on_log_by_secs_toggled" : self.__buttonChosen,
-			"on_log_by_step_toggled" : self.__buttonChosen } )
+			"on_space_max_toggled" : self.__spaceLimitButtonChosen,
+			"on_space_no_limit_toggled" : self.__spaceNoLimitButtonChosen,
+			"on_log_by_secs_toggled" : self.__logBySecsButtonChosen,
+			"on_log_by_step_toggled" : self.__logByStepButtonChosen } )
 
-		gtk.main()
 
-
 	def openConfirmWindow(self,  aMessage, aTitle, isCancel = 1 ):
 		""" pops up a modal dialog window
 			with aTitle (str) as its title
@@ -202,20 +198,21 @@
 
 
 	# ==========================================================================
-	def __buttonChosen( self, *args ):
-		aName = args[0].get_name()
-		if aName == "log_by_secs":
-			self['second_entry'].set_sensitive( True )
-			self['step_entry'].set_sensitive( False )
-		elif aName == "log_by_step":
-			self['second_entry'].set_sensitive( False )
-			self['step_entry'].set_sensitive( True )
-		elif aName == "space_no_limit":
-			self['space_entry'].set_sensitive( False )
-		elif aName == "spac_max":
-			self['space_entry'].set_sensitive( True )
+	def __logBySecsButtonChosen( self, *args ):
+		self['second_entry'].set_sensitive( True )
+		self['step_entry'].set_sensitive( False )
 
+	def __logByStepButtonChosen( self, *args ):
+		self['second_entry'].set_sensitive( False )
+		self['step_entry'].set_sensitive( True )
 
+	def __spaceNoLimitButtonChosen( self, *args ):
+		self['space_entry'].set_sensitive( False )
+
+	def __spaceLimitButtonChosen( self, *args ):
+		self['space_entry'].set_sensitive( True )
+
+
 	# ==========================================================================
 	def oKButtonClicked( self, *arg ):
 		"""
@@ -237,7 +234,6 @@
 		"""
 
 		# set the return number
-		self.___num = None
 		self.destroy()
 	
 
@@ -254,5 +250,4 @@
 		"""destroy dialog
 		"""
 		self.win.hide()
-		gtk.mainquit()
 

Modified: ecell3/trunk/ecell/frontend/session-monitor/glade/LoggingPolicy.glade
===================================================================
--- ecell3/trunk/ecell/frontend/session-monitor/glade/LoggingPolicy.glade	2010-05-21 09:42:38 UTC (rev 3837)
+++ ecell3/trunk/ecell/frontend/session-monitor/glade/LoggingPolicy.glade	2010-05-31 07:38:49 UTC (rev 3838)
@@ -227,7 +227,6 @@
 		      <property name="active">False</property>
 		      <property name="inconsistent">False</property>
 		      <property name="draw_indicator">True</property>
-		      <signal name="toggled" handler="on_end_throw_ex_toggled" last_modification_time="Sat, 29 May 2004 12:31:19 GMT"/>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -247,7 +246,6 @@
 		      <property name="inconsistent">False</property>
 		      <property name="draw_indicator">True</property>
 		      <property name="group">end_throw_ex</property>
-		      <signal name="toggled" handler="on_end_overwrite_toggled" last_modification_time="Sat, 29 May 2004 12:31:26 GMT"/>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.