diff --git a/src/output_window.py b/src/output_window.py index 49014b0..bee2fe0 100644 --- a/src/output_window.py +++ b/src/output_window.py @@ -15,56 +15,6 @@ class OutputWindow(QWidget): uic.loadUi(resource_finder.get_res_path("gui/output_window.ui"), self) self.setWindowIcon(QIcon(resource_finder.get_res_path("icon2.ico"))) - """ - # Initialise class variables - self.results_str = "" - self.platform_name = "" - - # Handle events - self.res_save_but.clicked.connect(self.save_results) - - def save_results(self): - # Use datatime for txt filename - cur_time = datetime.datetime.now() - if not os.path.exists("output"): - os.makedirs("output") - filename_str = f"output/" - if self.platform_name is not None: - filename_str += f"{self.platform_name}" - else: - filename_str += "Unnamed" - filename_str += f"-{cur_time.year}.{cur_time.month}.{cur_time.day}.txt" - output_file = open(filename_str, "wt", encoding = "utf-8") - output_file.write(self.results_str) - - # Display fees in output window as plaintext readout - def display_output(self, fund_plat_fees: float, fund_deal_fees: float, - share_plat_fees: float, share_deal_fees: float, plat_name: str): - self.platform_name = plat_name - if self.platform_name is not None: - self.results_str = f"Fees breakdown (Platform \"{self.platform_name}\"):" - else: - self.results_str = f"Fees breakdown:" - - self.results_str += "\n\nPlatform fees:" - # :.2f is used in order to display 2 decimal places (currency form) - self.results_str += f"\n\tFund platform fees: £{round(fund_plat_fees, 2):.2f}" - self.results_str += f"\n\tShare platform fees: £{round(share_plat_fees, 2):.2f}" - total_plat_fees = fund_plat_fees + share_plat_fees - self.results_str += f"\n\tTotal platform fees: £{round(total_plat_fees, 2):.2f}" - - self.results_str += "\n\nDealing fees:" - self.results_str += f"\n\tFund dealing fees: £{round(fund_deal_fees, 2):.2f}" - self.results_str += f"\n\tShare dealing fees: £{round(share_deal_fees, 2):.2f}" - total_deal_fees = fund_deal_fees + share_deal_fees - self.results_str += f"\n\tTotal dealing fees: £{round(total_deal_fees, 2):.2f}" - - total_fees = total_plat_fees + total_deal_fees - self.results_str += f"\n\nTotal fees: £{round(total_fees, 2):.2f}" - - self.output.setText(self.results_str) - """ - def display_output(self, results: list): ax = self.graphWidget.canvas.axes ax.clear()