From ea6e9109db4dabc6905594107346bcbbc9b07fa2 Mon Sep 17 00:00:00 2001 From: "Hyunjong,park" Date: Thu, 12 Dec 2013 18:09:02 +0900 Subject: [PATCH] [Title] fix network, file table [Desc.] add features - data filtering by pid [Issue] - --- .../tizen/dynamicanalyzer/ui/file/FileApiListTable.java | 8 +++++++- .../org/tizen/dynamicanalyzer/ui/file/FileApiListView.java | 14 ++++++++++++-- .../dynamicanalyzer/ui/network/NetworkApiListTable.java | 7 +++++++ .../dynamicanalyzer/ui/network/NetworkApiListView.java | 12 +++++++++++- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java index 84938c7..d897b5d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java @@ -44,6 +44,7 @@ import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.swap.model.data.FileData; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DAApiListTableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.utils.Formatter; @@ -116,9 +117,14 @@ public class FileApiListTable extends DAApiListTableComposite { List removeTableIndex = new ArrayList(); FileChartDataEvent content; for (int i = 0; i < contents.size(); i++) { - content = contents.get(i); FileData contentTemp = content.getContents(); + int selectedPid = ToolbarArea.getInstance().getSelectedPid(); + if (selectedPid != 0) { + if (selectedPid != contentTemp.getPid()) { + continue; + } + } List contentText = new ArrayList(); List contentData = new ArrayList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java index c411008..063d527 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java @@ -40,6 +40,7 @@ import org.tizen.dynamicanalyzer.nl.FilePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; @@ -53,6 +54,7 @@ public class FileApiListView extends DAView { private long selectionEndTime = 0; int[] innerMaxWeight = { 0, 100 }; int[] outerMaxWeight = { 100, 0 }; + private int preSelectionPId = 1; private String[] columnNames = { FilePageLabels.FILE_API_LIST_VIEW_INDEX, FilePageLabels.FILE_API_LIST_VIEW_START_TIME, @@ -128,7 +130,15 @@ public class FileApiListView extends DAView { return; } - if (data.getContents().size() != tableComp.getTable().getItemCount()) { + int selectedPid = ToolbarArea.getInstance().getSelectedPid(); + if (preSelectionPId != -1 && preSelectionPId != selectedPid) { + tableComp.updateTable(); + } + preSelectionPId = selectedPid; + + if (tableComp.getTable().getItemCount() > 0 + && data.getContents().size() != tableComp.getTable() + .getItemCount()) { tableComp.updateTable(); } @@ -140,7 +150,7 @@ public class FileApiListView extends DAView { selectionStartTime = data.getStartTime(); selectionEndTime = data.getEndTime(); } else { - this.data = (FileChartData)data.getData(); + this.data = (FileChartData) data.getData(); } tableComp.getTable().removeAll(); tableComp.updateTable(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java index eb5733a..1eaf0b7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java @@ -44,6 +44,7 @@ import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.swap.model.data.NetworkData; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DAApiListTableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.utils.Formatter; @@ -185,6 +186,12 @@ public class NetworkApiListTable extends DAApiListTableComposite { for (int i = 0; i < contents.size(); i++) { content = contents.get(i); NetworkData contentTemp = content.getContents(); + int selectedPid = ToolbarArea.getInstance().getSelectedPid(); + if (selectedPid != 0) { + if (selectedPid != contentTemp.getPid()) { + continue; + } + } List contentText = new ArrayList(); List contentData = new ArrayList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java index 9ff4c2b..eba1af2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java @@ -41,6 +41,7 @@ import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; @@ -54,6 +55,7 @@ public class NetworkApiListView extends DAView { private long selectionEndTime = 0; int[] innerMaxWeight = { 0, 100 }; int[] outerMaxWeight = { 100, 0 }; + private int preSelectionPId = 1; private String[] columnNames = { NetworkPageLabels.NETWORK_API_LIST_VIEW_INDEX, @@ -136,7 +138,15 @@ public class NetworkApiListView extends DAView { return; } - if (data.getContents().size() != tableComp.getTable().getItemCount()) { + int selectedPid = ToolbarArea.getInstance().getSelectedPid(); + if (preSelectionPId != -1 && preSelectionPId != selectedPid) { + tableComp.updateTable(); + } + preSelectionPId = selectedPid; + + if (tableComp.getTable().getItemCount() > 0 + && data.getContents().size() != tableComp.getTable() + .getItemCount()) { tableComp.updateTable(); } -- 2.7.4