diff --git a/gui/platform_edit.ui b/gui/platform_edit.ui index 5e89f0b..e6d1f00 100644 --- a/gui/platform_edit.ui +++ b/gui/platform_edit.ui @@ -80,7 +80,7 @@ - false + true true diff --git a/src/main_window.py b/src/main_window.py index 24a5eea..fed54dd 100644 --- a/src/main_window.py +++ b/src/main_window.py @@ -66,7 +66,6 @@ class SIPPCompare(QMainWindow): def init_variables(self): self.optional_boxes = self.platform_win.get_optional_boxes() self.fund_plat_fee = self.platform_win.get_fund_plat_fee() - self.fund_deal_fee = self.platform_win.get_fund_deal_fee() self.share_plat_fee = self.platform_win.get_share_plat_fee() self.share_deal_fee = self.platform_win.get_share_deal_fee() @@ -77,16 +76,21 @@ class SIPPCompare(QMainWindow): self.plat_name = None if self.optional_boxes[1]: + self.fund_deal_fee = self.platform_win.get_fund_deal_fee() + else: + self.fund_deal_fee = None + + if self.optional_boxes[2]: self.share_plat_max_fee = self.platform_win.get_share_plat_max_fee() else: self.share_plat_max_fee = None - if self.optional_boxes[2]: + if self.optional_boxes[3]: self.share_deal_reduce_trades = self.platform_win.get_share_deal_reduce_trades() else: self.share_deal_reduce_trades = None - if self.optional_boxes[3]: + if self.optional_boxes[4]: self.share_deal_reduce_amount = self.platform_win.get_share_deal_reduce_amount() else: self.share_deal_reduce_amount = None @@ -101,7 +105,8 @@ class SIPPCompare(QMainWindow): slider_val: int = self.mix_slider.value() funds_value = (slider_val / 100) * value_num fund_trades_num = int(self.fund_trades_combo.currentText()) - self.fund_deal_fees = fund_trades_num * self.fund_deal_fee + if self.fund_deal_fee is not None: + self.fund_deal_fees = fund_trades_num * self.fund_deal_fee for i in range(1, len(self.fund_plat_fee[0])): band = self.fund_plat_fee[0][i] diff --git a/src/platform_edit.py b/src/platform_edit.py index 1510695..4f51d58 100644 --- a/src/platform_edit.py +++ b/src/platform_edit.py @@ -34,13 +34,13 @@ class PlatformEdit(QWidget): self.save_but.setEnabled(True) self.required_fields = [ - self.fund_deal_fee_box, self.share_plat_fee_box, self.share_deal_fee_box ] self.optional_fields = [ self.plat_name_box, + self.fund_deal_fee_box, self.share_plat_max_fee_box, self.share_deal_reduce_trades_box, self.share_deal_reduce_amount_box @@ -48,12 +48,14 @@ class PlatformEdit(QWidget): self.optional_check_boxes = [ self.plat_name_check, + self.fund_deal_fee_check, self.share_plat_max_fee_check, self.share_deal_reduce_trades_check, self.share_deal_reduce_amount_check ] self.check_boxes_ticked = [ + True, True, False, False,