Basic category selection and unit conversion now working

diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py
index 3ed1bf7..fffcf85 100755 (executable)
--- a/src/gonvert_qt.py
+++ b/src/gonvert_qt.py
@@ -6,13 +6,13 @@ from __future__ import with_statement
 import sys
 import os
 import math
 import sys
 import os
 import math

-import pickle

 import logging
 
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 
 import constants
 import logging
 
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 
 import constants

+from util import misc as misc_utils

 import unit_data
 
 try:
 import unit_data
 
 try:

@@ -87,7 +87,15 @@ class Gonvert(object):
 class CategoryWindow(object):
 
        def __init__(self, parent, appIconPath):
 class CategoryWindow(object):
 
        def __init__(self, parent, appIconPath):

+               self._appIconPath = appIconPath
+               self._unitWindows = []
+

                self._categories = QtGui.QTreeWidget()
                self._categories = QtGui.QTreeWidget()

+               self._categories.setHeaderLabels(["Categories"])
+               self._categories.itemClicked.connect(self._on_category_clicked)
+               for catName in unit_data.UNIT_CATEGORIES:
+                       twi = QtGui.QTreeWidgetItem(self._categories)
+                       twi.setText(0, catName)

 
                self._layout = QtGui.QVBoxLayout()
                self._layout.addWidget(self._categories)
 
                self._layout = QtGui.QVBoxLayout()
                self._layout.addWidget(self._categories)

@@ -95,19 +103,189 @@ class CategoryWindow(object):
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
 

-               self._window = QtGui.QMainWindow()
+               self._window = QtGui.QMainWindow(parent)
+               if parent is not None:
+                       self._window.setWindowModality(QtCore.Qt.WindowModal)

                self._window.setWindowTitle("%s - Categories" % constants.__pretty_app_name__)
                self._window.setWindowIcon(QtGui.QIcon(appIconPath))
                self._window.setCentralWidget(centralWidget)
 
                self._window.show()
 
                self._window.setWindowTitle("%s - Categories" % constants.__pretty_app_name__)
                self._window.setWindowIcon(QtGui.QIcon(appIconPath))
                self._window.setCentralWidget(centralWidget)
 
                self._window.show()
 

+       @misc_utils.log_exception(_moduleLogger)
+       def _on_category_clicked(self, item, columnIndex):
+               categoryName = unicode(item.text(0))
+               unitWindow = UnitWindow(self._window, categoryName, self._appIconPath)
+               self._unitWindows = [unitWindow]
+
+
+class UnitData(object):
+
+       HEADERS = ["Name", "Value", "", "Unit"]
+       ALIGNMENT = [QtCore.Qt.AlignLeft, QtCore.Qt.AlignRight, QtCore.Qt.AlignLeft, QtCore.Qt.AlignLeft]
+
+       def __init__(self, name, unit, description, conversion):
+               self._name = name
+               self._unit = unit
+               self._description = description
+               self._conversion = conversion
+
+               self._value = 0.0
+               self._integerDisplay, self._fractionalDisplay = split_number(self._value)
+
+       @property
+       def name(self):
+               return self._name
+
+       @property
+       def value(self):
+               return self._value
+
+       def update_value(self, newValue):
+               self._value = newValue
+               self._integerDisplay, self._fractionalDisplay = split_number(newValue)
+
+       @property
+       def unit(self):
+               return self._unit
+
+       @property
+       def conversion(self):
+               return self._conversion
+
+       def data(self, column):
+               try:
+                       return [self._name, self._integerDisplay, self._fractionalDisplay, self._unit][column]
+               except IndexError:
+                       return None
+
+
+class UnitModel(QtCore.QAbstractItemModel):
+
+       def __init__(self, categoryName, parent=None):
+               super(UnitModel, self).__init__(parent)
+               self._categoryName = categoryName
+               self._unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName]
+
+               self._children = []
+               for key in unit_data.get_units(self._categoryName):
+                       conversion, unit, description = self._unitData[key]
+                       self._children.append(UnitData(key, unit, description, conversion))
+
+       @misc_utils.log_exception(_moduleLogger)
+       def columnCount(self, parent):
+               if parent.isValid():
+                       return 0
+               else:
+                       return len(UnitData.HEADERS)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def data(self, index, role):
+               if not index.isValid():
+                       return None
+               elif role == QtCore.Qt.TextAlignmentRole:
+                       return UnitData.ALIGNMENT[index.column()]
+               elif role != QtCore.Qt.DisplayRole:
+                       return None
+
+               item = index.internalPointer()
+               if isinstance(item, UnitData):
+                       return item.data(index.column())
+               elif item is UnitData.HEADERS:
+                       return item[index.column()]
+
+       @misc_utils.log_exception(_moduleLogger)
+       def flags(self, index):
+               if not index.isValid():
+                       return QtCore.Qt.NoItemFlags
+
+               return QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable
+
+       @misc_utils.log_exception(_moduleLogger)
+       def headerData(self, section, orientation, role):
+               if orientation == QtCore.Qt.Horizontal and role == QtCore.Qt.DisplayRole:
+                       return UnitData.HEADERS[section]
+
+               return None
+
+       @misc_utils.log_exception(_moduleLogger)
+       def index(self, row, column, parent):
+               if not self.hasIndex(row, column, parent):
+                       return QtCore.QModelIndex()
+
+               if parent.isValid():
+                       return QtCore.QModelIndex()
+
+               parentItem = UnitData.HEADERS
+               childItem = self._children[row]
+               if childItem:
+                       return self.createIndex(row, column, childItem)
+               else:
+                       return QtCore.QModelIndex()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def parent(self, index):
+               if not index.isValid():
+                       return QtCore.QModelIndex()
+
+               childItem = index.internalPointer()
+               if isinstance(childItem, UnitData):
+                       return QtCore.QModelIndex()
+               elif childItem is UnitData.HEADERS:
+                       return None
+
+       @misc_utils.log_exception(_moduleLogger)
+       def rowCount(self, parent):
+               if 0 < parent.column():
+                       return 0
+
+               if not parent.isValid():
+                       return len(self._children)
+               else:
+                       return len(self._children)
+
+       def get_unit(self, index):
+               return self._children[index]
+
+       def update_values(self, fromIndex, userInput):
+               value = self._sanitize_value(userInput)
+               func, arg = self._children[fromIndex].conversion
+               base = func.to_base(value, arg)
+               for i, child in enumerate(self._children):
+                       if i == fromIndex:
+                               continue
+                       func, arg = child.conversion
+                       newValue = func.from_base(base, arg)
+                       child.update_value(newValue)
+
+               topLeft = self.createIndex(0, 1, self._children[0])
+               bottomRight = self.createIndex(len(self._children)-1, 2, self._children[-1])
+               self.dataChanged.emit(topLeft, bottomRight)
+
+       def _sanitize_value(self, userEntry):
+               if self._categoryName == "Computer Numbers":
+                       if userEntry == '':
+                               value = '0'
+                       else:
+                               value = userEntry
+               else:
+                       if userEntry == '':
+                               value = 0.0
+                       else:
+                               value = float(userEntry)
+               return value
+

 
 class UnitWindow(object):
 
        def __init__(self, parent, category, appIconPath):
 
 class UnitWindow(object):
 
        def __init__(self, parent, category, appIconPath):

