[Title] Custom chart : create log

[Type]Feature
[Module]
[Priority]Major
[CQ#]
[Redmine#]4942
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/TimelineConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/TimelineConstants.java
index 14acdb7..178eed1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/TimelineConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/TimelineConstants.java
@@ -15,13 +15,13 @@ public class TimelineConstants {
        public static final long CHART_RANGE_DEFAULT = 120000;// 12
 
        /* Time-line Item type */
-       public static final int CHART_TYPE_CPU = 1;
-       public static final int CHART_TYPE_CPU_CORE = 23;
-       public static final int CHART_TYPE_CPU_FREQUENCY = 24;
-       public static final int CHART_TYPE_HEAP = 4;
-       public static final int CHART_TYPE_PROCESS_MEMORY = 14;
-       public static final int CHART_TYPE_SYSTEM_MEMORY = 22;
-       public static final int CHART_TYPE_FILE = 3;
+       public static final int CHART_TYPE_CPU =  -101;
+       public static final int CHART_TYPE_CPU_CORE = -102;
+       public static final int CHART_TYPE_CPU_FREQUENCY = -103;
+       public static final int CHART_TYPE_HEAP = -104;
+       public static final int CHART_TYPE_PROCESS_MEMORY = -105;
+       public static final int CHART_TYPE_SYSTEM_MEMORY = -106;
+       public static final int CHART_TYPE_FILE = -107;
        
        public static final int FD_TYPE_FILE = 0;
        public static final int FD_TYPE_SOCKET = 1;
@@ -66,10 +66,6 @@ public class TimelineConstants {
        public static final int TIMELINE_ITEM_MINIMIZE_WIDTH = 20;
 
        /* item size mode */
-       public static final int ITEM_SIZE_MODE_DEF = 0;
-       public static final int ITEM_SIZE_MODE_MIN = 1;
-       public static final int ITEM_SIZE_MODE_MAX = 2;
-
        public static final int ITEM_HEIGHT_MIN = 30;
        public static final int ITEM_HEIGHT_DEF = 82;// 71, 58
        public static final int ITEM_HEIGHT_MAX = 243;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/CustomLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/CustomLogParser.java
index c0af07c..b80a7c3 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/CustomLogParser.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/CustomLogParser.java
@@ -55,7 +55,7 @@ public class CustomLogParser {
                        String chartName = log.get(LogCenterConstants.CUSTOM_TEXT);
                        chartManager.addCustomChart(new UserCustomChart(chartHandle, chartName));
                        }
-               }
+               } 
        
        private static boolean isAbleToParse(LogPackage logPack, int probeType) {
                Logs logList = logPack.getLogs(probeType);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineChartManager.java
index 224d4e8..9743424 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineChartManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineChartManager.java
@@ -49,6 +49,7 @@ import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 
 
 public class TimelineChartManager {
+       private final int NOT_DEFAULT_CHART = 1;
        private static TimelineChartManager instance = null;
        private List<TimelineChart> chartList;
        private List<TimelineChart> selectedChartList;
@@ -67,7 +68,6 @@ public class TimelineChartManager {
                customChartMap = new HashMap<Integer, UserCustomChart>();
                
                loadSavedChartList();
-               TimelineItemSettingProvider.initTimelineItemsSetting(chartList);
                loadSelectedChartList();
        }
        
@@ -78,7 +78,10 @@ public class TimelineChartManager {
 
                if (size > 1) {
                        for (int i = 0; i < size; i++) {
-                               chartList.add(getChartInstance(chartNameList[i]));
+                               TimelineChart chart = getChartInstance(chartNameList[i]);
+                               if(chart != null) {
+                                       chartList.add(chart);
+                               }
                        }
                } else {
                        if(TimelineItemManager.bCustomChart) {
@@ -110,7 +113,10 @@ public class TimelineChartManager {
                        int size = savedSelectedChartNameList.length;
                        if (size != 0) {
                                for (int i = 0; i < size; i++) {
-                                       selectedChartList.add(getChartInstance(savedSelectedChartNameList[i]));
+                                       TimelineChart chart = getChartInstance(savedSelectedChartNameList[i]);
+                                       if(chart != null) {
+                                               selectedChartList.add(chart);
+                                       }
                                }
                        }
                }
@@ -142,10 +148,10 @@ public class TimelineChartManager {
        
        public DACustomChart createDATimelineChart(Composite parent, int chartType) {
                DACustomChart chart = null;
-               DATimelineChart timelineChart = getDAChartInstance(chartType);
+               TimelineChart timelineChart = getChartInstance(chartType);
 
                if(timelineChart != null) {
-                       chart = timelineChart.createDAChart(parent);
+                       chart = ((DATimelineChart)timelineChart).createDAChart(parent);
                }
 
                return chart;
@@ -169,7 +175,7 @@ public class TimelineChartManager {
                        return TimelineConstants.CHART_TYPE_FILE;
                }
                else {
-                       return -1; // FIXME custom?
+                       return NOT_DEFAULT_CHART; // FIXME custom?
                }
        }
        
@@ -179,55 +185,56 @@ public class TimelineChartManager {
        
        public TimelineChart getChartInstance(String chartName) {
                if(TimelineItemManager.bCustomChart) {
-                       return getDAChartInstance(getChartType(chartName));
+                       return getChartInstance(getChartType(chartName));
                } else {
                        return getChartInstance(getChartType(chartName));
                }
        }
        
        public TimelineChart getChartInstance(int chartType) {
-               switch(chartType) {
-               case TimelineConstants.CHART_TYPE_CPU:
-                       return CPUChart.getInstance();
-               case TimelineConstants.CHART_TYPE_CPU_CORE:
-                       return CPUCoreChart.getInstance();
-               case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
-                       return CPUFrequencyChart.getInstance();
-               case TimelineConstants.CHART_TYPE_HEAP:
-                       return HeapChart.getInstance();
-               case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
-                       return ProcessMemoryChart.getInstance();
-               case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
-                       return SystemMemoryChart.getInstance();
-               case TimelineConstants.CHART_TYPE_FILE:
-                       return FileChart.getInstance();
-               default:
-                       //FIXME custom
+               if(TimelineItemManager.bCustomChart) {
+                       switch(chartType) {
+                       case NOT_DEFAULT_CHART:
+                               return null;
+                       case TimelineConstants.CHART_TYPE_CPU:
+                               return DACPUChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_CPU_CORE:
+                               return DACPUCoreChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
+                               return DACPUFrequencyChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_HEAP:
+                               return DAHeapChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
+                               return DAProcessMemoryChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
+                               return DASystemMemoryChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_FILE:
+                               return DAFileChart.getInstance();
+                       default:
+                               return customChartMap.get(chartType);
+                       }       
+               } else {
+                       switch(chartType) {
+                       case NOT_DEFAULT_CHART:
+                               return null;
+                       case TimelineConstants.CHART_TYPE_CPU:
+                               return CPUChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_CPU_CORE:
+                               return CPUCoreChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
+                               return CPUFrequencyChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_HEAP:
+                               return HeapChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
+                               return ProcessMemoryChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
+                               return SystemMemoryChart.getInstance();
+                       case TimelineConstants.CHART_TYPE_FILE:
+                               return FileChart.getInstance();
+                       default:
+                               return customChartMap.get(chartType);
+                       }
                }
-               return null;
-       }
-       
-       public DATimelineChart getDAChartInstance(int chartType) {
-               switch(chartType) {
-               case TimelineConstants.CHART_TYPE_CPU:
-                       return DACPUChart.getInstance();
-               case TimelineConstants.CHART_TYPE_CPU_CORE:
-                       return DACPUCoreChart.getInstance();
-               case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
-                       return DACPUFrequencyChart.getInstance();
-               case TimelineConstants.CHART_TYPE_HEAP:
-                       return DAHeapChart.getInstance();
-               case TimelineConstants.CHART_TYPE_PROCESS_MEMORY:
-                       return DAProcessMemoryChart.getInstance();
-               case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
-                       return DASystemMemoryChart.getInstance();
-               case TimelineConstants.CHART_TYPE_FILE:
-                       return DAFileChart.getInstance();
-               default:
-                       //FIMXE coustom
-               }       
-               
-               return null;
        }
        
        public void addCustomChart(UserCustomChart customChart) {
@@ -261,12 +268,7 @@ public class TimelineChartManager {
        public void setAllChartDoaminAxisRange(double start, double end) {
                int chartListSize = chartList.size();
                for (int i = 0; i < chartListSize; i++) {
-                       //FIXME 
-                       if(TimelineItemManager.bCustomChart) {
-                               chartList.get(i).setDomainAxisRange(start, end);
-                       } else {
-                               chartList.get(i).setDomainAxisRange(start, end);
-                       }
+                       ((DATimelineChart)chartList.get(i)).setDomainAxisRange(start, end);
                }
        }
        
@@ -297,11 +299,5 @@ public class TimelineChartManager {
                                chartList.get(i).dispose();
                        }
                }
-               
-//             chartList.clear();
-//             selectedChartList.clear();
-//             loadSavedChartList();
-//             loadSelectedChartList();
-//             customChartMap.clear();
        }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineComposite.java
index 87857dd..106af2e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineComposite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineComposite.java
@@ -207,17 +207,11 @@ public class TimelineComposite extends DAView {
                        return;
                }
 
-               List<Integer> zoomedItemTypeList = TimelineItemSettingProvider.getZoomedItemList();
+               int zoomedChartNum = TimelineItemSettingProvider.getInstance().getZoomedChartNum();
+               int selectedChartSize = chartManager.getSelectedChartList().size() - zoomedChartNum;
 
-               int zoomedItemNum = 0;
-               if (null != zoomedItemTypeList) {
-                       zoomedItemNum = zoomedItemTypeList.size();
-               }
-
-               int selectedChartSize = chartManager.getSelectedChartList().size() - zoomedItemNum;
-
-               int defItemsHeight = selectedChartSize * TimelineItemSettingProvider.getDefaultSizeMode();
-               int zoomedItemsHeight = zoomedItemNum * TimelineConstants.ITEM_HEIGHT_MAX;
+               int defItemsHeight = selectedChartSize * TimelineItemSettingProvider.getInstance().getDefaultSizeMode();
+               int zoomedItemsHeight = zoomedChartNum * TimelineConstants.ITEM_HEIGHT_MAX;
 
                itemsAreaScrolledComp.setMinHeight(defItemsHeight + zoomedItemsHeight);
                timelineItemManager.resizeItems();
@@ -297,13 +291,8 @@ public class TimelineComposite extends DAView {
        private void updateChartDataSet(LogPackage logPack, int chartType) {
                int probeType = TimelineUtils.getProbeID(chartType);
                
-               if(TimelineItemManager.bCustomChart == true) {
-                       DATimelineChart timelineChart = TimelineChartManager.getInstance().getDAChartInstance(chartType);
-                       timelineChart.parsingLogPackage(logPack, probeType);
-               } else {
-                       TimelineChart timelineChart = TimelineChartManager.getInstance().getChartInstance(chartType);
-                       timelineChart.parsingLogPackage(logPack, probeType);
-               }
+               DATimelineChart timelineChart = (DATimelineChart)TimelineChartManager.getInstance().getChartInstance(chartType);
+               timelineChart.parsingLogPackage(logPack, probeType);
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
index 743c76a..9101718 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
@@ -62,6 +62,7 @@ import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
+import org.tizen.dynamicanalyzer.timeline.chart.UserCustomChart;
 import org.tizen.dynamicanalyzer.ui.widgets.DAButton;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
@@ -101,13 +102,14 @@ public class TimelineEditItemsDialog extends Dialog {
                        StringBuffer strSaveSelectedChartNameList = new StringBuffer(""); //$NON-NLS-1$
 
                        for (int i = 0; i < tableitems.length; i++) {
-                               chartList.add(chartManager.getChartInstance(tableitems[i].getText(2)));
+                               int chartType = Integer.parseInt(tableitems[i].getText(0));
+                               chartList.add(chartManager.getChartInstance(chartType));
 
                                strSaveChartNameList.append(tableitems[i].getText(2));
                                strSaveChartNameList.append(","); //$NON-NLS-1$
 
                                if (tableitems[i].getText(3).equals(strEnableChart)) { 
-                                       selectedChartList.add(chartManager.getChartInstance((tableitems[i].getText(2))));
+                                       selectedChartList.add(chartManager.getChartInstance(chartType));
                                        strSaveSelectedChartNameList.append(tableitems[i].getText(2));
                                        strSaveSelectedChartNameList.append(","); //$NON-NLS-1$
                                }
@@ -119,7 +121,6 @@ public class TimelineEditItemsDialog extends Dialog {
                        timelineComposite.resetItems();
                        TimelineMaster.getInstance().redrawTimeTickCanvas();
 
-                       // FIXME remove custom chart informations
                        ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, strSaveChartNameList.toString());
                        ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, strSaveSelectedChartNameList.toString());
                        shell.dispose();
@@ -130,6 +131,7 @@ public class TimelineEditItemsDialog extends Dialog {
 
                @Override
                public void handleClickEvent(DACustomButton button) {
+                       chartManager.addCustomChart(new UserCustomChart(55, "This is message from H.O.T"));
                        shell.dispose();
                }
        };
@@ -424,5 +426,4 @@ public class TimelineEditItemsDialog extends Dialog {
 
                }
        };
-
 }
\ No newline at end of file

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
index 50cb5c3..dcb16a0 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
@@ -112,14 +112,13 @@ public class TimelineItemManager {
 
        private class ItemInfo {
                public int itemType;
-               public String itemName;
                public ItemInfoComposite infoComp;
                public ChartComposite chartComp;
                public Composite itemComp;
        }
 
        private class ItemInfoComposite extends Composite {
-               public String itemName;
+               private int itemType;
                private Label infoZoomLabel;
                private Label infoIconLabel;
                private Label infoTextLabel;
@@ -171,16 +170,14 @@ public class TimelineItemManager {
                        }
 
                        /* Toggle */
-                       int itemID = chartManager.getChartType(itemInfoComp.itemName);
-
-                       TimelineItemSettingProvider.setItemZoomToggle(itemID);
+                       TimelineItemSettingProvider.getInstance().setItemZoomToggle(itemInfoComp.itemType);
 
                        TimelineComposite timelineComposite = AnalyzerUtil.getTimelineComposite();
                        if (null != timelineComposite) {
                                timelineComposite.resizeItemArea();
 
-                               if (TimelineConstants.ITEM_SIZE_MODE_MAX == TimelineItemSettingProvider.getItemSetting(itemID).getSizeMode()) {
-                                       focusItem(itemID);
+                               if(chartManager.getChartInstance(itemInfoComp.itemType).getSize() == TimelineConstants.ITEM_HEIGHT_MAX) {
+                                       focusItem(itemInfoComp.itemType);
                                }
                        }
                }
@@ -583,13 +580,13 @@ public class TimelineItemManager {
        }
 
        private Composite createItemArea(Composite itemAreaComp) {
-               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU)));
-               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU_CORE)));
-               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU_FREQUENCY)));
-               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_HEAP)));
-               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_PROCESS_MEMORY)));
-               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_SYSTEM_MEMORY)));
-               itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_FILE)));
+//             itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU)));
+//             itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU_CORE)));
+//             itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_CPU_FREQUENCY)));
+//             itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_HEAP)));
+//             itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_PROCESS_MEMORY)));
+//             itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_SYSTEM_MEMORY)));
+//             itemInfoList.add(createItemInfo(itemAreaComp, chartManager.getChartInstance(TimelineConstants.CHART_TYPE_FILE)));
 
                TimelineMaster.getInstance().redrawTimeTickCanvas();
 
