RolandWH/SIPPCompare
1
0
Fork 0
mirror of https://github.com/RolandWH/SIPPCompare.git synced 2025-05-10 08:41:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

defer import of matplotlib to spped up launch

Browse Source
This commit is contained in:
Roland W-H 2025-04-27 11:55:27 +01:00
parent 9e79d986e4
commit 9a8b0045fa
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main_window.py
View File

@ -1,4 +1,5 @@
from PyQt6 import uic from PyQt6 import uic
from PyQt6.QtCore import QTimer
from PyQt6.QtGui import QIntValidator, QIcon from PyQt6.QtGui import QIntValidator, QIcon
from PyQt6.QtWidgets import QMainWindow, QApplication from PyQt6.QtWidgets import QMainWindow, QApplication
@ -15,7 +16,7 @@ class SIPPCompare(QMainWindow):
uic.loadUi(resource_finder.get_res_path("gui/main_gui.ui"), self) uic.loadUi(resource_finder.get_res_path("gui/main_gui.ui"), self)
self.setWindowIcon(QIcon(resource_finder.get_res_path("icon2.ico"))) self.setWindowIcon(QIcon(resource_finder.get_res_path("icon2.ico")))
# Initialise class variables ## Initialise class variables
# Results # Results
self.fund_plat_fees = 0.0 self.fund_plat_fees = 0.0
self.fund_deal_fees = 0.0 self.fund_deal_fees = 0.0
@ -26,10 +27,12 @@ class SIPPCompare(QMainWindow):
# Create window objects # Create window objects
self.db = DBHandler() self.db = DBHandler()
self.platform_list_win = PlatformList(self.db) self.platform_list_win = PlatformList(self.db)
self.output_win = OutputWindow() if len(self.platform_list_win.plat_name_list) == 0:
QTimer.singleShot(1, self.platform_list_win.show)
self.output_win = None
# Handle events ## Handle events
self.calc_but.clicked.connect(self.calculate_fees) self.calc_but.clicked.connect(self.indicate_loading)
# Menu bar entry (File -> Platform List) # Menu bar entry (File -> Platform List)
self.actionList_Platforms.triggered.connect(self.show_platform_list) self.actionList_Platforms.triggered.connect(self.show_platform_list)
# Update percentage mix label when slider moved # Update percentage mix label when slider moved
@ -39,11 +42,11 @@ class SIPPCompare(QMainWindow):
self.share_trades_combo.currentTextChanged.connect(self.check_valid) self.share_trades_combo.currentTextChanged.connect(self.check_valid)
self.fund_trades_combo.currentTextChanged.connect(self.check_valid) self.fund_trades_combo.currentTextChanged.connect(self.check_valid)
# Set validators ## Set validators
self.share_trades_combo.setValidator(QIntValidator(0, 999)) self.share_trades_combo.setValidator(QIntValidator(0, 999))
self.fund_trades_combo.setValidator(QIntValidator(0, 99)) self.fund_trades_combo.setValidator(QIntValidator(0, 99))
# Restore last session ## Restore last session
prev_session_data = self.db.retrieve_user_details() prev_session_data = self.db.retrieve_user_details()
if "NO_RECORD" not in prev_session_data: if "NO_RECORD" not in prev_session_data:
self.value_input.setValue(prev_session_data["pension_val"]) self.value_input.setValue(prev_session_data["pension_val"])
@ -67,6 +70,10 @@ class SIPPCompare(QMainWindow):
else: else:
self.calc_but.setEnabled(False) self.calc_but.setEnabled(False)
def indicate_loading(self):
self.calc_but.setText("Working...")
QTimer.singleShot(1, self.calculate_fees)
# Calculate fees for all active platforms # Calculate fees for all active platforms
def calculate_fees(self): def calculate_fees(self):
# Set to empty list each time to avoid persistence # Set to empty list each time to avoid persistence
@ -131,7 +138,9 @@ class SIPPCompare(QMainWindow):
# Show the output window - this func is called from calculate_fee() # Show the output window - this func is called from calculate_fee()
def show_output_win(self): def show_output_win(self):
# Refresh the results when new fees are calculated # Refresh the results when new fees are calculated
self.output_win = OutputWindow()
self.output_win.display_output(self.results, 1) self.output_win.display_output(self.results, 1)
self.calc_but.setText("Calculate")
self.output_win.activateWindow() self.output_win.activateWindow()
self.output_win.raise_() self.output_win.raise_()
self.output_win.show() self.output_win.show()

1
src/output_window.py
View File

@ -6,7 +6,6 @@ from PyQt6.QtGui import QIcon, QFont
from PyQt6.QtWidgets import QWidget, QFileDialog, QMessageBox, QDialogButtonBox from PyQt6.QtWidgets import QWidget, QFileDialog, QMessageBox, QDialogButtonBox
import resource_finder import resource_finder
from widgets.mpl_widget import MplWidget
class SaveFailure(QMessageBox): class SaveFailure(QMessageBox):