Normand Briere
2019-02-22 611518a0ff65fd05e517d44adbcec639570b86eb
timeflow/app/ui/GlobalDisplayPanel.java
....@@ -21,7 +21,7 @@
2121 JPanel globalControls = new JPanel();
2222 CardLayout localCards = new CardLayout();
2323
24
- public GlobalDisplayPanel(TFModel model, FilterControlPanel filterControls)
24
+ public GlobalDisplayPanel(TimeflowModel model, FilterControlPanel filterControls)
2525 {
2626 super(model);
2727 setBackground(Color.white);
....@@ -56,12 +56,12 @@
5656 };
5757 label.setBackground(Color.lightGray);
5858 label.setForeground(Color.darkGray);
59
- globalLabel.add(label, BorderLayout.CENTER);
59
+ //globalLabel.add(label, BorderLayout.CENTER);
6060 p.add(globalLabel, BorderLayout.NORTH);
6161
6262 JPanel global = new JPanel();
6363 global.setLayout(new BorderLayout());
64
- global.add(new StatusPanel(model, filterControls), BorderLayout.NORTH);
64
+ //global.add(new StatusPanel(model, filterControls), BorderLayout.NORTH);
6565
6666 encodings.setLayout(new GridLayout(4, 1));
6767 encodings.setBackground(Color.white);
....@@ -74,12 +74,13 @@
7474
7575 public void showLocalControl(String name)
7676 {
77
- localCards.show(localControls, name);
77
+ //localCards.show(localControls, name);
7878 }
7979
8080 public void addLocalControl(String name, JComponent control)
8181 {
82
- localControls.add(control, name);
82
+ if (name.equals("Timeline"))
83
+ localControls.add(control, name);
8384 }
8485
8586 void makeEncodingPanel()