Changeset 286

Timestamp:

12/21/07 14:11:13 (13 months ago)

Author:

fdb

Message:

- Colors are clamped
- Remember last opened directory

Location:

nodebox/branches/try-qt/nodebox

Files:

• graphics/qt.py (modified) (1 diff)
• gui/qt/__init__.py (modified) (6 diffs)

nodebox/branches/try-qt/nodebox/graphics/qt.py

@@ -584 +584 @@
     def _normalize(self, v):
         """Bring the color into the 0-1 scale for the current colorrange"""
-        return v / self._ctx._colorrange
+        return clamp(v / self._ctx._colorrange)
 
     def _normalizeList(self, lst):
         """Bring the color into the 0-1 scale for the current colorrange"""
-        return map(lambda x:x / self._ctx._colorrange, lst)
+        return map(lambda x:clamp(x / self._ctx._colorrange), lst)
 
 color = Color
+
+def clamp(v):
+    return max(min(v, 1.0), 0.0)
 
 class Transform(object):

nodebox/branches/try-qt/nodebox/gui/qt/__init__.py

@@ -8 +8 @@
 
 from PyQt4.QtGui import QApplication, QWidget, QColor, QPainter, QMenuBar, QMenu, QKeySequence, QTextEdit, QSplitter, QGridLayout, QDialog, QScrollArea, QFont, QTextCharFormat, QFileDialog, QTextCursor, QPixmap, QPrinter, QImage, QMainWindow
-from PyQt4.QtCore import Qt, SIGNAL, SLOT, pyqtSignature, QTimer, QRectF, QSize
+from PyQt4.QtCore import Qt, SIGNAL, SLOT, pyqtSignature, QTimer, QRectF, QSize, QCoreApplication, QSettings, QVariant
 from PyQt4.QtSvg import QSvgGenerator
 
@@ -227 +227 @@
     def doOpen(self):
         global app
-        fileName = QFileDialog.getOpenFileName(None, self.tr("Open File"), app.home, "*.py")
+        fileName = QFileDialog.getOpenFileName(None, self.tr("Open File"), app.lastDir, "*.py")
         print "open", fileName
         if fileName is not None and len(fileName) > 0:
@@ -234 +234 @@
             source = fp.read()
             fp.close()
+            app.lastDir = os.path.dirname(fileName)
             doc = app.newDocument()
             doc.fileName = fileName
@@ -566 +567 @@
     def __init__(self, args):
         QApplication.__init__(self, args)
+        QCoreApplication.setOrganizationName("NodeBox")
+        QCoreApplication.setOrganizationDomain("nodebox.net")
+        QCoreApplication.setApplicationName("NodeBox")
+        self.settings = QSettings()
         loadConfig()
         self.documents = []
@@ -577 +582 @@
             self.home = os.getenv('HOME')
             self.lib = os.path.join(self.home, "nodebox")
+        self._lastDir = self.settings.value("lastDir", QVariant(self.home)).toString()
         try:
             if not os.path.exists(self.lib):
@@ -591 +597 @@
         self.documents.append(doc)
         return doc
+        
+    def _get_lastDir(self):
+        return self._lastDir
+    def _set_lastDir(self, lastDir):
+        self._lastDir = lastDir
+        self.settings.setValue("lastDir", QVariant(lastDir))
+    lastDir = property(_get_lastDir, _set_lastDir)
 
 def qtmain():