RolandWH/SIPPCompare
1
0
Fork 0
mirror of https://github.com/RolandWH/SIPPCompare.git synced 2025-04-20 00:11:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: RolandWH:b62518875f407b7b361d2cb4a5e6115075c869af
Branches Tags
RolandWH:master
RolandWH:db_testing
RolandWH:testing
..
compare: RolandWH:1748fb849fe0f5c686df545cfa41b3e7e48b4806
Branches Tags
RolandWH:db_testing
RolandWH:master
RolandWH:testing

No commits in common. "b62518875f407b7b361d2cb4a5e6115075c869af" and "1748fb849fe0f5c686df545cfa41b3e7e48b4806" have entirely different histories.
b62518875f ... 1748fb849f

6 changed files with 34 additions and 74 deletions
Show Stats Expand all files Collapse all files

68
gui/main_gui.ui
View File

@ -7,19 +7,19 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>228</height> <height>250</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>228</height> <height>250</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>228</height> <height>250</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -35,7 +35,7 @@
<x>10</x> <x>10</x>
<y>0</y> <y>0</y>
<width>401</width> <width>401</width>
<height>171</height> <height>191</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -58,28 +58,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="value_input">
<property name="frame">
<bool>true</bool>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
</property>
<property name="specialValueText">
<string>£</string>
</property>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
</property>
<property name="prefix">
<string>£</string>
</property>
<property name="maximum">
<double>999999999.990000009536743</double>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QLabel" name="mix_lab"> <widget class="QLabel" name="mix_lab">
<property name="text"> <property name="text">
@ -113,6 +91,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1">
<widget class="QComboBox" name="share_trades_combo">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="fund_trades_lab"> <widget class="QLabel" name="fund_trades_lab">
<property name="text"> <property name="text">
@ -129,19 +114,31 @@
</item> </item>
<item row="5" column="0" colspan="2"> <item row="5" column="0" colspan="2">
<widget class="QPushButton" name="calc_but"> <widget class="QPushButton" name="calc_but">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Calculate</string> <string>Calculate</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="share_trades_combo"> <widget class="QDoubleSpinBox" name="value_input">
<property name="editable"> <property name="frame">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
</property>
<property name="specialValueText">
<string>£</string>
</property>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
</property>
<property name="prefix">
<string>£</string>
</property>
<property name="maximum">
<double>999999999.990000009536743</double>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -175,13 +172,6 @@
</property> </property>
</action> </action>
</widget> </widget>
<tabstops>
<tabstop>value_input</tabstop>
<tabstop>mix_slider</tabstop>
<tabstop>share_trades_combo</tabstop>
<tabstop>fund_trades_combo</tabstop>
<tabstop>calc_but</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

5
gui/output_window.ui
View File

@ -62,11 +62,6 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<tabstops>
<tabstop>output</tabstop>
<tabstop>res_save_but</tabstop>
<tabstop>res_ok_but</tabstop>
</tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>

15
gui/platform_edit.ui
View File

@ -6,22 +6,10 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>480</width> <width>481</width>
<height>305</height> <height>305</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>480</width>
<height>305</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>305</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Platform Editor</string> <string>Platform Editor</string>
</property> </property>
@ -218,7 +206,6 @@
<tabstop>share_plat_fee_box</tabstop> <tabstop>share_plat_fee_box</tabstop>
<tabstop>share_plat_max_fee_box</tabstop> <tabstop>share_plat_max_fee_box</tabstop>
<tabstop>share_deal_fee_box</tabstop> <tabstop>share_deal_fee_box</tabstop>
<tabstop>share_deal_reduce_trades_box</tabstop>
<tabstop>share_deal_reduce_amount_box</tabstop> <tabstop>share_deal_reduce_amount_box</tabstop>
<tabstop>save_but</tabstop> <tabstop>save_but</tabstop>
</tabstops> </tabstops>

16
src/main_window.py
View File

