Move Wallet to a below table widget

Skinok · Skinok · commit afe984aaf9cd · 2021-11-24T17:20:21.000+01:00
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -12,10 +12,11 @@
 
 class FinplotWindow():
 
-    def __init__(self, dockArea, dockChart):
+    def __init__(self, dockArea, dockChart, interface):
 
         self.dockArea = dockArea
         self.dockChart = dockChart
+        self.interface = interface
 
         self.IndIchimokuActivated = False
         self.IndRSIActivated = False
@@ -37,7 +38,9 @@ def createPlotWidgets(self):
         self.dockChart.addWidget(self.ax0.ax_widget, 1, 0, 1, 1)
         self.dockChart.addWidget(self.ax1.ax_widget, 2, 0, 1, 1)
         self.dockChart.addWidget(self.ax2.ax_widget, 3, 0, 1, 1)
-        self.dockChart.addWidget(self.axPnL.ax_widget, 4, 0, 1, 1)
+
+        self.interface.strategyResultsUI.ResultsTabWidget.widget(1).layout().addWidget(self.axPnL.ax_widget)
+        #self.dockChart.addWidget(self.axPnL.ax_widget, 4, 0, 1, 1)
 
         self.ax1.ax_widget.hide()
         self.ax2.ax_widget.hide()
diff --git a/ui/strategyResults.ui b/ui/strategyResults.ui
@@ -16,6 +16,12 @@
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="SummaryGB">
+     <property name="minimumSize">
+      <size>
+       <width>200</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="maximumSize">
       <size>
        <width>250</width>
@@ -36,22 +42,30 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QGroupBox" name="TradesGB">
-     <property name="styleSheet">
-      <string notr="true"/>
+    <widget class="QTabWidget" name="ResultsTabWidget">
+     <property name="currentIndex">
+      <number>1</number>
      </property>
-     <property name="title">
-      <string>Trades</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-       </layout>
-      </item>
-     </layout>
+     <widget class="QWidget" name="tradeTab">
+      <attribute name="title">
+       <string>Trades</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="walletTab">
+      <attribute name="title">
+       <string>Wallet</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_5">
+       <item row="0" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_2"/>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
diff --git a/userInterface.py b/userInterface.py
@@ -197,7 +197,7 @@ def createTradesUI(self):
         self.tradeTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
         self.tradeTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
 
-        self.strategyResultsUI.TradesGB.layout().addWidget(self.tradeTableWidget)
+        self.strategyResultsUI.ResultsTabWidget.widget(0).layout().addWidget(self.tradeTableWidget)
 
     def fillTradesUI(self, trades):
 
@@ -365,7 +365,7 @@ def fillSummaryUI(self, brokerCash, brokerValue, tradeAnalysis):
     #  Fin plot Window
     #########
     def createFinplotWindow(self):
-        self.fpltWindow = finplotWindow.FinplotWindow(self.dockArea, self.dock_chart)
+        self.fpltWindow = finplotWindow.FinplotWindow(self.dockArea, self.dock_chart, self)
         self.fpltWindow.createPlotWidgets()
         pass
 
@@ -440,7 +440,6 @@ def createControlPanel(self):
         panel.interval.currentTextChanged.connect(change_asset)
 
         layout.setColumnMinimumWidth(3, 30)
-        
         '''
 
         # Ichimoku
