[Pymoul-svn] SF.net SVN: pymoul: [189] pymoul/trunk/src/moul
Status: Alpha
Brought to you by:
tiran
Menu
▾
▴
[Pymoul-svn] SF.net SVN: pymoul: [189] pymoul/trunk/src/moul
|
From: <ti...@us...> - 2007-02-23 18:34:12
|
Revision: 189
http://pymoul.svn.sourceforge.net/pymoul/?rev=189&view=rev
Author: tiran
Date: 2007-02-23 10:34:10 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
Some fixes for the new time tab
Modified Paths:
--------------
pymoul/trunk/src/moul/qt/dninumbers.py
pymoul/trunk/src/moul/qt/ui/mainwindow.py
pymoul/trunk/src/moul/qt/ui/mainwindow.ui
pymoul/trunk/src/moul/qt/utils.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-23 16:45:46 UTC (rev 188)
+++ pymoul/trunk/src/moul/qt/dninumbers.py 2007-02-23 18:34:10 UTC (rev 189)
@@ -100,7 +100,7 @@
self.connect(self.context, SIGNAL("timerEnable(bool)"),
self.on_timer_timerEnable)
# TODO: needs optimization? run only when timer tab is active
- for name in ('sb_hahr', 'sb_yahr', 'sb_gahrtahvo',
+ for name in ('sb_hahr', 'sb_yahr', 'sb_gahrtahvo',
'sb_tahvo', 'sb_gorahn', 'sb_prorahn'):
self.connect(getattr(self, name), SIGNAL("valueChanged(int)"),
self.update_dni)
@@ -140,6 +140,7 @@
self.dnitime.fromUTC()
self.clockscene.setClockFromDniTime(self.dnitime)
self.setWidgetDniTime(self.dnitime)
+ self.dte_earthtime.setDateTime(dt2qdt(self.dnitime.toUTC()))
@pyqtSignature("bool")
def on_rb_curtime_clicked(self, value):
@@ -150,45 +151,49 @@
def on_rb_earthtime_clicked(self, value):
if value:
self.emit(SIGNAL("timerEnable(bool)"), False)
- self.update_earthtime(self.dte_earthtime.dateTime())
+ self.update_earthtime()
@pyqtSignature("bool")
def on_rb_dnitime_clicked(self, value):
if value:
self.emit(SIGNAL("timerEnable(bool)"), False)
+ self.update_dni()
@pyqtSignature("bool")
- def on_rb_dniholiday_clicked(self, value):
+ def on_rb_dniholidays_clicked(self, value):
if value:
self.emit(SIGNAL("timerEnable(bool)"), False)
+ self.update_dniholidays()
@pyqtSignature("int")
- def on_sb_fahrah_valueChanged(self, value):
+ def on_sb_fahrah_valueChanged(self, fahrah):
hahr = self.sb_fahrah_hahr.value()
- self.sb_hahr.setValue(value * 625 + hahr)
+ self.sb_hahr.setValue(fahrah * 625 + hahr)
@pyqtSignature("int")
- def on_sb_fahrah_hahr_valueChanged(self, value):
+ def on_sb_fahrah_hahr_valueChanged(self, hahr):
fahrah = self.sb_fahrah.value()
- self.sb_hahr.setValue(fahrah * 625 + value)
+ self.sb_hahr.setValue(fahrah * 625 + hahr)
@pyqtSignature("int")
def on_sb_hahr_valueChanged(self, value):
fahrah = value // 625
- hahr = value - fahrah * 625
+ hahr = value - (fahrah * 625)
+ print fahrah, hahr
self.sb_fahrah_hahr.setValue(hahr)
self.sb_fahrah.setValue(fahrah)
@pyqtSignature("int")
def on_cb_dniholidays_currentIndexChanged(self, idx):
- self.rb_dniholidays.setChecked(True)
+ if self.rb_dniholidays.isChecked():
+ self.update_dniholidays()
@pyqtSignature("const QDateTime &")
def on_dte_earthtime_dateTimeChanged(self, qdt):
- self.rb_earthtime.setChecked(True)
- self.update_earthtime(qdt)
+ if self.rb_earthtime.isChecked():
+ self.update_earthtime()
- def update_dni(self, ignored=None):
+ def update_dni(self):
"""Update view from D'ni time widgets
"""
if not self.rb_dnitime.isChecked():
@@ -197,15 +202,15 @@
self.clockscene.setClockFromDniTime(self.dnitime)
self.dte_earthtime.setDateTime(dt2qdt(self.dnitime.toUTC()))
- def update_earthtime(self, qdt):
+ def update_earthtime(self):
"""Update view from earth time widget
"""
- dt = qdt2dt(qdt)
+ dt = qdt2dt(self.dte_earthtime.dateTime())
self.dnitime.fromUTC(dt)
self.clockscene.setClockFromDniTime(self.dnitime)
self.setWidgetDniTime(self.dnitime)
- def update_holiday(self, idx):
+ def update_dniholidays(self):
"""Update view from D'ni holiday widget
"""
@@ -615,7 +620,13 @@
painter.restore()
# outer circle
+ painter.save()
+ pen = QtGui.QPen(Qt.black)
+ pen.setWidthF(1.5)
+ pen.setCapStyle(Qt.RoundCap)
+ painter.setPen(pen)
painter.drawEllipse(self.outrect)
+ painter.restore()
# inner dot
painter.save()
painter.setBrush(QtGui.QColor(Qt.black))
@@ -654,10 +665,10 @@
painter.drawPixmap(posx, posy, pm)
#painter.restore()
- # pointer
+ # hand
painter.save()
pen = QtGui.QPen(Qt.black)
- pen.setWidth(2)
+ pen.setWidthF(2.5)
pen.setCapStyle(Qt.RoundCap)
painter.setPen(pen)
rot = self.angel * self._pahrtovo + self.offset
Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-02-23 16:45:46 UTC (rev 188)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-02-23 18:34:10 UTC (rev 189)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file './src/moul/qt/ui/mainwindow.ui'
#
-# Created: Fri Feb 23 05:05:02 2007
+# Created: Fri Feb 23 19:22:27 2007
# by: PyQt4 UI code generator 4.1.1
#
# WARNING! All changes made in this file will be lost!
@@ -872,9 +872,9 @@
self.sb_fahrah_hahr = QtGui.QSpinBox(self.gridLayout_5)
self.sb_fahrah_hahr.setMaximumSize(QtCore.QSize(46,16777215))
- self.sb_fahrah_hahr.setMaximum(249)
+ self.sb_fahrah_hahr.setMaximum(624)
self.sb_fahrah_hahr.setMinimum(0)
- self.sb_fahrah_hahr.setProperty("value",QtCore.QVariant(87))
+ self.sb_fahrah_hahr.setProperty("value",QtCore.QVariant(287))
self.sb_fahrah_hahr.setObjectName("sb_fahrah_hahr")
self.hboxlayout11.addWidget(self.sb_fahrah_hahr)
Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.ui
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-02-23 16:45:46 UTC (rev 188)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-02-23 18:34:10 UTC (rev 189)
@@ -1872,13 +1872,13 @@
</size>
</property>
<property name="maximum" >
- <number>249</number>
+ <number>624</number>
</property>
<property name="minimum" >
<number>0</number>
</property>
<property name="value" >
- <number>87</number>
+ <number>287</number>
</property>
</widget>
</item>
Modified: pymoul/trunk/src/moul/qt/utils.py
===================================================================
--- pymoul/trunk/src/moul/qt/utils.py 2007-02-23 16:45:46 UTC (rev 188)
+++ pymoul/trunk/src/moul/qt/utils.py 2007-02-23 18:34:10 UTC (rev 189)
@@ -524,4 +524,4 @@
udt = normalizeTZ(UTC, dt)
qd = QtCore.QDate(udt.year, udt.month, udt.day)
qt = QtCore.QTime(udt.hour, udt.minute, udt.second)
- return QtCore.QDateTime(qd, qt, QtCore.Qt.UTC)
+ return QtCore.QDateTime(qd, qt, QtCore.Qt.UTC).toLocalTime()
Modified: pymoul/trunk/src/moul/time/dni.py
===================================================================
--- pymoul/trunk/src/moul/time/dni.py 2007-02-23 16:45:46 UTC (rev 188)
+++ pymoul/trunk/src/moul/time/dni.py 2007-02-23 18:34:10 UTC (rev 189)
@@ -205,8 +205,10 @@
def set(self, hahr=0, vailee=0, yahr=0, gahrtahvo=0, tahvo=0,
gorahn=0, prorahn=0):
+ self._hahr = 0
+ self._prorahn = 0
+
self.hahr = hahr
- self._prorahn = 0
self.vailee = vailee
self.yahr = yahr
self.gahrtahvo = gahrtahvo
@@ -332,7 +334,7 @@
if addhahr:
self._hahr += addhahr
value = value - (addhahr * PRORAHN_PER_HAHR)
- self._prorahn = value
+ self._prorahn += value
def prorahnOfYahr(self):
"""Get numbers of prorahntee since start of yahr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
