From 9f920aada33e48369e07c94e170ac37b1c03515a Mon Sep 17 00:00:00 2001 From: jaeyong lee Date: Fri, 12 Aug 2016 10:59:44 +0900 Subject: [PATCH] [SRADA-1018] Refactoring codes about range inspection Change-Id: Ifce33e539deca7b766fc2947a2d85f7443eede1c --- .../ui/common/SetRangeMarkerMouseMoveListener.java | 89 ++--------------- .../ui/common/TimelineChartMouseEventListener.java | 26 +---- .../dynamicanalyzer/ui/file/FileApiListTable.java | 37 +------ .../memory/table/MemoryAllocationTraceTable.java | 29 ++++++ .../dynamicanalyzer/ui/network/NetworkTable.java | 37 +------ .../chart/listener/GLFrameRateMouseListener.java | 26 +---- .../ui/opengl/table/api/GLAPITable.java | 37 +------ .../dynamicanalyzer/ui/range/RangeDataManager.java | 5 +- .../ui/thread/ThreadAPIListTable.java | 37 +------ .../ui/timeline/calltrace/CallTraceTable.java | 35 +------ .../ui/timeline/dlog/DlogTable.java | 45 +-------- .../tizen/dynamicanalyzer/ui/toolbar/Toolbar.java | 108 +++++++++++++++++++++ .../tizen/dynamicanalyzer/utils/AnalyzerUtil.java | 30 ++++++ 13 files changed, 184 insertions(+), 357 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/SetRangeMarkerMouseMoveListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/SetRangeMarkerMouseMoveListener.java index 0768222..56032a7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/SetRangeMarkerMouseMoveListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/SetRangeMarkerMouseMoveListener.java @@ -31,21 +31,8 @@ import java.util.List; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseMoveListener; -import org.tizen.dynamicanalyzer.ui.file.FileChartView; -import org.tizen.dynamicanalyzer.ui.file.FilePage; -import org.tizen.dynamicanalyzer.ui.memory.MemoryChartView; -import org.tizen.dynamicanalyzer.ui.memory.MemoryPage; -import org.tizen.dynamicanalyzer.ui.network.NetworkChartView; -import org.tizen.dynamicanalyzer.ui.network.NetworkPage; -import org.tizen.dynamicanalyzer.ui.opengl.GLPage; -import org.tizen.dynamicanalyzer.ui.opengl.chart.GLChartView; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; -import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; -import org.tizen.dynamicanalyzer.ui.thread.chart.ThreadChartView; -import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; -import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; @@ -53,14 +40,10 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimelineMarker; import org.tizen.dynamicanalyzer.widgets.timeline.DATimelineRenderer; public class SetRangeMarkerMouseMoveListener extends MouseAdapter implements MouseMoveListener { - private RangeDataManager rangeDataManager; - private DAChartBoard chartBoard; private DATimeline timeline; public SetRangeMarkerMouseMoveListener(RangeDataManager rangeDataManager, DAChartBoard chartBoard, DATimeline timeline) { - this.rangeDataManager = rangeDataManager; - this.chartBoard = chartBoard; this.timeline = timeline; } @@ -68,41 +51,10 @@ public class SetRangeMarkerMouseMoveListener extends MouseAdapter implements Mou public void mouseMove(MouseEvent e) { List markerList = timeline.getMarkerList(); for(int i = 0; i < markerList.size(); i++) { - if(markerList.get(i).isPushed()) { - //RangeDataManager markerList update - RangeDataManager.getInstance().getMarerTimeList().set(i, (long) (markerList.get(i).getTime() * TimelineConstants.MEGA_DOUBLE)); - - //Toolbar markerList update - Toolbar.INSTANCE.getMarkerTimeList().set(i, markerList.get(i).getTime()); - - //All pages markerList update - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - if(TLchartView != null) { - TLchartView.getChartBoard().getTimeline().getMarkerList().get(i).setTime(markerList.get(i).getTime()); - } - if(NETchartView != null) { - NETchartView.getChartBoard().getTimeline().getMarkerList().get(i).setTime(markerList.get(i).getTime()); - } - if(THRchartView != null) { - THRchartView.getChartBoard().getTimeline().getMarkerList().get(i).setTime(markerList.get(i).getTime()); - } - if(FLchartView != null) { - FLchartView.getChartBoard().getTimeline().getMarkerList().get(i).setTime(markerList.get(i).getTime()); - } - if(GLchartview != null) { - GLchartview.getChartBoard().getTimeline().getMarkerList().get(i).setTime(markerList.get(i).getTime()); - } - if(MMchartView != null) { - MMchartView.getChartBoard().getTimeline().getMarkerList().get(i).setTime(markerList.get(i).getTime()); - } - - //Main pages chartboard update - AnalyzerUtil.getMainTab().getTopComposite().updateView(); + DATimelineMarker marker = markerList.get(i); + if(marker.isPushed()) { + long longTime = (long) (marker.getTime() * TimelineConstants.MEGA_DOUBLE); + AnalyzerUtil.moveMarker(i, longTime); break; } } @@ -117,37 +69,8 @@ public class SetRangeMarkerMouseMoveListener extends MouseAdapter implements Mou if(e.x >= secondToPixel(marker.getTime()) - markerWidth/2 && e.x <= secondToPixel(marker.getTime()) + markerWidth/2 && e.y >= 8) { - - RangeDataManager.getInstance().removeMarkerTime(marker.getTime()); - Toolbar.INSTANCE.getMarkerTimeList().remove(i); - - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - if(TLchartView != null) { - TLchartView.getChartBoard().getTimeline().getMarkerList().remove(i); - } - if(NETchartView != null) { - NETchartView.getChartBoard().getTimeline().getMarkerList().remove(i); - } - if(THRchartView != null) { - THRchartView.getChartBoard().getTimeline().getMarkerList().remove(i); - } - if(FLchartView != null) { - FLchartView.getChartBoard().getTimeline().getMarkerList().remove(i); - } - if(GLchartview != null) { - GLchartview.getChartBoard().getTimeline().getMarkerList().remove(i); - } - if(MMchartView != null) { - MMchartView.getChartBoard().getTimeline().getMarkerList().remove(i); - } - - //Main pages chartboard update - AnalyzerUtil.getMainTab().getTopComposite().updateView(); + long longTime = (long) (marker.getTime() * TimelineConstants.MEGA_DOUBLE); + AnalyzerUtil.removeMarker(i, longTime); break; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java index 76a2520..fc02912 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java @@ -295,31 +295,7 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements Mou long longTime = (long) (time * TimelineConstants.MEGA_DOUBLE); if(longTime <= Toolbar.INSTANCE.getTime()) { - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - //1. add marker to rangedatamanager - rangeDataManager.addMarkerTime(longTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(time); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); + AnalyzerUtil.addMarker(longTime); } } 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 94bf71b..177b358 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 @@ -142,46 +142,11 @@ public class FileApiListTable extends DAApiListTableComposite { } List markerData = ((DATableDataFormat) ti[0].getData()).getData(); long markerTime = Long.parseLong((String)markerData.get(1)); - addMarker(markerTime); + AnalyzerUtil.addMarker(markerTime); } }); } - private void addMarker(long markerTime) { - double startMarkerTime = markerTime / (TimelineConstants.MEGA_DOUBLE); - - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - //1. add marker to rangedatamanager - RangeDataManager.getInstance().addMarkerTime(markerTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(startMarkerTime); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); - - AnalyzerUtil.getMainTab().getTopComposite().updateView(); - /// draw marker clearly - BaseView baseView = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); - baseView.getTopComposite().updateView(); - } - @Override protected List makeTableInput() { FileApiListView view = (FileApiListView) AnalyzerManager.getCurrentPage().getView(FilePage.apilistViewID); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java index 5d52c54..a2576d1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java @@ -27,8 +27,11 @@ package org.tizen.dynamicanalyzer.ui.memory.table; import java.util.ArrayList; import java.util.List; +import org.eclipse.nebula.widgets.grid.Grid; import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Composite; @@ -38,10 +41,13 @@ import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.nl.MemoryPageLabels; import org.tizen.dynamicanalyzer.ui.memory.data.HeapDataManager; +import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionEntryDBTable; import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; +import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class MemoryAllocationTraceTable extends DATableComposite { @@ -102,6 +108,29 @@ public class MemoryAllocationTraceTable extends DATableComposite { // TODO Auto-generated method stub } }); + + table.addMouseListener(new MouseListener() { + @Override + public void mouseDoubleClick(MouseEvent e) { + GridItem[] ti = ((Grid) e.widget).getSelection(); + if(null == ti || ti.length == 0) { + return; + } + List markerData = ((DATableDataFormat) ti[0].getData()).getData(); + long markerTime = (Long) markerData.get(1); + AnalyzerUtil.addMarker(markerTime); + } + + @Override + public void mouseDown(MouseEvent e) { + + } + + @Override + public void mouseUp(MouseEvent e) { + + } + }); } public void setSelectionRange(Long start, Long end){ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java index 815b6a5..7243893 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java @@ -135,46 +135,11 @@ public class NetworkTable extends DAApiListTableComposite { } List markerData = ((DATableDataFormat) ti[0].getData()).getData(); long markerTime = Long.parseLong((String)markerData.get(1)); - addMarker(markerTime); + AnalyzerUtil.addMarker(markerTime); } }); } - private void addMarker(long markerTime) { - double startMarkerTime = markerTime / (TimelineConstants.MEGA_DOUBLE); - - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - //1. add marker to rangedatamanager - RangeDataManager.getInstance().addMarkerTime(markerTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(startMarkerTime); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); - - AnalyzerUtil.getMainTab().getTopComposite().updateView(); - /// draw marker clearly - BaseView baseView = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); - baseView.getTopComposite().updateView(); - } - @Override protected List makeTableInput() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java index 73ab9e4..fb76638 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/listener/GLFrameRateMouseListener.java @@ -183,31 +183,7 @@ public class GLFrameRateMouseListener extends GLChartMouseListener { long longTime = (long) (time * TimelineConstants.MEGA_DOUBLE); if(longTime <= Toolbar.INSTANCE.getTime()) { - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - //1. add marker to rangedatamanager - RangeDataManager.getInstance().addMarkerTime(longTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(time); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); + AnalyzerUtil.addMarker(longTime); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java index 4818ed7..5e54100 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java @@ -124,46 +124,11 @@ public class GLAPITable extends DATableComposite { return; } DATableDataFormat dataFormat = (DATableDataFormat) ti[0].getData(); - addMarker(((GLAPIData)(dataFormat.getLogData())).getTime()); + AnalyzerUtil.addMarker(((GLAPIData)(dataFormat.getLogData())).getTime()); } }); } - private void addMarker(long markerTime) { - double startMarkerTime = markerTime / (TimelineConstants.MEGA_DOUBLE); - - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - //1. add marker to rangedatamanager - RangeDataManager.getInstance().addMarkerTime(markerTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(startMarkerTime); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); - - AnalyzerUtil.getMainTab().getTopComposite().updateView(); - /// draw marker clearly - BaseView baseView = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); - baseView.getTopComposite().updateView(); - } - protected List makeTableInput() { List input = new ArrayList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java index 486ddec..eefa6cb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java @@ -287,10 +287,9 @@ public class RangeDataManager implements Runnable { } } - public void removeMarkerTime(double time) { - long longTime = (long) (time * TimelineConstants.MEGA_DOUBLE); + public void removeMarkerTime(long time) { for(int i = 0; i < markerTimeList.size(); i++) { - if(markerTimeList.get(i) == longTime) { + if(markerTimeList.get(i) == time) { markerTimeList.remove(i); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java index b2e4057..4dfc038 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java @@ -150,46 +150,11 @@ public class ThreadAPIListTable extends DAApiListTableComposite { } List markerData = ((DATableDataFormat) ti[0].getData()).getData(); long markerTime = Long.parseLong((String)markerData.get(1)); - addMarker(markerTime); + AnalyzerUtil.addMarker(markerTime); } }); } - private void addMarker(long markerTime) { - double startMarkerTime = markerTime / (TimelineConstants.MEGA_DOUBLE); - - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - //1. add marker to rangedatamanager - RangeDataManager.getInstance().addMarkerTime(markerTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(startMarkerTime); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); - - AnalyzerUtil.getMainTab().getTopComposite().updateView(); - /// draw marker clearly - BaseView baseView = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); - baseView.getTopComposite().updateView(); - } - @Override protected List makeTableInput() { List input = new ArrayList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java index 26f0f63..82d48c5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java @@ -126,7 +126,7 @@ public class CallTraceTable extends DAWindowingTableComposite { } List markerData = ((DATableDataFormat) ti[0].getData()).getData(); long markerTime = (Long) markerData.get(FunctionEntryDBTable.COLUMN.START_TIME.index); - addMarker(markerTime); + AnalyzerUtil.addMarker(markerTime); } @Override @@ -142,39 +142,6 @@ public class CallTraceTable extends DAWindowingTableComposite { } - private void addMarker(long markerTime) { - double doubleTime = markerTime / (TimelineConstants.MEGA_DOUBLE); - - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - - //1. add marker to rangedatamanager - RangeDataManager.getInstance().addMarkerTime(markerTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(doubleTime); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); - - AnalyzerUtil.getMainTab().getTopComposite().updateView(); - } - @Override protected List makeTableInput() { List> queriedData = getQueriedObjectData(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogTable.java index 5b181ec..af1958d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogTable.java @@ -249,12 +249,13 @@ public class DlogTable extends DATableComposite { } List markerData = ((DATableDataFormat) ti[0].getData()).getData(); long markertime = (Long) markerData.get(0); - DlogTimeMarker(markertime); + AnalyzerUtil.addMarker(markertime); } }); return true; } + @Override protected List makeTableInput() { List output = new ArrayList(); @@ -351,48 +352,6 @@ public class DlogTable extends DATableComposite { }); } - private void DlogTimeMarker(long markerTime){ - - double startMarkerTime = markerTime - / (TimelineConstants.MEGA_DOUBLE); - - - /// if click DlogTable cell already has marker, delete Marker - - TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); - NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); - ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); - FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); - GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); - MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); - - - //1. add marker to rangedatamanager - RangeDataManager.getInstance().addMarkerTime(markerTime); - - //2. add marker to toolbar - Toolbar.INSTANCE.addMarkerTime(startMarkerTime); - - if(TLchartView != null) - TLchartView.updateView(); - if(NETchartView != null) - NETchartView.updateView(); - if(THRchartView != null) - THRchartView.updateView(); - if(FLchartView != null) - FLchartView.updateView(); - if(GLchartview != null) - GLchartview.updateView(); - if(MMchartView != null) - MMchartView.updateView(); - - AnalyzerUtil.getMainTab().getTopComposite().updateView(); - /// draw marker clearly - BaseView baseView = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); - baseView.getTopComposite().updateView(); - - } - private void setDlogSelecetionRange(long startTime, long endTime){ double startMarkerTime = startTime diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java index 4ef405c..0258289 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java @@ -78,15 +78,27 @@ import org.tizen.dynamicanalyzer.setting.SettingDataManager; import org.tizen.dynamicanalyzer.setting.TargetData; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.common.explorer.DeviceExplorerDialog; +import org.tizen.dynamicanalyzer.ui.file.FileChartView; +import org.tizen.dynamicanalyzer.ui.file.FilePage; +import org.tizen.dynamicanalyzer.ui.memory.MemoryChartView; +import org.tizen.dynamicanalyzer.ui.memory.MemoryPage; +import org.tizen.dynamicanalyzer.ui.network.NetworkChartView; +import org.tizen.dynamicanalyzer.ui.network.NetworkPage; +import org.tizen.dynamicanalyzer.ui.opengl.GLPage; +import org.tizen.dynamicanalyzer.ui.opengl.chart.GLChartView; import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; +import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; +import org.tizen.dynamicanalyzer.ui.thread.chart.ThreadChartView; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; +import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView; import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceDialog; import org.tizen.dynamicanalyzer.ui.toolbar.replayEditor.ReplayEditDialog; import org.tizen.dynamicanalyzer.ui.toolbar.setting.PreferencesDialog; import org.tizen.dynamicanalyzer.ui.widgets.SearchDialog; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; @@ -165,6 +177,102 @@ public enum Toolbar { if(markerTimeList != null && !markerTimeList.contains(time)) { markerTimeList.add(time); } + + TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); + NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); + ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); + FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); + GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); + MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); + + if(TLchartView != null) + TLchartView.updateView(); + if(NETchartView != null) + NETchartView.updateView(); + if(THRchartView != null) + THRchartView.updateView(); + if(FLchartView != null) + FLchartView.updateView(); + if(GLchartview != null) + GLchartview.updateView(); + if(MMchartView != null) + MMchartView.updateView(); + } + + public void removeMarkerTime(int index, double time) { + if(markerTimeList != null && markerTimeList.contains(time)) { + markerTimeList.remove(index); + } + + TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); + NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); + ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); + FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); + GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); + MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); + + if(TLchartView != null) { + TLchartView.getChartBoard().getTimeline().getMarkerList().remove(index); + TLchartView.updateView(); + } + if(NETchartView != null) { + NETchartView.getChartBoard().getTimeline().getMarkerList().remove(index); + NETchartView.updateView(); + } + if(THRchartView != null) { + THRchartView.getChartBoard().getTimeline().getMarkerList().remove(index); + THRchartView.updateView(); + } + if(FLchartView != null) { + FLchartView.getChartBoard().getTimeline().getMarkerList().remove(index); + FLchartView.updateView(); + } + if(GLchartview != null) { + GLchartview.getChartBoard().getTimeline().getMarkerList().remove(index); + GLchartview.updateView(); + } + if(MMchartView != null) { + MMchartView.getChartBoard().getTimeline().getMarkerList().remove(index); + MMchartView.updateView(); + } + } + + public void setMarkerTime(int index, double time) { + if(markerTimeList != null) { + getMarkerTimeList().set(index, time); + } + + TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName()); + NetworkChartView NETchartView = (NetworkChartView) AnalyzerUtil.getView(NetworkPage.pageID, NetworkChartView.class.getName()); + ThreadChartView THRchartView = (ThreadChartView) AnalyzerUtil.getView(ThreadPage.pageID, ThreadChartView.class.getName()); + FileChartView FLchartView = (FileChartView) AnalyzerUtil.getView(FilePage.pageID, FileChartView.class.getName()); + GLChartView GLchartview = (GLChartView) AnalyzerUtil.getView(GLPage.pageID, GLChartView.class.getName()); + MemoryChartView MMchartView = (MemoryChartView) AnalyzerUtil.getView(MemoryPage.pageID, MemoryChartView.class.getName()); + + if(TLchartView != null) { + TLchartView.getChartBoard().getTimeline().getMarkerList().get(index).setTime(time); + TLchartView.updateView(); + } + if(NETchartView != null) { + NETchartView.getChartBoard().getTimeline().getMarkerList().get(index).setTime(time); + NETchartView.updateView(); + } + if(THRchartView != null) { + THRchartView.getChartBoard().getTimeline().getMarkerList().get(index).setTime(time); + THRchartView.updateView(); + } + if(FLchartView != null) { + FLchartView.getChartBoard().getTimeline().getMarkerList().get(index).setTime(time); + FLchartView.updateView(); + } + if(GLchartview != null) { + GLchartview.getChartBoard().getTimeline().getMarkerList().get(index).setTime(time); + GLchartview.updateView(); + } + if(MMchartView != null) { + MMchartView.getChartBoard().getTimeline().getMarkerList().get(index).setTime(time); + MMchartView.updateView(); + } } public List getMarkerTimeList() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java index 2e1a851..75b6354 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -66,7 +66,10 @@ import org.tizen.dynamicanalyzer.project.ProcessMemoryMap; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.setting.SettingDataManager; import org.tizen.dynamicanalyzer.ui.page.BaseView; +import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView; +import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; @@ -88,6 +91,33 @@ public class AnalyzerUtil { } // FIXME end + + public static void addMarker(long markerTime) { + double doubleTime = markerTime / (TimelineConstants.MEGA_DOUBLE); + + RangeDataManager.getInstance().addMarkerTime(markerTime); + Toolbar.INSTANCE.addMarkerTime(doubleTime); + + getMainTab().getTopComposite().updateView(); + } + + public static void removeMarker(int index, long markerTime) { + double doubleTime = markerTime / (TimelineConstants.MEGA_DOUBLE); + + RangeDataManager.getInstance().removeMarkerTime(markerTime); + Toolbar.INSTANCE.removeMarkerTime(index, doubleTime); + + getMainTab().getTopComposite().updateView(); + } + + public static void moveMarker(int index, long markerTime) { + double doubleTime = markerTime / (TimelineConstants.MEGA_DOUBLE); + + RangeDataManager.getInstance().getMarerTimeList().set(index, markerTime); + Toolbar.INSTANCE.setMarkerTime(index, doubleTime); + + getMainTab().getTopComposite().updateView(); + } public static boolean copyFile(String srcPath, String destPath) { boolean success = false; -- 2.7.4