@@ -611,7 +608,7 @@ public class TimelineItemManager {
                String chartName = chart.getChartName();
 
                ItemInfoComposite infoComp = new ItemInfoComposite(parent, SWT.NONE);
-               infoComp.itemName = chartName;
+               infoComp.itemType = chart.getChartType();
 
                FormLayout fLayout = new FormLayout();
                infoComp.setLayout(fLayout);
@@ -734,8 +731,7 @@ public class TimelineItemManager {
                iteminfo.infoComp = itemInfoComp;
                iteminfo.chartComp = itemChartComposite;
 
-               iteminfo.itemType = chart.getChartType();
-               iteminfo.itemName = chart.getChartName();
+               iteminfo.itemType= chart.getChartType();
 
                return iteminfo;
        }
@@ -807,7 +803,6 @@ public class TimelineItemManager {
                iteminfo.infoComp = itemInfoComp;
 
                iteminfo.itemType = chart.getChartType();
-               iteminfo.itemName = chart.getChartName();
 
                return iteminfo;
        }
@@ -834,8 +829,8 @@ public class TimelineItemManager {
                int width = itemsAreaComp.getBounds().width;
 
                for (int i = 0; i < itemInfoList.size(); i++) {
-                       TimelineItemSetting itemSetting = TimelineItemSettingProvider.getItemSetting(itemInfoList.get(i).itemType);
-                       setItemSize(itemInfoList.get(i), width, itemSetting.getSizeMode());
+                       int chartSize = chartManager.getChartList().get(i).getSize();
+                       setItemSize(itemInfoList.get(i), width, chartSize);
                }
 
                itemsAreaComp.layout();
@@ -900,19 +895,13 @@ public class TimelineItemManager {
                }
        }
 
-       private void setItemSize(ItemInfo itemInfo, int width, int SIZE_MODE) {
+       private void setItemSize(ItemInfo itemInfo, int width, int chartSize) {
                if (null == itemInfo) {
                        return;
                }
 
                RowData rData = (RowData) itemInfo.itemComp.getLayoutData();
-               if (SIZE_MODE == TimelineConstants.ITEM_SIZE_MODE_MAX) {
-                       rData.height = TimelineConstants.ITEM_HEIGHT_MAX;
-               } else if (SIZE_MODE == TimelineConstants.ITEM_SIZE_MODE_MIN) {
-                       rData.height = TimelineConstants.ITEM_HEIGHT_MIN;
-               } else {
-                       rData.height = TimelineConstants.ITEM_HEIGHT_DEF;
-               }
+               rData.height = chartSize;
 
                if (TimelineConstants.ITEM_SIZE_ICON_VISIBLE > rData.height) {
                        setItemInfoIconVisible(itemInfo.infoComp, false);
@@ -930,9 +919,8 @@ public class TimelineItemManager {
                        return itemInfo;
                }
 
-               String itemName = chartManager.getChartName(chartType);
                for (int i = 0; i < itemInfoList.size(); i++) {
-                       if (itemName.equals(itemInfoList.get(i).itemName)) {
+                       if (chartType ==itemInfoList.get(i).itemType) {
                                return itemInfoList.get(i);
                        }
                }
@@ -965,21 +953,23 @@ public class TimelineItemManager {
                        return;
                }
 
+               TimelineChart chart = chartManager.getChartInstance(infoComp.itemType);
+               String chartName = chart.getChartName();
                if (isIconVisible) {
                        if (null == infoComp.getIconLabel() || infoComp.getIconLabel().isDisposed()) {
-                               addIconInfoLabel(infoComp, chartManager.getChartInstance(infoComp.itemName));
+                               addIconInfoLabel(infoComp, chart);
 
                                if (null != infoComp.infoTextLabel) {
                                        infoComp.infoTextLabel.dispose();
                                }
-                               addTextInfoLabel(infoComp, infoComp.itemName, false);
+                               addTextInfoLabel(infoComp, chartName, false);
                        }
                } else {
                        if (null != infoComp.infoIconLabel) {
                                infoComp.infoIconLabel.dispose();
                                infoComp.infoTextLabel.dispose();
 
-                               boolean isSucced = addTextInfoLabel(infoComp, infoComp.itemName, true);
+                               boolean isSucced = addTextInfoLabel(infoComp, chartName, true);
                                if (isSucced) {
                                        infoComp.layout();
                                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSetting.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSetting.java
deleted file mode 100644 (file)
index 2d039ca..0000000
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSetting.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Dynamic Analyzer
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: 
- * Sanghyun Lee <sanghyunnim.lee@samsung.com>
- * Juyoung Kim <j0.kim@samsung.com>
- *
- * 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:
- * - S-Core Co., Ltd
- * 
- */
-
-package org.tizen.dynamicanalyzer.timeline;
-
-
-public class TimelineItemSetting {
-       private int itemType;
-       private int sizeMode; // default, minimum, max
-       
-
-       public void setItemType(int itemType) {
-               this.itemType = itemType;
-       }
-
-       public int getItemType() {
-               return itemType;
-       }
-
-       public void setSizeMode(int sizeMode) {
-               this.sizeMode = sizeMode;
-       }
-
-       public int getSizeMode() {
-               return sizeMode;
-       }
-}

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSettingProvider.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSettingProvider.java
index 4a2033b..9bd6e14 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSettingProvider.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemSettingProvider.java
@@ -19,7 +19,6 @@
 
 package org.tizen.dynamicanalyzer.timeline;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
@@ -27,112 +26,58 @@ import org.tizen.dynamicanalyzer.timeline.chart.TimelineChart;
 
 
 public class TimelineItemSettingProvider {
-
-       private static List<TimelineItemSetting> itemSettingList;
-       private static int BASE_SIZE_MODE = TimelineConstants.ITEM_SIZE_MODE_DEF;
-
-       public static void initTimelineItemsSetting(List<TimelineChart> chartList) {
-               if (null == itemSettingList) {
-                       itemSettingList = new ArrayList<TimelineItemSetting>();
-               } else {
-                       itemSettingList.clear();
-               }
-
-               if (null == chartList) {
-                       return;
-               }
-
-               for (int i = 0; i < chartList.size(); i++) {
-                       TimelineItemSetting itemSet = new TimelineItemSetting();
-                       itemSet.setItemType(chartList.get(i).getChartType());
-                       itemSet.setSizeMode(BASE_SIZE_MODE);
-                       itemSettingList.add(itemSet);
+       private static TimelineItemSettingProvider instance = null;
+       
+       private TimelineChartManager chartManager = TimelineChartManager.getInstance();
+       private static int BASE_HEIGHT = TimelineConstants.ITEM_HEIGHT_DEF;
+
+       public static TimelineItemSettingProvider getInstance() {
+               if(instance == null) {
+                       instance = new TimelineItemSettingProvider();
                }
+               
+               return instance;
        }
-
-       public static TimelineItemSetting getItemSetting(int itemType) {
-               if (null == itemSettingList) {
-                       return null;
-               }
-
-               for (int i = 0; i < itemSettingList.size(); i++) {
-                       if (itemType == itemSettingList.get(i).getItemType()) {
-                               return itemSettingList.get(i);
+       
+       public int getZoomedChartNum() {
+               int zoomedChartNum = 0;
+               List<TimelineChart> chartList = chartManager.getChartList();
+               
+               for(int i = 0; i < chartList.size(); i++) {
+                       if(chartList.get(i).getSize() == TimelineConstants.ITEM_HEIGHT_MAX) {
+                               zoomedChartNum++;
                        }
                }
-               return null;
-       }
-
-       public static void setItemSettingZoomed(int itemType) {
-               TimelineItemSetting setting = getItemSetting(itemType);
-
-               if (null == setting) {
-                       return;
-               }
-               setting.setSizeMode(TimelineConstants.ITEM_SIZE_MODE_MAX);
-
-               setItemSetting(itemType, setting);
+               
+               return zoomedChartNum;
        }
 
-       public static List<Integer> getZoomedItemList() {
-               List<Integer> zoomedItemTypeList = new ArrayList<Integer>();
-
-               if (null == itemSettingList) {
-                       return null;
-               }
-
-               for (int i = 0; i < itemSettingList.size(); i++) {
-                       if (TimelineConstants.ITEM_SIZE_MODE_MAX == itemSettingList.get(i).getSizeMode()) {
-                               zoomedItemTypeList.add(itemSettingList.get(i).getItemType());
-                       }
-               }
-
-               return zoomedItemTypeList;
-       }
-
-       public static void setItemZoomToggle(int itemType) {
-               TimelineItemSetting setting = getItemSetting(itemType);
-               if (TimelineConstants.ITEM_SIZE_MODE_MAX == setting.getSizeMode()) {
-                       setting.setSizeMode(BASE_SIZE_MODE);
+       public void setItemZoomToggle(int itemType) {
+               TimelineChart chart = chartManager.getChartInstance(itemType);
+               if (TimelineConstants.ITEM_HEIGHT_MAX == chart.getSize()) {
+                       chart.setSize(BASE_HEIGHT);
                } else {
-                       setting.setSizeMode(TimelineConstants.ITEM_SIZE_MODE_MAX);
+                       chart.setSize(TimelineConstants.ITEM_HEIGHT_MAX);
                }
        }
 
-       public static void setItemSettingMinimizeAll() {
-               if (null == itemSettingList) {
-                       return;
-               }
-
-               if (BASE_SIZE_MODE == TimelineConstants.ITEM_SIZE_MODE_MIN) {
-                       BASE_SIZE_MODE = TimelineConstants.ITEM_SIZE_MODE_DEF;
+       public void setItemSettingMinimizeAll() {
+               if (BASE_HEIGHT == TimelineConstants.ITEM_HEIGHT_MIN) {
+                       BASE_HEIGHT = TimelineConstants.ITEM_HEIGHT_DEF;
                } else {
-                       BASE_SIZE_MODE = TimelineConstants.ITEM_SIZE_MODE_MIN;
-               }
-
-               for (int i = 0; i < itemSettingList.size(); i++) {
-                       TimelineItemSetting itemSetting = itemSettingList.get(i);
-                       itemSetting.setSizeMode(BASE_SIZE_MODE);
-               }
-       }
-
-       private static void setItemSetting(int itemType, TimelineItemSetting setting) {
-               if (null == itemSettingList) {
-                       return;
+                       BASE_HEIGHT = TimelineConstants.ITEM_HEIGHT_MIN;
                }
 
-               for (int i = 0; i < itemSettingList.size(); i++) {
-                       if (itemType == itemSettingList.get(i).getItemType()) {
-                               itemSettingList.remove(i);
-                               itemSettingList.add(setting);
-                       }
+               List<TimelineChart> chartList = chartManager.getChartList();
+               for (int i = 0; i < chartList.size(); i++) {
+                       chartList.get(i).setSize(BASE_HEIGHT);
                }
        }
 
-       public static int getDefaultSizeMode() {
-               if (BASE_SIZE_MODE == TimelineConstants.ITEM_SIZE_MODE_MAX) {
+       public int getDefaultSizeMode() {
+               if (BASE_HEIGHT == TimelineConstants.ITEM_HEIGHT_MAX) {
                        return TimelineConstants.ITEM_HEIGHT_MAX;
-               } else if (BASE_SIZE_MODE == TimelineConstants.ITEM_SIZE_MODE_MIN) {
+               } else if (BASE_HEIGHT == TimelineConstants.ITEM_HEIGHT_MIN) {
                        return TimelineConstants.ITEM_HEIGHT_MIN;
                } else {
                        return TimelineConstants.ITEM_HEIGHT_DEF;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineTick.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineTick.java
index b01f8c4..3b93aec 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineTick.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineTick.java
@@ -80,7 +80,7 @@ public class TimelineTick {
                        TimelineComposite timelineComposite = AnalyzerUtil
                                        .getTimelineComposite();
                        if (null != timelineComposite) {
-                               TimelineItemSettingProvider.setItemSettingMinimizeAll();
+                               TimelineItemSettingProvider.getInstance().setItemSettingMinimizeAll();
                                timelineComposite.resizeItemArea();
                        }
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DATimelineChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DATimelineChart.java
index ef37ffd..896a90a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DATimelineChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DATimelineChart.java
@@ -38,8 +38,11 @@ public abstract class DATimelineChart extends TimelineChart {
        }
 
        public void setDomainAxisRange(double start, double end) {
-               plot.setAxisRangeX(start, end);
-               if(!chart.isDisposed()) {
+               if(plot != null) {
+                       plot.setAxisRangeX(start, end);
+               }
+               
+               if(chart != null &&!chart.isDisposed()) {
                        chart.redraw();
                }
        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java
index 5f340b9..3cb1cde 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java
@@ -53,6 +53,7 @@ public abstract class TimelineChart {
        protected String chartName;
        protected Image chartIcon;
        protected Image addIcon;
+       protected int size = TimelineConstants.ITEM_HEIGHT_DEF;
 
        protected JFreeChart chart = null;
        private long CHART_RANGE;
@@ -105,6 +106,13 @@ public abstract class TimelineChart {
                return addIcon;
        }
        
+       public int getSize() {
+               return size;
+       }
+       public void setSize(int size) {
+               this.size = size;
+       }
+       
        public void setRangeSelection(int startSec, int rangeSec) {
                CHART_RANGE = (long) (rangeSec * 1000);
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/UserCustomChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/UserCustomChart.java
index b6c5eef..8db89f9 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/UserCustomChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/UserCustomChart.java
@@ -30,19 +30,16 @@ import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 
 public class UserCustomChart extends DATimelineChart {
-       private int handle;
-       
        private DACustomChartSeries userSeries0 = null;
        private DACustomChartSeries userSeries1 = null;
        private DACustomChartSeries userSeries2 = null;
        private DACustomChartSeries userSeries3 = null;
        
-       public UserCustomChart(int handle, String chartName) {
-               this.handle = handle;
+       public UserCustomChart(int chartType, String chartName) {
+               this.chartType = chartType;
                this.chartName = chartName;
                chartIcon = ImageResources.CHART_DEVICES;
                addIcon = ImageResources.ADD_CHART_DEVICE;
-               
        }
        
        @Override
@@ -94,8 +91,4 @@ public class UserCustomChart extends DATimelineChart {
                // TODO Auto-generated method stub
 
        }
-
-       public int getHandle() {
-               return handle;
-       }
 }