an.tsouchlos/banking-breakdown
1
0
Fork 0
Code Issues 2 Pull Requests 1 Packages Projects Releases Wiki Activity

Fix sorting for floats

Browse Source
This commit is contained in:
Andreas Tsouchlos 2024-01-04 22:21:00 +01:00
parent ab1a1c3aad
commit 6a497c8575
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
banking_breakdown/ui/main_window.py
View File

@ -44,7 +44,8 @@ class MainWindow(QMainWindow):
self._proxyModel = QSortFilterProxyModel(self) self._proxyModel = QSortFilterProxyModel(self)
self._proxyModel.setSourceModel(self._pandas_model) self._proxyModel.setSourceModel(self._pandas_model)
self._table_view.setModel(self._proxyModel) self._table_view.setModel(self._proxyModel)
self._proxyModel.setDynamicSortFilter(False) self._proxyModel.setDynamicSortFilter(True)
self._proxyModel.setSortRole(Qt.ItemDataRole.EditRole)
# Set event handlers # Set event handlers
@ -67,7 +68,9 @@ class MainWindow(QMainWindow):
self._table_view.selectionModel().selectionChanged.connect( self._table_view.selectionModel().selectionChanged.connect(
self._handle_table_selection_changed) self._handle_table_selection_changed)
#
# Table data updates # Table data updates
#
def set_statement_data(self, df: pd.DataFrame): def set_statement_data(self, df: pd.DataFrame):
self._pandas_model.set_dataframe(df) self._pandas_model.set_dataframe(df)
@ -96,7 +99,9 @@ class MainWindow(QMainWindow):
len(col)) len(col))
self._table_view.setColumnWidth(i, max_char * 10) self._table_view.setColumnWidth(i, max_char * 10)
#
# List data updates # List data updates
#
def _add_categories(self, categories: typing.Sequence[str]): def _add_categories(self, categories: typing.Sequence[str]):
for category in categories: for category in categories:
@ -113,7 +118,9 @@ class MainWindow(QMainWindow):
self._add_categories([category for category self._add_categories([category for category
in missing if category != ' ']) in missing if category != ' '])
#
# Warnings # Warnings
#
def _add_warning_item(self, text: str): def _add_warning_item(self, text: str):
warning_item = WarningItem(text=text, parent=self) warning_item = WarningItem(text=text, parent=self)
@ -143,7 +150,9 @@ class MainWindow(QMainWindow):
"The column 'balance' does not exist. Please rename the column" "The column 'balance' does not exist. Please rename the column"
" containing the balance after each transaction to 'balance'") " containing the balance after each transaction to 'balance'")
#
# Event handlers # Event handlers
#
def _handle_header_right_click(self, pos): def _handle_header_right_click(self, pos):
column = self._table_view.horizontalHeader().logicalIndexAt(pos) column = self._table_view.horizontalHeader().logicalIndexAt(pos)
@ -192,6 +201,7 @@ class MainWindow(QMainWindow):
df = self._pandas_model.get_dataframe() df = self._pandas_model.get_dataframe()
df.loc[row_indices, 'category'] = category df.loc[row_indices, 'category'] = category
self._pandas_model.set_dataframe(df) self._pandas_model.set_dataframe(df)
def _handle_apply_click(self): def _handle_apply_click(self):
@ -210,7 +220,9 @@ class MainWindow(QMainWindow):
df = self.get_statement_data() df = self.get_statement_data()
df.to_csv(filename, index=False) df.to_csv(filename, index=False)
#
# Enable / Disable buttons # Enable / Disable buttons
#
def _check_enable_delete_button(self): def _check_enable_delete_button(self):
if len(self._list_widget.selectedItems()) > 0: if len(self._list_widget.selectedItems()) > 0:

18
banking_breakdown/ui/pandas_model.py
View File

@ -1,6 +1,7 @@
import numpy
import pandas as pd import pandas as pd
from PyQt6 import QtCore from PyQt6 import QtCore
from PyQt6.QtCore import Qt from PyQt6.QtCore import Qt, QModelIndex
def _get_str_dataframe(df: pd.DataFrame) -> pd.DataFrame: def _get_str_dataframe(df: pd.DataFrame) -> pd.DataFrame:
@ -32,11 +33,20 @@ class PandasModel(QtCore.QAbstractTableModel):
def data(self, index, role=Qt.ItemDataRole.DisplayRole): def data(self, index, role=Qt.ItemDataRole.DisplayRole):
if not index.isValid(): if not index.isValid():
return QtCore.QVariant() return QtCore.QVariant()
if role != Qt.ItemDataRole.DisplayRole:
if (role != Qt.ItemDataRole.DisplayRole) and (
role != Qt.ItemDataRole.EditRole):
return QtCore.QVariant() return QtCore.QVariant()
item = self._data_str.iloc[index.row(), index.column()] if role == Qt.ItemDataRole.DisplayRole:
return QtCore.QVariant(str(item)) item = self._data_str.iloc[index.row(), index.column()]
return QtCore.QVariant(item)
elif role == Qt.ItemDataRole.EditRole:
item = self._data.iloc[index.row(), index.column()]
if type(item) is numpy.float64:
return QtCore.QVariant(float(item))
else:
return QtCore.QVariant(item)
def headerData(self, section, orientation, def headerData(self, section, orientation,
role=Qt.ItemDataRole.DisplayRole): role=Qt.ItemDataRole.DisplayRole):