From 8b6ace550ca115d15b1d93ffc4e1b7e0e163aaa9 Mon Sep 17 00:00:00 2001
From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 8 Nov 2011 10:50:20 +0000
Subject: [PATCH] Orientation handling for the chart panel prototype

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23228 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../icons/page_white_text.png                 | Bin 0 -> 342 bytes
 .../icons/page_white_text_width.png           | Bin 0 -> 315 bytes
 org.simantics.sysdyn.ui/plugin.xml            |  20 +-
 .../ChartPanelOrientationHandler.java         | 101 +++++
 .../simantics/sysdyn/ui/trend/ChartPanel.java | 411 ++++++++----------
 .../sysdyn/ui/trend/ChartPanelElement.java    |  99 +++++
 .../sysdyn/ui/trend/ChartPanelHeader.java     |  94 ++++
 7 files changed, 497 insertions(+), 228 deletions(-)
 create mode 100644 org.simantics.sysdyn.ui/icons/page_white_text.png
 create mode 100644 org.simantics.sysdyn.ui/icons/page_white_text_width.png
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ChartPanelOrientationHandler.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelElement.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelHeader.java

diff --git a/org.simantics.sysdyn.ui/icons/page_white_text.png b/org.simantics.sysdyn.ui/icons/page_white_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..813f712f726c935f9adf8d2f2dd0d7683791ef11
GIT binary patch
literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%6;pyTSA|c6o&@eC9QG)Hj&ExYL
zO&oVL^)+cM^qd@ApywS>pwx0H@RDN}hq;7mU-SKczYQ-hnrr=;iDAQMZQ+*g=YOM=
z!QlMQEn7FbaD->uKAYgo_j9)W&$$zS*W9}m(ey0q$&7l-XEWO0Y(9M=SnhLbwy<xp
z<-V!w{rtjKUv+o*|6m()ceab>;d>@~SY$Ku*0xPvIOQeV1x7u_z-2-X>_74(yfh7C
znXL|3GZ+d2`3re2hs?MK<V&+KGL$sTUzRzG=^m3+$2Td42G30@X|lcy44dbP=-$#!
h7h_<U68r8SGxL_I=i_|Jgn@o$@O1TaS?83{1OPX3f*b$<

literal 0
HcmV?d00001

diff --git a/org.simantics.sysdyn.ui/icons/page_white_text_width.png b/org.simantics.sysdyn.ui/icons/page_white_text_width.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9cf13256f44ae8092e07e88b0f4243a8efa9f0e
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-$R>*?YcqH(@;f-l!01CbW>s1Izr
z3LkoHh<3E?TVANoG4CX|$empRCCS=R(U(hVJfm~E?IkDKRK&NP2|n`v>d(vV;W1uY
zrFGVdwn;4b{qUtE`?GB`)E1ga&i2|7ncUL1b!KMq^QnT#_gn?_Z8(c`1Q~Vy3oL!N
z$M8vHL&U1J3SJF!56azQU3B6>r|Z<jccPJhU%kJyjccN^^Zu@t0(%~NT9;SH%x{jL
z-@wch!QOO?qln#ipQT9r(|mUBpYvsJ?7CW1`Z{%m_wKc^XTPwP{_lx=a!BDP&|?gq
Lu6{1-oD!M<<Ar`2

literal 0
HcmV?d00001

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index c6f9ccb5..2fa55a78 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -107,6 +107,7 @@
          </description>
       </view>
       <view
+            category="org.simantics.sysdyn.ui.category"
             class="org.simantics.sysdyn.ui.trend.ChartPanel"
             icon="platform:/plugin/com.famfamfam.silk/icons/chart_line.png"
             id="org.simantics.sysdyn.ui.chartPanel"
@@ -188,8 +189,8 @@
          </view>
          <view
                id="org.simantics.sysdyn.ui.chartPanel"
-               minimized="false"
-               ratio="0.25"
+               minimized="true"
+               ratio="0.5"
                relationship="right"
                relative="org.eclipse.ui.editorss">
          </view>
@@ -735,6 +736,16 @@
                style="push">
          </command>
       </menuContribution>
+      <menuContribution
+            locationURI="toolbar:org.simantics.sysdyn.ui.chartPanel">
+         <command
+               commandId="org.simantics.sysdyn.ui.chartPanelOrientation"
+               icon="platform:/plugin/com.famfamfam.silk/icons/page_white_text.png"
+               label="Change Orientation"
+               style="push"
+               tooltip="Change orientation">
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
@@ -904,6 +915,11 @@
             id="org.simantics.sysdyn.ui.playbackReload"
             name="Reload Playback">
       </command>
+      <command
+            defaultHandler="org.simantics.sysdyn.ui.handlers.ChartPanelOrientationHandler"
+            id="org.simantics.sysdyn.ui.chartPanelOrientation"
+            name="Chart Panel Orientation">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ChartPanelOrientationHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ChartPanelOrientationHandler.java
new file mode 100644
index 00000000..c000bf81
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ChartPanelOrientationHandler.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.handlers;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.commands.IElementUpdater;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.menus.UIElement;
+import org.simantics.sysdyn.ui.Activator;
+import org.simantics.sysdyn.ui.trend.ChartPanel;
+
+/**
+ * This handler changes the orientation of a {@link ChartPanel}
+ * 
+ * @author Teemu Lempinen
+ *
+ */
+public class ChartPanelOrientationHandler extends AbstractHandler implements IElementUpdater {
+
+    private static String COMMAND = "org.simantics.sysdyn.ui.chartPanelOrientation";
+    
+    /**
+     * Read chart panel settings from IDialogSettings and change the orientation accordingly.
+     * Finally order the element to update its appearance.
+     */
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        IWorkbenchPart part = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActivePart();
+        if(part instanceof ChartPanel) {
+            IDialogSettings settings = Activator.getDefault().getDialogSettings().getSection(ChartPanel.CHART_PANEL_SETTINGS);
+            if (settings == null) {
+                settings = Activator.getDefault().getDialogSettings().addNewSection(ChartPanel.CHART_PANEL_SETTINGS);
+            }
+            
+            String orientation = settings.get(ChartPanel.CHART_PANEL_ORIENTATION);
+            if(orientation == null)
+                settings.put(ChartPanel.CHART_PANEL_ORIENTATION, ChartPanel.CHART_PANEL_VERTICAL);
+            
+            if(ChartPanel.CHART_PANEL_VERTICAL.equals(orientation))
+                orientation = ChartPanel.CHART_PANEL_HORIZONTAL;
+            else
+                orientation = ChartPanel.CHART_PANEL_VERTICAL;
+            
+            settings.put(ChartPanel.CHART_PANEL_ORIENTATION, orientation);
+            ((ChartPanel)part).setOrientation(orientation);
+            
+            ICommandService commandService =
+                    (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+            commandService.refreshElements(COMMAND, null);
+        }
+
+        return null;
+    }
+
+    /**
+     * Update the icon of the element. The new icon and text are always opposite to the current situation.
+     */
+    @SuppressWarnings("rawtypes")
+    @Override
+    public void updateElement(UIElement element, Map parameters) {
+        if(parameters == null)
+            return;
+        
+        IDialogSettings settings = Activator.getDefault().getDialogSettings().getSection(ChartPanel.CHART_PANEL_SETTINGS);
+        if (settings == null) {
+            settings = Activator.getDefault().getDialogSettings().addNewSection(ChartPanel.CHART_PANEL_SETTINGS);
+        }
+        
+        String orientation = settings.get(ChartPanel.CHART_PANEL_ORIENTATION);
+        if(orientation == null)
+            return;
+        
+        // Show the opposite icon and text to indicate change when the button is pressed
+        if(ChartPanel.CHART_PANEL_HORIZONTAL.equals(orientation)) {
+            element.setIcon(ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getResource("icons/page_white_text.png")));
+            element.setTooltip("Vertical Orientation");
+        } else if (ChartPanel.CHART_PANEL_VERTICAL.equals(orientation)) {
+            element.setIcon(ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getResource("icons/page_white_text_width.png")));
+            element.setTooltip("Horizontal Orientation");
+        }
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanel.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanel.java
index 65e97ddf..5782adf4 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanel.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanel.java
@@ -11,267 +11,226 @@
  *******************************************************************************/
 package org.simantics.sysdyn.ui.trend;
 
-import java.awt.Frame;
-import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.awt.SWT_AWT;
 import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Transform;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.ViewPart;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.ChartFrame;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.DateAxis;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.data.time.Day;
-import org.jfree.data.time.TimeSeries;
-import org.jfree.data.time.TimeSeriesCollection;
-import org.simantics.g2d.chassis.SWTChassis;
-import org.simantics.utils.threads.SWTThread;
-import org.simantics.utils.threads.ThreadUtils;
-import org.simantics.utils.ui.SWTAWTComponent;
-
+import org.simantics.sysdyn.ui.Activator;
+
+/**
+ * Chart panel displays multiple charts in a single view. The view can be oriented 
+ * vertically or horizontally, the default is vertical. Charts can be added, removed 
+ * minimized or expanded. The order of the charts can be changed by dragging the charts.
+ * 
+ * @author Teemu Lempinen
+ *
+ */
 public class ChartPanel extends ViewPart {
 
-    ScrolledComposite sc;
-    Composite composite;
+    private Composite body;
+    private ScrolledComposite sc;
+    
+    private IDialogSettings settings;
+    private ArrayList<String> expandedCharts;
+    private ArrayList<String>  minimizedCharts;
+    
+//    private ArrayList<ChartPanelElement> elements;
+//    private ArrayList<Label> separators;
 
-    @Override
-    public void createPartControl(Composite parent) {
-        Composite c = new Composite(parent, SWT.NONE);
-        GridLayoutFactory.fillDefaults().applyTo(c);
+    public static final String CHART_PANEL_SETTINGS = "CHART_PANEL_SETTINGS";
+    public static final String EXPANDED_CHARTS = "ChartPanel.EXPANDED_CHARTS";
+    public static final String MINIMIZED_CHARTS = "ChartPanel.MINIMIZED_CHARTS";
+    public static final String CHART_PANEL_ORIENTATION = "CHART_PANEL_ORIENTATION";
+    
+    public static final String CHART_PANEL_VERTICAL = "CHART_PANEL_ORIENTATION_VERTICAL";
+    public static final String CHART_PANEL_HORIZONTAL = "CHART_PANEL_ORIENTATION_HORIZONTAL";
+    
+    private boolean vertical = true;
 
-        sc = new ScrolledComposite(c, SWT.H_SCROLL | SWT.V_SCROLL);
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(sc);
-        GridLayoutFactory.fillDefaults().applyTo(sc);
+    /**
+     * Initialize the view. Load charts that have previously been open (if there are any).
+     */
+    @Override
+    public void init(IViewSite site, IMemento memento) throws PartInitException {
+        super.init(site, memento);
+        
+//        elements = new ArrayList<ChartPanelElement>();
+//        separators = new ArrayList<Label>();
+        
+        settings = Activator.getDefault().getDialogSettings().getSection(CHART_PANEL_SETTINGS);
+        if (settings == null) {
+            settings = Activator.getDefault().getDialogSettings().addNewSection(CHART_PANEL_SETTINGS);
+            
+            String[] expandedUris = new String[] {"Module1.Variable1[index3]", "Module1.Variable2[index3]"};
+            settings.put(EXPANDED_CHARTS, expandedUris);
+            
+            String[] minimizedUris = new String[] {"Module1.Variable3[index3]", "Module1.Variable4[index3]", "Module1.Variable5[index3]", "Module1.Variable6[index3]"};
+            settings.put(MINIMIZED_CHARTS, minimizedUris);
+        }
+        
+        expandedCharts = new ArrayList<String>();
+        String[] expandedURIs = settings.getArray(EXPANDED_CHARTS);
+        for(String e : expandedURIs)
+            expandedCharts.add(e);
         
-        composite = new Composite(sc, SWT.NONE);
-        GridLayoutFactory.fillDefaults().numColumns(6).applyTo(composite);
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);
+        minimizedCharts = new ArrayList<String>();
+        String[] minimizedURIs = settings.getArray(MINIMIZED_CHARTS);
+        for(String m : minimizedURIs)
+            minimizedCharts.add(m);
         
         
-        sc.setContent(composite);
+        String orientation = settings.get(CHART_PANEL_ORIENTATION);
+        if(CHART_PANEL_VERTICAL.equals(orientation))
+            this.vertical = true;
+        else
+            this.vertical = false;
+    }
+
+    /**
+     * Create a scrolled composite that will contain all the charts, then call the actual 
+     * content creator.
+     */
+    @Override
+    public void createPartControl(Composite parent) {
+        sc = new ScrolledComposite(parent, SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL);
+        GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(sc);
+        GridDataFactory.fillDefaults().grab(true, true).applyTo(sc);
         sc.setExpandHorizontal(true);
         sc.setExpandVertical(true);
-        sc.getVerticalBar().setIncrement(30);
-        sc.getVerticalBar().setPageIncrement(200);
-        sc.addControlListener( new ControlAdapter() {
-            @Override
-            public void controlResized(ControlEvent e) {
-                //System.out.println("ScrolledComposite resized: " + sc.getSize());
-                refreshScrolledComposite();
-            }
-        });
         
-        final Canvas canvas = new Canvas(composite, SWT.BORDER);
-        // Create a paint handler for the canvas
-        canvas.addPaintListener(new PaintListener() {
-            public void paintControl(PaintEvent e) {
-                int canvasHeight = canvas.getSize().y;
-                String text = "Module1.Variable2[index3]";
-                Transform t = new Transform(e.display);
-                t.rotate(-90);
-                t.translate(- (canvasHeight - 10), 0);
-                e.gc.setTransform(t);
-                e.gc.setForeground(e.display.getSystemColor(SWT.COLOR_BLACK));
-                e.gc.drawText(text, 0, 0);
-            }
-        });
-        GridDataFactory.fillDefaults().hint(20, SWT.DEFAULT).grab(false, true).applyTo(canvas);
-        canvas.setCursor(new Cursor(canvas.getDisplay(), SWT.CURSOR_HAND));
-        canvas.addMouseListener(new NewTrendListener());
-        ToolTipListener ttl = new ToolTipListener(canvas);
-        canvas.addListener(SWT.Dispose, ttl);
-        canvas.addListener(SWT.KeyDown, ttl);
-        canvas.addListener(SWT.MouseMove, ttl);
-        canvas.addListener(SWT.MouseHover, ttl);
+        body = new Composite(sc, SWT.NONE);
+        GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(body);
+        GridDataFactory.fillDefaults().grab(true, true).applyTo(body);
         
-        Composite swtComposite = new Composite(composite,
-                SWT.NO_BACKGROUND | SWT.EMBEDDED);
-        GridDataFactory.fillDefaults().hint(200, 200).applyTo(swtComposite);
-        Frame frame = SWT_AWT.new_Frame(swtComposite);
-        setChart(frame);
+        sc.setContent(body);
+
+        createContents(body);
     }
+    
+    /**
+     * Display charts in this chart panel in the following order regardless of the orientation:
+     * 1. Remove old content
+     * 2. Display expanded charts
+     * 3. Display minimized charts 
+     * 
+     * @param parent Body located inside a scrolled composite and containing the charts. (always private Composite body?)
+     */
+    private void createContents(Composite parent) {
+        for(Control c : parent.getChildren()) 
+            c.dispose();
+        
+        Composite composite = new Composite(parent, SWT.NONE);
+
+        if(vertical) {
+            GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(composite);
+            GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);
+        } else {
+            int en = expandedCharts.size();
+            int mn = minimizedCharts.isEmpty() ? 0 : 1;
+            GridLayoutFactory.fillDefaults().spacing(0, 0).numColumns(en + mn).applyTo(composite);
+            GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);
+        }
+
+        for(String e : expandedCharts)
+            new ChartPanelElement(composite, this, e, SWT.NONE);
 
+        if(!minimizedCharts.isEmpty()) {
+            Composite minimized = new Composite(composite, SWT.NONE);
+            GridDataFactory.fillDefaults().hint(ChartPanelHeader.HEADER_MINIMUM_WIDTH, SWT.DEFAULT).applyTo(minimized);
+            GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(minimized);
+
+            for(String m : minimizedCharts)
+                new ChartPanelHeader(minimized, this, m, SWT.BORDER);
+        }
+
+        parent.layout();
+        
+        sc.setMinSize(body.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+        saveState();
+    }
 
     @Override
     public void setFocus() {
+        if(!body.isDisposed())
+            body.setFocus();
     }
 
     @Override
-    public void dispose() {
-
+    public void saveState(IMemento memento) {
+        super.saveState(memento);
+        saveState();
     }
     
-    
-    void refreshScrolledComposite() {
-        // Execute asynchronously to give the UI events triggering this method
-        // call time to run through before actually doing any resizing.
-        // Otherwise the result will lag behind reality when scrollbar
-        // visibility is toggled by the toolkit.
-        ThreadUtils.asyncExec(SWTThread.getThreadAccess(composite.getDisplay()), new Runnable() {
-            @Override
-            public void run() {
-                if (sc.isDisposed())
-                    return;
-                syncRefreshScrolledComposite();
+    /**
+     * Save the current state of the view to IDialogSettings 
+     */
+    private void saveState() {
+        if (settings != null) {
+            String[] expandedURIs = settings.getArray(EXPANDED_CHARTS);
+            if (expandedURIs == null) {
+                expandedURIs = new String[0];
             }
-        });
-    }
-
-    void syncRefreshScrolledComposite() {
-        // Execute asynchronously to give the UI events triggering this method
-        // call time to run through before actually doing any resizing.
-        // Otherwise the result will lag behind reality when scrollbar
-        // visibility is toggled by the toolkit.
-        Rectangle r = sc.getClientArea();
-        Point contentSize = composite.computeSize(r.width, SWT.DEFAULT);
-        //System.out.println("[" + Thread.currentThread() + "] computed content size: " + contentSize + ", " + r);
-        composite.setSize(contentSize);
-    }
-    
-    private class NewTrendListener implements MouseListener {
-
-        @Override
-        public void mouseUp(MouseEvent e) {
-            final Canvas canvas = new Canvas(composite, SWT.BORDER);
-            // Create a paint handler for the canvas
-            canvas.addPaintListener(new PaintListener() {
-                public void paintControl(PaintEvent e) {
-                    int canvasHeight = canvas.getSize().y;
-                    String text = "Module1.Variable2[index3]";
-                    Transform t = new Transform(e.display);
-                    t.rotate(-90);
-                    t.translate(- (canvasHeight - 10), 0);
-                    e.gc.setTransform(t);
-                    e.gc.setForeground(e.display.getSystemColor(SWT.COLOR_BLACK));
-                    e.gc.drawText(text, 0, 0);
-                }
-            });
-            GridDataFactory.fillDefaults().hint(20, SWT.DEFAULT).grab(false, true).applyTo(canvas);
-            composite.layout();
-            canvas.addMouseListener(this);
-            canvas.setCursor(new Cursor(canvas.getDisplay(), SWT.CURSOR_HAND));
-            ToolTipListener ttl = new ToolTipListener(canvas);
-            canvas.addListener(SWT.Dispose, ttl);
-            canvas.addListener(SWT.KeyDown, ttl);
-            canvas.addListener(SWT.MouseMove, ttl);
-            canvas.addListener(SWT.MouseHover, ttl);
+            expandedURIs = expandedCharts.toArray(new String[expandedCharts.size()]);
+            settings.put(EXPANDED_CHARTS, expandedURIs);
             
-            Composite swtComposite = new Composite(composite,
-                    SWT.NO_BACKGROUND | SWT.EMBEDDED);
-            Frame frame = SWT_AWT.new_Frame(swtComposite);
-            GridDataFactory.fillDefaults().hint(200, 200).applyTo(swtComposite);
-            setChart(frame);
-            syncRefreshScrolledComposite();
-        }
-
-        @Override
-        public void mouseDown(MouseEvent e) {
-            // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void mouseDoubleClick(MouseEvent e) {
-            // TODO Auto-generated method stub
-
-        }
+            String[] minimizedURIs = settings.getArray(MINIMIZED_CHARTS);
+            if (minimizedURIs == null) {
+                minimizedURIs = new String[0];
+            }
+            minimizedURIs = minimizedCharts.toArray(new String[minimizedCharts.size()]);
+            settings.put(MINIMIZED_CHARTS, minimizedURIs);
+            
+            if(vertical)
+                settings.put(CHART_PANEL_ORIENTATION, CHART_PANEL_VERTICAL);
+            else
+                settings.put(CHART_PANEL_ORIENTATION, CHART_PANEL_HORIZONTAL);
+          }
+        
     }
     
-    
-    private void setChart(Frame frame) {
-        TimeSeries population = new TimeSeries("Indian Population");
-        population.add(new Day(1, 3, 1961), 439234771);
-        population.add(new Day(1, 3, 1971), 548159652);
-        population.add(new Day(1, 3, 1981), 683329097);
-        population.add(new Day(1, 3, 1991), 843387888);
-        population.add(new Day(1, 3, 2001), 1028610328);
-        population.add(new Day(1, 3, 2011), 1210193422);
-        TimeSeriesCollection dataset = new TimeSeriesCollection(population);
+    /**
+     * Expand or minimize chart depending on the current status of that chart.
+     * 
+     * @param chart The name of the chart to be expanded or minimized
+     */
+    public void expandChart(String chart) {
+        boolean expand = false;
+        if(minimizedCharts.contains(chart)) {
+            minimizedCharts.remove(chart);
+            expand = true;
+        }
         
-        // Create the chart
-        JFreeChart chart = ChartFactory.createTimeSeriesChart(
-            "Population of India", "Date", "Population", dataset,
-            true, true, false);
+        if(expandedCharts.contains(chart))
+            expandedCharts.remove(chart);
         
-        //Get the plot and set date format
-        XYPlot plot = chart.getXYPlot();
-        DateAxis axis = (DateAxis) plot.getDomainAxis();
-          axis.setDateFormatOverride(new SimpleDateFormat("MMM-yyyy"));
-
-        // Render the frame
-        org.jfree.chart.ChartPanel panel = new org.jfree.chart.ChartPanel(chart);
-        panel.setSize(200, 200);
-        frame.add(panel);
+        if(expand)
+            expandedCharts.add(expandedCharts.isEmpty() ? 0 : expandedCharts.size(), chart);
+        else
+            minimizedCharts.add(0, chart);
+        
+        createContents(body);
     }
-
     
-    
-    private class ToolTipListener implements Listener {
-        Shell tip = null;
-        Label label = null;
-        Composite composite;
+    /**
+     * Set the orientation for this chart panel.
+     * 
+     * @param orientation Orientation (ChartPanel.CHART_PANEL_VERTICAL or ChartPanel.CHART_PANEL_HORIZONTAL)
+     */
+    public void setOrientation(String orientation) {
+        if(CHART_PANEL_VERTICAL.equals(orientation))
+            this.vertical = true;
+        else
+            this.vertical = false;
         
-        public ToolTipListener(Composite composite) {
-            this.composite = composite;
-        }
-
-        public void handleEvent(Event event) {
-          switch (event.type) {
-          case SWT.Dispose:
-          case SWT.KeyDown:
-          case SWT.MouseMove: {
-            if (tip == null)
-              break;
-            tip.dispose();
-            tip = null;
-            label = null;
-            break;
-          }
-          case SWT.MouseHover: {
-              if(composite.isDisposed())
-                  return;
-              if (tip != null && !tip.isDisposed())
-                tip.dispose();
-              Display display = composite.getDisplay();
-              tip = new Shell(display, SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
-              tip.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-              FillLayout layout = new FillLayout();
-              layout.marginWidth = 2;
-              tip.setLayout(layout);
-              label = new Label(tip, SWT.NONE);
-              label.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-              label.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-              label.setText("Module1.Variable2[index3]");
-//              label.addListener(SWT.MouseExit, labelListener);
-//              label.addListener(SWT.MouseDown, labelListener);
-              Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-              Point pt = composite.toDisplay(event.x, event.y);
-              tip.setBounds(pt.x, pt.y, size.x, size.y);
-              tip.setVisible(true);
-          }
-          }
-        }
-      };
+        createContents(body);
+    }
 }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelElement.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelElement.java
new file mode 100644
index 00000000..9dc99b80
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelElement.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.trend;
+
+import java.awt.Frame;
+import java.text.SimpleDateFormat;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.awt.SWT_AWT;
+import org.eclipse.swt.widgets.Composite;
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.DateAxis;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.data.time.Day;
+import org.jfree.data.time.TimeSeries;
+import org.jfree.data.time.TimeSeriesCollection;
+
+/**
+ * This class represents an expanded chart element in {@link ChartPanel}. It contains 
+ * a header {@link ChartPanelHeader} and the actual chart.
+ * 
+ * @author Teemu Lempinen
+ *
+ */
+public class ChartPanelElement extends Composite {
+
+    public static int CHART_MINIMUM_WIDTH = 300;
+    public static int CHART_MINIMUM_HEIGHT = 200;
+    
+    /**
+     * Creates a chart panel element into parent composite.
+     * 
+     * @param parent The parent composite where the chart element is created
+     * @param panel The {@link ChartPanel} containing the chart element
+     * @param name The name of the chart
+     * @param style The Style of the created chart element
+     */
+    public ChartPanelElement(Composite parent, ChartPanel panel, String name, int style) {
+        super(parent, style);
+        
+        GridDataFactory.fillDefaults().grab(true, true).hint(CHART_MINIMUM_WIDTH,CHART_MINIMUM_HEIGHT).applyTo(this);
+        GridLayoutFactory.fillDefaults().spacing(0,0).applyTo(this);
+        
+        // Header
+        new ChartPanelHeader(this, panel, name, SWT.BORDER);
+        
+        // Chart
+        Composite swtComposite = new Composite(this,
+                SWT.NO_BACKGROUND | SWT.EMBEDDED);
+        Frame frame = SWT_AWT.new_Frame(swtComposite);
+        GridDataFactory.fillDefaults().grab(true, true).applyTo(swtComposite);
+        setChart(frame);
+        
+    }
+    
+    /** 
+     * A dummy chart containing information about the population in India
+     * 
+     * @param frame
+     */
+    private void setChart(Frame frame) {
+        TimeSeries population = new TimeSeries("Indian Population");
+        population.add(new Day(1, 3, 1961), 439234771);
+        population.add(new Day(1, 3, 1971), 548159652);
+        population.add(new Day(1, 3, 1981), 683329097);
+        population.add(new Day(1, 3, 1991), 843387888);
+        population.add(new Day(1, 3, 2001), 1028610328);
+        population.add(new Day(1, 3, 2011), 1210193422);
+        TimeSeriesCollection dataset = new TimeSeriesCollection(population);
+        
+        // Create the chart
+        JFreeChart chart = ChartFactory.createTimeSeriesChart(
+            "Population of India", "Date", "Population", dataset,
+            true, true, false);
+        
+        //Get the plot and set date format
+        XYPlot plot = chart.getXYPlot();
+        DateAxis axis = (DateAxis) plot.getDomainAxis();
+          axis.setDateFormatOverride(new SimpleDateFormat("MMM-yyyy"));
+
+        // Render the frame
+        org.jfree.chart.ChartPanel panel = new org.jfree.chart.ChartPanel(chart);
+        panel.setSize(CHART_MINIMUM_WIDTH, CHART_MINIMUM_HEIGHT);
+        frame.add(panel);
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelHeader.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelHeader.java
new file mode 100644
index 00000000..558f8ccc
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/ChartPanelHeader.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.trend;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * Header of a chart element in {@link ChartPanel}. Only this header is
+ * shown if a chart is minimized. If a chart is expanded, this header is added
+ * to the charts {@link ChartPanelElement}. 
+ * 
+ * @author Teemu Lempinen
+ *
+ */
+public class ChartPanelHeader extends Composite {
+
+    public static int HEADER_MINIMUM_WIDTH = 250;
+    private String name; 
+    private ChartPanel panel;
+    
+    /**
+     * Chart panel header with minimize and close buttons.
+     * 
+     * @param parent The composite where the header is added
+     * @param panel The {@link ChartPanel} containing the header
+     * @param name The name of the chart
+     * @param style he Style of the created chart element
+     */
+    public ChartPanelHeader(Composite parent, ChartPanel panel, String name, int style) {
+        super(parent, style);
+        this.name = name;
+        this.panel = panel;
+        
+        GridLayoutFactory.fillDefaults().numColumns(3).applyTo(this);
+        GridDataFactory.fillDefaults().grab(true, false).applyTo(this);
+        
+        Label label = new Label(this, SWT.NONE);
+        label.setText(name);
+        GridDataFactory.fillDefaults().grab(true, false).applyTo(label);
+        
+        label = new Label(this, SWT.NONE);
+        label.setText("^");
+        GridDataFactory.fillDefaults().applyTo(label);
+        label.addMouseListener(new MinimizeListener());
+        label.setCursor(new Cursor(label.getDisplay(), SWT.CURSOR_HAND));
+
+
+        label = new Label(this, SWT.NONE);
+        label.setText("x");
+        GridDataFactory.fillDefaults().applyTo(label);
+        
+    }
+    
+    /**
+     * Mouse listener to minimize chart button. Expands and minimizes 
+     * the chart of this header.
+     * 
+     * @author Teemu Lempinen
+     *
+     */
+    private class MinimizeListener implements MouseListener {
+
+        @Override
+        public void mouseDoubleClick(MouseEvent e) {
+        }
+        @Override
+        public void mouseDown(MouseEvent e) {
+        }
+
+        @Override
+        public void mouseUp(MouseEvent e) {
+            if(!ChartPanelHeader.this.isDisposed())
+                panel.expandChart(name);
+        }
+        
+    }
+
+}
-- 
2.47.1