From: kamuru Date: Mon, 4 Nov 2013 03:15:18 +0000 (+0900) Subject: [Title] Screenshot chart addition automation X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34e1919a440d069c47fedd3090037beb46f7e56e;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] Screenshot chart addition automation [Desc.] Modify to add screenshot chart automatically when user select screenshot configuration on [Issue] --- diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java index 3b4a396..02a03bf 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java @@ -743,7 +743,6 @@ public class DAChartBoard extends Composite { }; public void hideItem(int index) { - int listHeight = itemList.hideItem(index); itemList.setSize(itemListScrollComp.getClientArea().width, listHeight); } diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java index 4d2a700..735f460 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java @@ -221,9 +221,9 @@ class DAChartBoardItemList extends Composite { FormData data = (FormData) child.getLayoutData(); data.height = 0; child.setLayoutData(data); - this.layout(); - } + this.layout(); + return listHeight; } @@ -245,8 +245,8 @@ class DAChartBoardItemList extends Composite { FormData data = (FormData) child.getLayoutData(); data.height = height; child.setLayoutData(data); - this.layout(); } + this.layout(); return listHeight; } diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config index fd56116..d8cd6ec 100644 --- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config +++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config @@ -2,5 +2,5 @@ Internal call=off Platform=tizen2.2 Build time=09/05/2012 10:30 AM (GMT) Snapshot=0 -Selected chart list=CPU,CPU core,CPU frequency,Heap allocation,Process Size,Memory,File,Screenshot,UI event,Disk IO,Network IO +Selected chart list=CPU,CPU core,CPU frequency,Heap allocation,Process Size,Memory,UI event,Disk IO,Network IO Available chart list=CPU,CPU core,CPU frequency,Heap allocation,Process Size,Memory,File,Screenshot,UI event,Disk IO,Network IO \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java index 2bb82d3..adf77cc 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java @@ -116,7 +116,7 @@ public class AnalyzerLabels extends NLS { public static String COOLBAR_AREA_TIMELINE; public static String COOLBAR_AREA_RANGE; public static String COOLBAR_AREA_NETWORK; - public static String COOLBAR_AREA_GRAPHICS; + public static String COOLBAR_AREA_OPENGLES; public static String COOLBAR_AREA_FILE_TOOLTIP; public static String COOLBAR_AREA_SUMMARY_TOOLTIP; @@ -125,7 +125,7 @@ public class AnalyzerLabels extends NLS { public static String COOLBAR_AREA_TIMELINE_TOOLTIP; public static String COOLBAR_AREA_RANGE_TOOLTIP; public static String COOLBAR_AREA_NETWORK_TOOLTIP; - public static String COOLBAR_AREA_GRAPHICS_TOOLTIP; + public static String COOLBAR_AREA_OPENGLES_TOOLTIP; public static String COOLBAR_AREA_FILE_TOOLTIP_MAC; public static String COOLBAR_AREA_SUMMARY_TOOLTIP_MAC; @@ -134,7 +134,7 @@ public class AnalyzerLabels extends NLS { public static String COOLBAR_AREA_TIMELINE_TOOLTIP_MAC; public static String COOLBAR_AREA_RANGE_TOOLTIP_MAC; public static String COOLBAR_AREA_NETWORK_TOOLTIP_MAC; - public static String COOLBAR_AREA_GRAPHICS_TOOLTIP_MAC; + public static String COOLBAR_AREA_OPENGLES_TOOLTIP_MAC; public static String COOLBAR_AREA_CONFIGURATION_FEATURES; public static String COOLBAR_AREA_CONFIGURATION_SETTING; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties index b47a114..6fbe6d1 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties @@ -80,14 +80,14 @@ COOLBAR_AREA_UI=UI COOLBAR_AREA_TIMELINE=Timeline COOLBAR_AREA_RANGE=Range COOLBAR_AREA_NETWORK=Network -COOLBAR_AREA_GRAPHICS=Graphics +COOLBAR_AREA_OPENGLES=OpenGL ES COOLBAR_AREA_TIMELINE_TOOLTIP=Timeline [Ctrl + 1] COOLBAR_AREA_FILE_TOOLTIP=File [Ctrl + 2] COOLBAR_AREA_NETWORK_TOOLTIP=Network [Ctrl + 3] COOLBAR_AREA_THREAD_TOOLTIP=Thread [Ctrl + 4] COOLBAR_AREA_UI_TOOLTIP=UI [Ctrl + 5] -COOLBAR_AREA_GRAPHICS_TOOLTIP=Graphics [Command + 6] +COOLBAR_AREA_OPENGLES_TOOLTIP=OpenGL ES [Command + 6] COOLBAR_AREA_SUMMARY_TOOLTIP=Summary [Ctrl + 7] COOLBAR_AREA_RANGE_TOOLTIP=Range [Ctrl + 8] @@ -96,7 +96,7 @@ COOLBAR_AREA_FILE_TOOLTIP_MAC=File [Command + 2] COOLBAR_AREA_NETWORK_TOOLTIP_MAC=Network [Command + 3] COOLBAR_AREA_THREAD_TOOLTIP_MAC=Thread [Command + 4] COOLBAR_AREA_UI_TOOLTIP_MAC=UI [Command + 5] -COOLBAR_AREA_GRAPHICS_TOOLTIP_MAC=Graphics [Command +6] +COOLBAR_AREA_OPENGLES_TOOLTIP_MAC=OpenGL ES [Command +6] COOLBAR_AREA_SUMMARY_TOOLTIP_MAC=Summary [Command + 7] COOLBAR_AREA_RANGE_TOOLTIP_MAC=Range [Command + 8] diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties index 7ffa23f..7ed33ac 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties @@ -3,7 +3,7 @@ GL_CHART_TITLE_FRAME=Frame GL_DETAILS_VIEW_TITLE=Details -GL_API_LIST_VIEW_TITLE=APIs +GL_API_LIST_VIEW_TITLE=API List GL_API_LIST_VIEW_SEQ=# GL_API_LIST_VIEW_FRAME=Frame GL_API_LIST_VIEW_TIME=Time diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java index dec27bb..8ed8ef1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutManager.java @@ -96,7 +96,7 @@ public class ShortCutManager { COOLBAR_AREA_TIMELINE_TOOLTIP = AnalyzerLabels.COOLBAR_AREA_TIMELINE_TOOLTIP_MAC; COOLBAR_AREA_RANGE_TOOLTIP = AnalyzerLabels.COOLBAR_AREA_RANGE_TOOLTIP_MAC; COOLBAR_AREA_NETWORK_TOOLTIP = AnalyzerLabels.COOLBAR_AREA_NETWORK_TOOLTIP_MAC; - COOLBAR_AREA_GRAPHICS_TOOLTIP = AnalyzerLabels.COOLBAR_AREA_GRAPHICS_TOOLTIP_MAC; + COOLBAR_AREA_GRAPHICS_TOOLTIP = AnalyzerLabels.COOLBAR_AREA_OPENGLES_TOOLTIP_MAC; COOLBAR_AREA_ABOUT = AnalyzerLabels.ABOUT_MAC; COOLBAR_AREA_SETTING = AnalyzerLabels.SETTING_MAC; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java index c1bfa9f..55fd45e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java @@ -67,7 +67,7 @@ public class GLPage extends DAPageComposite { glDataMaker = GLDataMaker.getInstance(); - name = AnalyzerLabels.COOLBAR_AREA_GRAPHICS; + name = AnalyzerLabels.COOLBAR_AREA_OPENGLES; this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_GRAPHICS_TOOLTIP); this.setLayout(new FillLayout()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java index 875b526..d030177 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java @@ -113,7 +113,9 @@ public class TimelineView extends DAView { } public void reArrangeChart(List order, List showInfo) { - chartBoard.reArrangeItem(order.toArray(new Integer[order.size()])); + if(order != null) { + chartBoard.reArrangeItem(order.toArray(new Integer[order.size()])); + } for (int i = 0; i < showInfo.size(); i++) { if (showInfo.get(i)) { chartBoard.showItem(i); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java index db0e9e3..6a0f3c3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java @@ -25,10 +25,17 @@ */ package org.tizen.dynamicanalyzer.ui.toolbar.configuration; +import java.util.ArrayList; +import java.util.List; + import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; +import org.tizen.dynamicanalyzer.ui.timeline.chart.ScreenshotChart; +import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; +import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class ConfigurationDialogValues { private static ConfigurationDialogValues instance = null; @@ -536,6 +543,35 @@ public class ConfigurationDialogValues { setConfig(getUserInterface(), featueName); } else if (featueName.equals(ConfigureLabels.FEATURE_SCREENSHOT)) { setConfig(getScreenshot(), featueName); + + if(getScreenshot() != 0) { + TimelineChartManager chartManager = TimelineChartManager.getInstance(); + StringBuffer strSaveSelectedChartNameList = new StringBuffer(""); //$NON-NLS-1$ + List chartList = chartManager.getChartList(); + List selectedChartList = chartManager.getSelectedChartList(); + List newSelectedChartList = new ArrayList(); + ArrayList showInfo = new ArrayList(); + + for(TimelineChart chart : chartList) { + if(selectedChartList.contains(chart) || + chart instanceof ScreenshotChart) { + newSelectedChartList.add(chart); + strSaveSelectedChartNameList.append(chart.getChartName()); + strSaveSelectedChartNameList.append(","); //$NON-NLS-1$ + + showInfo.add(true); + } else { + showInfo.add(false); + } + } + + chartManager.setSelectedChartList(newSelectedChartList); + AnalyzerUtil.getTimelineComposite().reArrangeChart(null, showInfo); + + ConfigureManager.getInstance().setValue( + ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, + strSaveSelectedChartNameList.toString()); + } } else if (featueName.equals(ConfigureLabels.FEATURE_USER_EVENT)) { setConfig(getUserEvent(), featueName); } else if (featueName.equals(ConfigureLabels.FEATURE_RECORDING)) { @@ -625,7 +661,7 @@ public class ConfigurationDialogValues { } } - public void applySettingValueToDA() { + private void applySettingValueToDA() { // Table Feature for (String featueName : ConfigurationDialogValues.getInstance()