From 2bf955dc91c4572b2963b6460796be9cdeaeb743 Mon Sep 17 00:00:00 2001
From: jaeyong lee <jae-yong.lee@samsung.com>
Date: Tue, 14 Jun 2016 18:44:45 +0900
Subject: [PATCH] [SRADA-675] Resolve some issues at RangeDataMaanger 	-
 Sometimes incorrect range was analyzed 	- Range analysis doesn't work
 when only one marker exists

Change-Id: I9eee76de62caa1ff189e38f14cf8ae23fcc4d17c
---
 .../tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java |  7 -------
 .../ui/common/SetRangeMarkerMouseMoveListener.java           |  2 +-
 .../org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java | 12 +++++++++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
index b7dd421..b4dec1a 100644
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
@@ -461,13 +461,6 @@ public class DAChartRenderer {
 					}
 					gc.fillRectangle(pixelStartX, 0, width, r.height);
 				}
-				if (markerStyle != DAChartPlotIntervalMarker.INTERVAL_MARKER_STYLE_AREA) {
-					gc.drawLine(pixelStartX, r.y, pixelStartX, r.height);
-					gc.drawLine(pixelEndX, r.y, pixelEndX, r.height);
-				}
-			} else {
-				gc.setLineWidth(marker.getLineWidth());
-				gc.drawLine(pixelStartX, r.y, pixelStartX, r.height);
 			}
 		}
 		gc.setAlpha(oldAlpha);
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 a618b69..0768222 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
@@ -117,8 +117,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().getMarerTimeList().remove(i);
 				
+				RangeDataManager.getInstance().removeMarkerTime(marker.getTime());
 				Toolbar.INSTANCE.getMarkerTimeList().remove(i);
 				
 				TimelineChartView TLchartView = (TimelineChartView) AnalyzerUtil.getView(TimelinePage.pageID, TimelineChartView.class.getName());
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 5d32504..0a3e5cf 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
@@ -57,6 +57,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionEntryDBTable;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionExitDBTable;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.WebFunctionEntryDBTable;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.WebFunctionExitDBTable;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.util.Logger;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
@@ -253,6 +254,15 @@ public class RangeDataManager implements Runnable {
 		}
 	}
 	
+	public void removeMarkerTime(double time) {
+		long longTime = (long) (time * TimelineConstants.MEGA_DOUBLE);
+		for(int i = 0; i < markerTimeList.size(); i++) {
+			if(markerTimeList.get(i) == longTime) {
+				markerTimeList.remove(i);
+			}
+		}
+	}
+	
 	public void addMarkerTime(long time) {
 		if(markerTimeList != null && !markerTimeList.contains(time)) {
 			markerTimeList.add(time);
@@ -264,7 +274,7 @@ public class RangeDataManager implements Runnable {
 	}
 	
 	public void setRangeFromMarkerList(long time) {
-		if(markerTimeList != null && markerTimeList.size() > 1 && !markerTimeList.contains(time)) {
+		if(markerTimeList != null && markerTimeList.size() >= 1 && !markerTimeList.contains(time)) {
 			int findIndex = -1;
 			
 			for(int i = 0; i < markerTimeList.size(); i++) {
-- 
2.7.4