[Pymoul-svn] SF.net SVN: pymoul: [179] pymoul/trunk/src/moul

[<ti...@us...>]

Revision: 179
          http://pymoul.svn.sourceforge.net/pymoul/?rev=179&view=rev
Author:   tiran
Date:     2007-02-19 10:27:50 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
More time stuff

Modified Paths:
--------------
    pymoul/trunk/src/moul/qt/dninumbers.py
    pymoul/trunk/src/moul/qt/mainwindow.py
    pymoul/trunk/src/moul/time/dni.py

Modified: pymoul/trunk/src/moul/qt/dninumbers.py
===================================================================
--- pymoul/trunk/src/moul/qt/dninumbers.py	2007-02-19 16:37:51 UTC (rev 178)
+++ pymoul/trunk/src/moul/qt/dninumbers.py	2007-02-19 18:27:50 UTC (rev 179)
@@ -66,16 +66,22 @@
         self.dnitime_timer.setInterval(FACTOR_SP*1000+60) # XXX: smooth
 
         # time zone
-        # TODO: change timer from every second to every minute
+        # TODO: change timer from every second to once a minute?
         self.timezone_timer = QtCore.QTimer(self.context)
         self.timezone_timer.setInterval(1000) # 1 sec
-        # TODO: needs optimization? run only when timer tab is active
+        ct = self.caverntime.info()
+        off = ct['cavern']['utcoffset']
+        self.lb_cavern_utc.setText("UTC %s%i" % (off[0], abs(off[1])))
+        off = ct['pacific']['utcoffset']
+        self.lb_pacific_utc.setText("UTC %s%i" % (off[0], abs(off[1])))
+
         self.connect(self.timezone_timer, SIGNAL('timeout()'),
                      self.on_timezone_timer_timeout)
         self.connect(self.dnitime_timer, SIGNAL('timeout()'),
                      self.clockscene.timeEvent)
         self.connect(self.context, SIGNAL("timerEnable(bool)"),
                      self.on_timer_timerEnable)
+        # TODO: needs optimization? run only when timer tab is active
         self.emit(SIGNAL("timerEnable(bool)"), True)
 
     @pyqtSignature("bool")
@@ -90,23 +96,6 @@
             else:
                 timer.stop()
 
-    def timezone_update(self):
-        """
-        Update datetime widgets
-        """
-        ct = self.caverntime.info()
-
-        self.dt_cavern.setDateTime(ct['cavern']['datetime'])
-        self.dt_pacific.setDateTime(ct['pacific']['datetime'])
-
-        off = ct['cavern']['utcoffset']
-        txt = "UTC %s%i" % (off[0], abs(off[1]))
-        self.lb_cavern_utc.setText(QtCore.QString(txt))
-
-        off = ct['pacific']['utcoffset']
-        txt = "UTC %s%i" % (off[0], abs(off[1]))
-        self.lb_pacific_utc.setText(QtCore.QString(txt))
-
     @pyqtSignature("")
     @skipLogging
     def on_timezone_timer_timeout(self):
@@ -451,7 +440,7 @@
 
         self.clocktext.setPlainText(str(self.dnitime))
 
-        self.circle.setPahrtovo(dnitime.pahrtovo + dnitime.tahvo / 5.0)
+        self.circle.setPahrtovo(dnitime.getPahrtovoFraction())
 
         hahr = decimal2dni(dnitime.hahr, digits=3)
         self.hahrl.setNumber(hahr[0])

Modified: pymoul/trunk/src/moul/qt/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-19 16:37:51 UTC (rev 178)
+++ pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-19 18:27:50 UTC (rev 179)
@@ -130,10 +130,9 @@
         @param event: close event
         @type event: QCloseEvent instance
         """
-        accept = self.handleDirtyOnClose()
-        if accept:
-           self._systray_close()
-           self._moulrunning_thread.terminate()
+        if self.handleDirtyOnClose():
+           #self._systray_close()
+           #self._moulrunning_thread.terminate()
            event.accept()
         else:
             event.ignore()

Modified: pymoul/trunk/src/moul/time/dni.py
===================================================================
--- pymoul/trunk/src/moul/time/dni.py	2007-02-19 16:37:51 UTC (rev 178)
+++ pymoul/trunk/src/moul/time/dni.py	2007-02-19 18:27:50 UTC (rev 179)
@@ -298,6 +298,11 @@
         return (self._prorahn // PRORAHN_PER_PAHRTOVO) % 25
     pahrtovo = property(_getPahrtovo)
 
+    def getPahrtovoFraction(self):
+        """Get Pahrtovo with decimal fraction
+        """
+        return ((self._prorahn // PRORAHN_PER_TAHVO) % 125) / 5.0
+
     def _getTahvo(self):
         return (self._prorahn // PRORAHN_PER_TAHVO) % 25
     @valueCheck(int, 0, 25)


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