+               self._categoryName = category
+               self._selectedIndex = 0
+

                self._selectedUnitName = QtGui.QLabel()
                self._selectedUnitValue = QtGui.QLineEdit()
                self._selectedUnitName = QtGui.QLabel()
                self._selectedUnitValue = QtGui.QLineEdit()

+               self._selectedUnitValue.textEdited.connect(self._on_value_edited)
+               self._selectedUnitValue.editingFinished.connect(self._on_value_edited)

                self._selectedUnitSymbol = QtGui.QLabel()
 
                self._selectedUnitLayout = QtGui.QHBoxLayout()
                self._selectedUnitSymbol = QtGui.QLabel()
 
                self._selectedUnitLayout = QtGui.QHBoxLayout()

@@ -115,7 +293,11 @@ class UnitWindow(object):
                self._selectedUnitLayout.addWidget(self._selectedUnitValue)
                self._selectedUnitLayout.addWidget(self._selectedUnitSymbol)
 
                self._selectedUnitLayout.addWidget(self._selectedUnitValue)
                self._selectedUnitLayout.addWidget(self._selectedUnitSymbol)
 

-               self._units = QtGui.QTreeWidget()
+               self._unitsModel = UnitModel(self._categoryName)
+               self._unitsView = QtGui.QTreeView()
+               self._unitsView.setModel(self._unitsModel)
+               self._unitsView.clicked.connect(self._on_unit_clicked)
+               self._unitsView.setUniformRowHeights(True)

 
                self._searchButton = QtGui.QPushButton()
                self._searchEntry = QtGui.QLineEdit()
 
                self._searchButton = QtGui.QPushButton()
                self._searchEntry = QtGui.QLineEdit()

@@ -128,17 +310,21 @@ class UnitWindow(object):
 
                self._layout = QtGui.QVBoxLayout()
                self._layout.addLayout(self._selectedUnitLayout)
 
                self._layout = QtGui.QVBoxLayout()
                self._layout.addLayout(self._selectedUnitLayout)

-               self._layout.addWidget(self._units)
+               self._layout.addWidget(self._unitsView)

                self._layout.addLayout(self._searchLayout)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
 
                self._layout.addLayout(self._searchLayout)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
 

-               self._window = QtGui.QMainWindow()
+               self._window = QtGui.QMainWindow(parent)
+               if parent is not None:
+                       self._window.setWindowModality(QtCore.Qt.WindowModal)

                self._window.setWindowTitle("%s - %s" % (constants.__pretty_app_name__, category))
                self._window.setWindowIcon(QtGui.QIcon(appIconPath))
                self._window.setCentralWidget(centralWidget)
 
                self._window.setWindowTitle("%s - %s" % (constants.__pretty_app_name__, category))
                self._window.setWindowIcon(QtGui.QIcon(appIconPath))
                self._window.setCentralWidget(centralWidget)
 

+               self._select_unit(0)
+

                self._window.show()
                self._hide_search()
 
                self._window.show()
                self._hide_search()
 

@@ -147,6 +333,25 @@ class UnitWindow(object):
                self._searchEntry.hide()
                self._searchCloseButton.hide()
 
                self._searchEntry.hide()
                self._searchCloseButton.hide()
 

+       @misc_utils.log_exception(_moduleLogger)
+       def _on_unit_clicked(self, index):
+               self._select_unit(index.row())
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_value_edited(self, *args):
+               userInput = self._selectedUnitValue.text()
+               self._unitsModel.update_values(self._selectedIndex, str(userInput))
+
+       def _select_unit(self, index):
+               unit = self._unitsModel.get_unit(index)
+               self._selectedUnitName.setText(unit.name)
+               self._selectedUnitValue.setText(str(unit.value))
+               self._selectedUnitSymbol.setText(unit.unit)
+
+               self._selectedIndex = index
+               qindex = self._unitsModel.createIndex(index, 0, self._unitsModel.get_unit(index))
+               self._unitsView.scrollTo(qindex)
+

 
 def run_gonvert():
        app = QtGui.QApplication([])
 
 def run_gonvert():
        app = QtGui.QApplication([])