From 0177510961af398785055355843597242706a503 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@maiil.ru>
Date: Tue, 1 Jan 2019 14:21:41 +0100
Subject: [PATCH] display caclulated stop loss (for test only)
---
src/opensesim/gui/account/AccountDialog.form | 10 ++----
src/opensesim/gui/account/AccountDialog.java | 8 ++---
src/opensesim/gui/account/AccountPanel.form | 30 ++++++++++++++--
src/opensesim/gui/account/AccountPanel.java | 37 ++++++++++++++++----
4 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/src/opensesim/gui/account/AccountDialog.form b/src/opensesim/gui/account/AccountDialog.form
index 4f5a1bb..0722ddc 100644
--- a/src/opensesim/gui/account/AccountDialog.form
+++ b/src/opensesim/gui/account/AccountDialog.form
@@ -23,18 +23,12 @@
-
-
-
-
+
-
-
-
-
+
diff --git a/src/opensesim/gui/account/AccountDialog.java b/src/opensesim/gui/account/AccountDialog.java
index 41b6454..3709519 100644
--- a/src/opensesim/gui/account/AccountDialog.java
+++ b/src/opensesim/gui/account/AccountDialog.java
@@ -67,15 +67,11 @@ public class AccountDialog extends javax.swing.JDialog {
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addGap(0, 0, Short.MAX_VALUE)
- .addComponent(accountPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(accountPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(accountPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 228, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 72, Short.MAX_VALUE))
+ .addComponent(accountPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
);
pack();
diff --git a/src/opensesim/gui/account/AccountPanel.form b/src/opensesim/gui/account/AccountPanel.form
index e02b453..0219edf 100644
--- a/src/opensesim/gui/account/AccountPanel.form
+++ b/src/opensesim/gui/account/AccountPanel.form
@@ -17,11 +17,26 @@
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -36,10 +51,11 @@
-
+
@@ -63,5 +79,15 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/opensesim/gui/account/AccountPanel.java b/src/opensesim/gui/account/AccountPanel.java
index bcf32d5..3a0e0ef 100644
--- a/src/opensesim/gui/account/AccountPanel.java
+++ b/src/opensesim/gui/account/AccountPanel.java
@@ -66,13 +66,18 @@ public class AccountPanel extends javax.swing.JPanel implements EventListener {
Double mavail = account.getAvail(a);
String mastr = mval.toString(); // + "/" + mavail.toString();
+
+ Double sl = account.calcStopLoss(a);
+
// model.setValueAt(ob1.getAccount().getOwner().getName(), row, 0);
model.setValueAt(a.getSymbol(), row, 0);
model.setValueAt(astr, row, 1);
model.setValueAt(mastr, row, 2);
+ model.setValueAt(sl.toString(), row, 3);
row++;
}
+ this.finalbalance.setText(account.getFinalBalance().toString());
}
/**
@@ -86,21 +91,23 @@ public class AccountPanel extends javax.swing.JPanel implements EventListener {
jScrollPane1 = new javax.swing.JScrollPane();
assetTable = new javax.swing.JTable();
+ jLabel1 = new javax.swing.JLabel();
+ finalbalance = new javax.swing.JLabel();
assetTable.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
- {null, null, null},
- {null, null, null}
+ {null, null, null, null},
+ {null, null, null, null}
},
new String [] {
- "Asset", "Ammount", "Margin"
+ "Asset", "Ammount", "Margin", "SL"
}
) {
Class[] types = new Class [] {
- java.lang.String.class, java.lang.String.class, java.lang.String.class
+ java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class
};
boolean[] canEdit = new boolean [] {
- false, false, false
+ false, false, false, false
};
public Class getColumnClass(int columnIndex) {
@@ -113,21 +120,39 @@ public class AccountPanel extends javax.swing.JPanel implements EventListener {
});
jScrollPane1.setViewportView(assetTable);
+ jLabel1.setText("Final:");
+
+ finalbalance.setText("jLabel2");
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(jLabel1)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(finalbalance)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 214, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(32, 32, 32)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel1)
+ .addComponent(finalbalance))
+ .addGap(0, 32, Short.MAX_VALUE))
);
}// //GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JTable assetTable;
+ private javax.swing.JLabel finalbalance;
+ private javax.swing.JLabel jLabel1;
private javax.swing.JScrollPane jScrollPane1;
// End of variables declaration//GEN-END:variables