Changed chart in main window

This commit is contained in:
7u83 2017-10-07 07:38:05 +02:00
parent 9e4d46ee99
commit f7b56294e9
3 changed files with 8 additions and 43 deletions

View File

@ -1,4 +1,4 @@
#Sat, 07 Oct 2017 02:38:10 +0200 #Sat, 07 Oct 2017 07:36:14 +0200
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.processors.list= annotation.processing.processors.list=

View File

@ -434,32 +434,13 @@
</Constraint> </Constraint>
</Constraints> </Constraints>
</Component> </Component>
<Container class="javax.swing.JScrollPane" name="chartSrollPane"> <Component class="chart.MasterChart" name="chart">
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
<JSplitPaneConstraints position="left"/> <JSplitPaneConstraints position="left"/>
</Constraint> </Constraint>
</Constraints> </Constraints>
</Component>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Container class="gui.MainChart" name="chart">
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
</Container>
</SubComponents>
</Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Component class="gui.orderbook.QuoteVertical" name="quoteVertical1"> <Component class="gui.orderbook.QuoteVertical" name="quoteVertical1">

View File

@ -85,7 +85,7 @@ public class SeSimApplication extends javax.swing.JFrame {
Globals.prefs.putBoolean("initilized", true); Globals.prefs.putBoolean("initilized", true);
} }
this.chartSrollPane.setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_NEVER); // this.chartSrollPane.setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_NEVER);
} }
@ -182,8 +182,7 @@ public class SeSimApplication extends javax.swing.JFrame {
jSplitPane3 = new javax.swing.JSplitPane(); jSplitPane3 = new javax.swing.JSplitPane();
jSplitPane4 = new javax.swing.JSplitPane(); jSplitPane4 = new javax.swing.JSplitPane();
orderBooksHorizontal1 = new gui.orderbook.OrderBooksHorizontal(); orderBooksHorizontal1 = new gui.orderbook.OrderBooksHorizontal();
chartSrollPane = new javax.swing.JScrollPane(); chart = new chart.MasterChart();
chart = new gui.MainChart();
quoteVertical1 = new gui.orderbook.QuoteVertical(); quoteVertical1 = new gui.orderbook.QuoteVertical();
jSplitPane5 = new javax.swing.JSplitPane(); jSplitPane5 = new javax.swing.JSplitPane();
statistics1 = new gui.Statistics(); statistics1 = new gui.Statistics();
@ -318,21 +317,7 @@ public class SeSimApplication extends javax.swing.JFrame {
jSplitPane4.setDividerLocation(300); jSplitPane4.setDividerLocation(300);
jSplitPane4.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); jSplitPane4.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
jSplitPane4.setBottomComponent(orderBooksHorizontal1); jSplitPane4.setBottomComponent(orderBooksHorizontal1);
jSplitPane4.setLeftComponent(chart);
javax.swing.GroupLayout chartLayout = new javax.swing.GroupLayout(chart);
chart.setLayout(chartLayout);
chartLayout.setHorizontalGroup(
chartLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 0, Short.MAX_VALUE)
);
chartLayout.setVerticalGroup(
chartLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 0, Short.MAX_VALUE)
);
chartSrollPane.setViewportView(chart);
jSplitPane4.setLeftComponent(chartSrollPane);
jSplitPane3.setRightComponent(jSplitPane4); jSplitPane3.setRightComponent(jSplitPane4);
jSplitPane3.setLeftComponent(quoteVertical1); jSplitPane3.setLeftComponent(quoteVertical1);
@ -599,7 +584,7 @@ public class SeSimApplication extends javax.swing.JFrame {
void resetSim() { void resetSim() {
Globals.se.terminate(); Globals.se.terminate();
Globals.se.reset(); Globals.se.reset();
chart.initChart(); // chart.initChart();
chart.invalidate(); chart.invalidate();
chart.repaint(); chart.repaint();
// this.orderBookPanel.invalidate(); // this.orderBookPanel.invalidate();
@ -921,8 +906,7 @@ public class SeSimApplication extends javax.swing.JFrame {
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JMenuItem aboutMenuItem; private javax.swing.JMenuItem aboutMenuItem;
private javax.swing.JSpinner accelSpinner; private javax.swing.JSpinner accelSpinner;
private gui.MainChart chart; private chart.MasterChart chart;
private javax.swing.JScrollPane chartSrollPane;
private javax.swing.JMenuItem clearMenuItem; private javax.swing.JMenuItem clearMenuItem;
private gui.Clock clock; private gui.Clock clock;
private javax.swing.JMenuItem closeMenuItem; private javax.swing.JMenuItem closeMenuItem;