1.1 --- a/isac-java/src/java-tests/isac/gui/mawen/TestTermTreeView.java Mon May 16 14:43:21 2016 +0200
1.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/TestTermTreeView.java Tue May 17 09:49:19 2016 +0200
1.3 @@ -90,7 +90,7 @@
1.4 main_frame_.setSize(600, 300);
1.5 main_frame_.setVisible(true);
1.6 //window closes immediately without this
1.7 - try { Thread.sleep(5000); } catch (InterruptedException e) { e.printStackTrace(); }
1.8 + try { Thread.sleep(8000); } catch (InterruptedException e) { e.printStackTrace(); }
1.9 }
1.10
1.11 @Override
2.1 --- a/isac-java/src/java-tests/isac/gui/mawen/Testall.java Mon May 16 14:43:21 2016 +0200
2.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/Testall.java Tue May 17 09:49:19 2016 +0200
2.3 @@ -25,7 +25,7 @@
2.4 // suite.addTestSuite(isac.gui.mawen.TestWorksheetForMawen.class);
2.5
2.6 //tests from subdirectories
2.7 - suite.addTest(isac.gui.mawen.scalaterm.Testall.suite());
2.8 + //suite.addTest(isac.gui.mawen.scalaterm.Testall.suite());
2.9
2.10 return suite;
2.11 }
3.1 --- a/isac-java/src/java/isac/gui/Worksheet.java Mon May 16 14:43:21 2016 +0200
3.2 +++ b/isac-java/src/java/isac/gui/Worksheet.java Tue May 17 09:49:19 2016 +0200
3.3 @@ -279,7 +279,7 @@
3.4 mouse_point_ = e.getPoint();
3.5 TreePath selPath = tree_.getPathForLocation(e.getX(), e.getY());
3.6
3.7 - if (calc_head_visible_) {
3.8 + if (calc_head_visible_||term_tree_visible_) {
3.9 moveToBack();
3.10 } else {
3.11 if (selPath != null) {
3.12 @@ -1022,7 +1022,7 @@
3.13 UIAction ccf_action = (UIAction) action;
3.14 selected_node_ = calc_hierarchy_.getNodeForValue(ccf_action
3.15 .getPosition(), calc_hierarchy_.getRoot());
3.16 - if (!calc_head_visible_) {
3.17 + if (!calc_head_visible_&&!term_tree_visible_) {
3.18 TreePath sel_path = calc_hierarchy_
3.19 .getPathToNode(selected_node_);
3.20 tree_.setSelectionPath(sel_path);
3.21 @@ -1030,7 +1030,7 @@
3.22 }
3.23 break;
3.24 case UI_SOLVE_TERM_TREE:
3.25 - if (!term_tree_visible_) {
3.26 + if (!term_tree_visible_&&!term_tree_visible_) {
3.27 CalcFormula cf = (CalcFormula) (((UIActionOnCalcElement) action)
3.28 .getCalcElement());
3.29 openTermTreePanel(cf);
3.30 @@ -1043,7 +1043,7 @@
3.31 }
3.32 break;
3.33 case UI_CONTEXT_SWITCH_PHASES:
3.34 - if (!calc_head_visible_) {
3.35 + if (!calc_head_visible_&&!term_tree_visible_) {
3.36 CalcHead calc_head = (CalcHead) (((UIActionOnCalcElement) action)
3.37 .getCalcElement());
3.38 openCalcHeadPanel(calc_head);
3.39 @@ -1074,6 +1074,7 @@
3.40
3.41 if (e.getSource() == panel_frame_) {
3.42 calc_head_visible_ = false;
3.43 + term_tree_visible_ = false;
3.44 tree_.setEditable(!calc_head_visible_);
3.45 return;
3.46 }
3.47 @@ -1129,6 +1130,7 @@
3.48 // / the method gets the notifications from WindowApplication main Window
3.49 public void windowClosing(WindowEvent arg0) {
3.50 calc_head_visible_ = false;
3.51 + term_tree_visible_ = false;
3.52 try {
3.53 dialog_.notifyUserAction(new UserAction(
3.54 EUIElement.UI_CLOSE_WORKSHEET));
4.1 --- a/isac-java/src/java/isac/gui/mawen/termtree/TermTreeFormPanel.java Mon May 16 14:43:21 2016 +0200
4.2 +++ b/isac-java/src/java/isac/gui/mawen/termtree/TermTreeFormPanel.java Tue May 17 09:49:19 2016 +0200
4.3 @@ -2,6 +2,7 @@
4.4
4.5 import isac.util.formulae.CalcFormula;
4.6
4.7 +import java.awt.BorderLayout;
4.8 import java.awt.event.ActionEvent;
4.9 import java.awt.event.ActionListener;
4.10
4.11 @@ -9,6 +10,7 @@
4.12 import javax.swing.JPanel;
4.13 import javax.swing.event.CaretEvent;
4.14 import javax.swing.event.CaretListener;
4.15 +import javax.swing.tree.DefaultMutableTreeNode;
4.16 /**
4.17 * The TermTreeEditPanel holds the tree-representation of the
4.18 * active_formula(context_formula).
4.19 @@ -21,10 +23,9 @@
4.20 */
4.21 public class TermTreeFormPanel extends JPanel implements CaretListener, ActionListener{
4.22 private JLabel test_formula_;
4.23 - //TODO build tree
4.24 - /**
4.25 - *
4.26 - */
4.27 + private TermTree term_tree_;
4.28 + private CalcFormula calc_formula_;
4.29 +
4.30 private static final long serialVersionUID = 1L;
4.31
4.32 public TermTreeFormPanel(){
4.33 @@ -34,9 +35,13 @@
4.34 }
4.35
4.36 public TermTreeFormPanel(CalcFormula formula){
4.37 + calc_formula_=formula;
4.38 test_formula_ = new JLabel();
4.39 test_formula_.setText(formula.getFormula().toSMLString());
4.40 - this.add(test_formula_);
4.41 + this.setLayout(new BorderLayout());
4.42 + this.add(test_formula_, BorderLayout.NORTH);
4.43 +
4.44 + buildTree();
4.45 }
4.46
4.47 public JLabel getTest_formula_() {
4.48 @@ -58,5 +63,11 @@
4.49 // TODO Auto-generated method stub
4.50
4.51 }
4.52 + public void buildTree(){
4.53 + DefaultMutableTreeNode root = new DefaultMutableTreeNode(calc_formula_.getFormula().toSMLString());
4.54 + //TODO decompose formula
4.55 + term_tree_ = new TermTree(root);
4.56 + this.add(term_tree_, BorderLayout.CENTER);
4.57 + }
4.58
4.59 }
5.1 --- a/isac-java/src/java/isac/gui/mawen/termtree/TermTreeView.java Mon May 16 14:43:21 2016 +0200
5.2 +++ b/isac-java/src/java/isac/gui/mawen/termtree/TermTreeView.java Tue May 17 09:49:19 2016 +0200
5.3 @@ -39,8 +39,6 @@
5.4 * Developed under the model of <code>TestCalcheadView.testShowCalchead()</code>
5.5 */
5.6 public void initComponents() {
5.7 -
5.8 - //TODO pass test formula to tree from WSD
5.9 ttep_ = new TermTreeFormPanel(calc_formula_);
5.10 //should be optional (ViewStyle)
5.11 ttrp_ = new TermTreeRulePanel();
5.12 @@ -52,5 +50,4 @@
5.13 this.setSize(600, 300);
5.14 this.setVisible(true);
5.15 }
5.16 -
5.17 }
5.18 \ No newline at end of file
6.1 --- a/isac-java/src/java/isac/wsdialog/WorksheetDialog.java Mon May 16 14:43:21 2016 +0200
6.2 +++ b/isac-java/src/java/isac/wsdialog/WorksheetDialog.java Tue May 17 09:49:19 2016 +0200
6.3 @@ -1148,9 +1148,9 @@
6.4 EUIContext.UI_CONTEXT_ONEELEMENT, user_language_,
6.5 cf));
6.6 //TODO still something wrong with this one?
6.7 - ui_control_listener_.addUIElement(new UIAction(
6.8 - EUIElement.UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE,
6.9 - EUIContext.UI_CONTEXT_ONEELEMENT, user_language_));
6.10 + //ui_control_listener_.addUIElement(new UIAction(
6.11 + //EUIElement.UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE,
6.12 + //EUIContext.UI_CONTEXT_ONEELEMENT, user_language_));
6.13 addNextAndAutoButtonForWorksheet();
6.14
6.15