Menu
▾
▴
[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/report NewReportFrame.java, 1.28
|
From: Carlos <ma...@us...> - 2007-10-29 18:22:21
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14847/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Ajustada tela de new report. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** NewReportFrame.java 29 Oct 2007 18:02:35 -0000 1.27 --- NewReportFrame.java 29 Oct 2007 18:22:23 -0000 1.28 *************** *** 3,6 **** --- 3,8 ---- import java.awt.Component; import java.awt.Dimension; + import java.awt.Font; + import java.awt.GridLayout; import java.awt.Insets; import java.awt.event.ActionEvent; *************** *** 17,20 **** --- 19,23 ---- import javax.script.ScriptException; + import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.GroupLayout; *************** *** 78,82 **** private JCheckBox notSoFastCheckBox; private JScrollPane customStrategyPane; - private JScrollPane radioGroupScrollPane; private JTabbedPane newReportTabbedPane; private JEditTextArea customStrategyTextArea; --- 81,84 ---- *************** *** 108,112 **** createButtonDefaultPanel = new JButton(); cancelButtonDefaultPanel = new JButton(); - radioGroupScrollPane = new JScrollPane(); radioGroupPanel = new JPanel(); radioButtonSMA = new JRadioButton(); --- 110,113 ---- *************** *** 169,173 **** }); - radioGroupScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); indicatorsButtonGroup.add(radioButtonSMA); indicatorsButtonGroup.add(radioButtonEMA); --- 170,173 ---- *************** *** 177,181 **** indicatorsButtonGroup.add(radioButtonWMA); ! radioButtonSMA.setText("SMA - " + indicatorBundle.getString("SMAIndicator")); radioButtonSMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonSMA.addActionListener(new ActionListener() { --- 177,182 ---- indicatorsButtonGroup.add(radioButtonWMA); ! radioButtonSMA.setToolTipText(indicatorBundle.getString("SMAIndicator")); ! radioButtonSMA.setText("SMA"); radioButtonSMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonSMA.addActionListener(new ActionListener() { *************** *** 185,189 **** }); ! radioButtonEMA.setText("EMA - " + indicatorBundle.getString("EMAIndicator")); radioButtonEMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonEMA.addActionListener(new ActionListener() { --- 186,191 ---- }); ! radioButtonEMA.setToolTipText(indicatorBundle.getString("EMAIndicator")); ! radioButtonEMA.setText("EMA"); radioButtonEMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonEMA.addActionListener(new ActionListener() { *************** *** 193,197 **** }); ! radioButtonRSI.setText("RSI - " + indicatorBundle.getString("RSIIndicator")); radioButtonRSI.setMargin(new Insets(0, 0, 0, 0)); radioButtonRSI.addActionListener(new ActionListener() { --- 195,200 ---- }); ! radioButtonRSI.setToolTipText(indicatorBundle.getString("RSIIndicator")); ! radioButtonRSI.setText("RSI"); radioButtonRSI.setMargin(new Insets(0, 0, 0, 0)); radioButtonRSI.addActionListener(new ActionListener() { *************** *** 201,205 **** }); ! radioButtonBollingerBands.setText("Bollinger Bands - " + indicatorBundle.getString("BollingerBandsIndicator")); radioButtonBollingerBands.setMargin(new Insets(0, 0, 0, 0)); radioButtonBollingerBands.addActionListener(new ActionListener() { --- 204,209 ---- }); ! radioButtonBollingerBands.setToolTipText(indicatorBundle.getString("BollingerBandsIndicator")); ! radioButtonBollingerBands.setText("Bollinger Bands"); radioButtonBollingerBands.setMargin(new Insets(0, 0, 0, 0)); radioButtonBollingerBands.addActionListener(new ActionListener() { *************** *** 209,213 **** }); ! radioButtonParabolicSAR.setText("Parabolic SAR - " + indicatorBundle.getString("ParabolicSarIndicator")); radioButtonParabolicSAR.setMargin(new Insets(0, 0, 0, 0)); radioButtonParabolicSAR.addActionListener(new ActionListener() { --- 213,218 ---- }); ! radioButtonParabolicSAR.setToolTipText(indicatorBundle.getString("ParabolicSarIndicator")); ! radioButtonParabolicSAR.setText("Parabolic SAR"); radioButtonParabolicSAR.setMargin(new Insets(0, 0, 0, 0)); radioButtonParabolicSAR.addActionListener(new ActionListener() { *************** *** 217,221 **** }); ! radioButtonWMA.setText("WMA - " + indicatorBundle.getString("WMAIndicator")); radioButtonWMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonWMA.addActionListener(new ActionListener() { --- 222,227 ---- }); ! radioButtonWMA.setToolTipText(indicatorBundle.getString("WMAIndicator")); ! radioButtonWMA.setText("WMA"); radioButtonWMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonWMA.addActionListener(new ActionListener() { *************** *** 225,305 **** }); ! notSoFastCheckBox.setText("Not So Fast Strategy"); notSoFastCheckBox.setMargin(new Insets(0, 0, 0, 0)); ! GroupLayout radioGroupPanelLayout = new GroupLayout(radioGroupPanel); ! radioGroupPanel.setLayout(radioGroupPanelLayout); ! radioGroupPanelLayout.setHorizontalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonSMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonEMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonRSI)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonBollingerBands)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonParabolicSAR)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonWMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(notSoFastCheckBox)) ! .addGap(314, 314, 314)); ! radioGroupPanelLayout.setVerticalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(radioGroupPanelLayout.createSequentialGroup() ! .addComponent(radioButtonSMA) ! .addGap(10, 10, 10) ! .addComponent(radioButtonEMA) ! .addGap(10,10, 10) ! .addComponent(radioButtonRSI) ! .addGap(10, 10, 10) ! .addComponent(radioButtonBollingerBands) ! .addGap(10, 10, 10) ! .addComponent(radioButtonParabolicSAR) ! .addGap(10, 10, 10) ! .addComponent(radioButtonWMA) ! .addGap(10, 10, 10) ! .addComponent(notSoFastCheckBox) ! .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 82, ! Short.MAX_VALUE).addContainerGap())); ! radioGroupScrollPane.setViewportView(radioGroupPanel); GroupLayout defaultTabPanel = new GroupLayout(defaultReportPanel); defaultReportPanel.setLayout(defaultTabPanel); ! defaultTabPanel.setHorizontalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! defaultTabPanel.createSequentialGroup().addGap(12).addGroup( ! defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! GroupLayout.Alignment.TRAILING, ! defaultTabPanel.createSequentialGroup().addComponent(cancelButtonDefaultPanel).addPreferredGap( ! LayoutStyle.ComponentPlacement.RELATED).addComponent(createButtonDefaultPanel)).addComponent( ! radioGroupScrollPane, GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE)).addContainerGap())); ! defaultTabPanel.linkSize(SwingConstants.HORIZONTAL, ! new Component[] { createButtonDefaultPanel, cancelButtonDefaultPanel }); ! defaultTabPanel.setVerticalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! GroupLayout.Alignment.TRAILING, ! defaultTabPanel.createSequentialGroup().addGap(12).addComponent(radioGroupScrollPane, GroupLayout.PREFERRED_SIZE, 251, ! GroupLayout.PREFERRED_SIZE).addGap(6).addGroup( ! defaultTabPanel.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(createButtonDefaultPanel) ! .addComponent(cancelButtonDefaultPanel)))); newReportTabbedPane.addTab("Default Report", defaultReportPanel); customStrategyTextArea.setTokenMarker(new TailSTokenMarker()); - // customStrategyTextArea.addKeyListener(new KeyListener() { - // @Override - // public void keyPressed(KeyEvent e) { - // textAreaTextChanged(e); - // } - // - // @Override - // public void keyReleased(KeyEvent e) { - // } - // - // @Override - // public void keyTyped(KeyEvent e) { - // } - // }); - customStrategyPane.setViewportView(customStrategyTextArea); customStrategyPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); --- 231,278 ---- }); ! notSoFastCheckBox.setText("No trades in less than 4 ticks."); ! notSoFastCheckBox.setToolTipText(indicatorBundle.getString("NotSoFastStrategy")); notSoFastCheckBox.setMargin(new Insets(0, 0, 0, 0)); ! radioGroupPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Select Default Strategy", 0, 0, new Font("Dialog", 1, 12)))); ! radioGroupPanel.setMaximumSize(new Dimension(750, 100)); ! radioGroupPanel.setMinimumSize(new Dimension(750, 100)); ! radioGroupPanel.setLayout(new GridLayout(0, 2, 15, 15)); ! radioGroupPanel.add(radioButtonSMA); ! radioGroupPanel.add(radioButtonEMA); ! radioGroupPanel.add(radioButtonRSI); ! radioGroupPanel.add(radioButtonBollingerBands); ! radioGroupPanel.add(radioButtonParabolicSAR); ! radioGroupPanel.add(radioButtonWMA); GroupLayout defaultTabPanel = new GroupLayout(defaultReportPanel); defaultReportPanel.setLayout(defaultTabPanel); ! defaultTabPanel.setHorizontalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(defaultTabPanel.createSequentialGroup() ! .addGap(12) ! .addGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(GroupLayout.Alignment.TRAILING, defaultTabPanel.createSequentialGroup() ! .addComponent(cancelButtonDefaultPanel) ! .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(createButtonDefaultPanel)) ! .addComponent(radioGroupPanel) ! .addComponent(notSoFastCheckBox)) ! .addContainerGap())); ! defaultTabPanel.linkSize(SwingConstants.HORIZONTAL, new Component[] { createButtonDefaultPanel, cancelButtonDefaultPanel }); ! defaultTabPanel.setVerticalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, defaultTabPanel.createSequentialGroup() ! .addGap(12) ! .addComponent(radioGroupPanel) ! .addGap(12) ! .addComponent(notSoFastCheckBox) ! .addGap(20) ! .addGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.BASELINE) ! .addComponent(createButtonDefaultPanel) ! .addComponent(cancelButtonDefaultPanel)))); newReportTabbedPane.addTab("Default Report", defaultReportPanel); customStrategyTextArea.setTokenMarker(new TailSTokenMarker()); customStrategyPane.setViewportView(customStrategyTextArea); customStrategyPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); *************** *** 412,431 **** } - // private void textAreaTextChanged(KeyEvent keyEvent) { - // if (keyEvent.isControlDown() == true) { - // switch (keyEvent.getKeyCode()) { - // case KeyEvent.VK_SPACE: - // - // // new - // // AutoCompleteForm(customStrategyTextArea).setVisible(true); - // break; - // - // default: - // break; - // } - // } - // // customStrategyTextArea.paste(); - // } - private void defaultPanelCreateButtonActionPerformed(ActionEvent evt) { if (reportNameField.getText().equals("")) { --- 385,388 ---- *************** *** 434,438 **** else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60, notSoFastCheckBox.isSelected()); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); --- 391,395 ---- else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); |