@ -1,5 +1,5 @@
from PyQt6.QtGui import QIntValidator from PyQt6.QtGui import QIntValidator
from PyQt6.QtWidgets import QMainWindow, QWidget from PyQt6.QtWidgets import QMainWindow
from PyQt6 import uic from PyQt6 import uic
import output_window import output_window
@ -7,7 +7,7 @@ import output_window
class SIPPCompare(QMainWindow): class SIPPCompare(QMainWindow):
# Receive instance of PlatformEdit() as parameter # Receive instance of PlatformEdit() as parameter
def __init__(self, plat_edit_win: QWidget): def __init__(self, plat_edit_win):
super().__init__() super().__init__()
# Import Qt Designer UI XML file # Import Qt Designer UI XML file
uic.loadUi("gui/main_gui.ui", self) uic.loadUi("gui/main_gui.ui", self)
@ -39,9 +39,6 @@ class SIPPCompare(QMainWindow):
self.actionEdit_Platforms.triggered.connect(self.show_platform_edit) self.actionEdit_Platforms.triggered.connect(self.show_platform_edit)
# Update percentage mix label when slider moved # Update percentage mix label when slider moved
self.mix_slider.valueChanged.connect(self.update_slider_lab) self.mix_slider.valueChanged.connect(self.update_slider_lab)
#self.value_input.valueChanged.connect(self.check_valid)
self.share_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))
@ -53,13 +50,6 @@ class SIPPCompare(QMainWindow):
mix_lab_str = f"Investment mix (funds {slider_val}% / shares {100 - slider_val}%)" mix_lab_str = f"Investment mix (funds {slider_val}% / shares {100 - slider_val}%)"
self.mix_lab.setText(mix_lab_str) self.mix_lab.setText(mix_lab_str)
def check_valid(self):
if self.share_trades_combo.currentText() != "" \
and self.fund_trades_combo.currentText() != "":
self.calc_but.setEnabled(True)
else:
self.calc_but.setEnabled(False)
# Get variables from platform editor input fields # Get variables from platform editor input fields
def init_variables(self): def init_variables(self):
self.plat_name = self.platform_win.get_plat_name() self.plat_name = self.platform_win.get_plat_name()
@ -79,7 +69,7 @@ class SIPPCompare(QMainWindow):
self.fund_plat_fees = 0 self.fund_plat_fees = 0
value_num = float(self.value_input.value()) value_num = float(self.value_input.value())
# Funds/shares mix # Funds/shares mix
slider_val: int = self.mix_slider.value() slider_val = self.mix_slider.value()
funds_value = (slider_val / 100) * value_num funds_value = (slider_val / 100) * value_num
fund_trades_num = int(self.fund_trades_combo.currentText()) fund_trades_num = int(self.fund_trades_combo.currentText())
self.fund_deal_fees = fund_trades_num * self.fund_deal_fee self.fund_deal_fees = fund_trades_num * self.fund_deal_fee

2
src/output_window.py
View File

@ -24,7 +24,7 @@ class OutputWindow(QWidget):
if not os.path.exists("output"): if not os.path.exists("output"):
os.makedirs("output") os.makedirs("output")
filename_str = f"output/{self.platform_name}-{cur_time.year}.{cur_time.month}.{cur_time.day}.txt" filename_str = f"output/{self.platform_name}-{cur_time.year}.{cur_time.month}.{cur_time.day}.txt"
output_file = open(filename_str, "wt", encoding = "utf-8") output_file = open(filename_str, "wt")
output_file.write(self.results_str) output_file.write(self.results_str)
# Display fees in output window as plaintext readout # Display fees in output window as plaintext readout

2
src/platform_edit.py
View File

@ -27,8 +27,6 @@ class PlatformEdit(QWidget):
self.share_deal_reduce_amount = 0.0 self.share_deal_reduce_amount = 0.0
# Debugging feature: set with "--DEBUG_AUTOFILL" cmd argument # Debugging feature: set with "--DEBUG_AUTOFILL" cmd argument
self.autofill = autofill self.autofill = autofill
if autofill:
self.save_but.setEnabled(True)
# Create main window object, passing this instance as param # Create main window object, passing this instance as param
self.main_win = main_window.SIPPCompare(self) self.main_win = main_window.SIPPCompare(self)