From: sanghyunnim.lee <sanghyunnim.lee@samsung.com>
Date: Thu, 29 Nov 2012 12:47:43 +0000 (+0900)
Subject: [Title]modify scale change move
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13e5eaf853adc6a7e5ca48f25ae84af0d3d27881;p=sdk%2Ftools%2Fdynamic-analyzer.git

[Title]modify scale change move
[Desc.]
[Issue]
---

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java
index 711b629..6b5557e 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java
@@ -68,45 +68,6 @@ public class ScreenshotChart extends TimelineChart {
 		addIcon = ImageResources.ADD_CHART_SCREENSHOT;
 
 		screenshotSeries = new DACustomChartSeries(TimelineChartLabels.SCREENSHOT_CHART_TITLE, DACustomChartSeries.SERIES_STYLE_IMAGE);
-		
-		//FIXME for test
-		int x = 5;
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_BLUE, "blue"));
-		screenshotSeries.addSeriesItem(new DACustomChartSeriesItem(x+=5, ImageResources.TEST_IMAGE_RED, "red"));
 	}
 
 	@Override
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimeBar.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimeBar.java
index eab43ed..55a7755 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimeBar.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimeBar.java
@@ -93,14 +93,22 @@ public class TimeBar extends Canvas {
 				TimelineGlobalVariable.oriScaleValue = TimelineGlobalVariable.currentScaleValue;
 				TimelineGlobalVariable.originalEndPx = (int) Math.round((double) TimelineGlobalVariable.originalEndPx * originalScaleSec / currentScaleSec);
 
+				int maxPx = chartRunningPx > TimelineGlobalVariable.originalEndPx ? chartRunningPx : TimelineGlobalVariable.originalEndPx;
 				if (TimelineGlobalVariable.scaleChanged) {
 					TimelineGlobalVariable.scaleChanged = false;
-					timelineMaster.setRangeScrollBarStuckState(false);
 					
-					int tempMidPx = (int) Math.round((double) (TimelineGlobalVariable.endPx + TimelineGlobalVariable.startPx ) / 2 * originalScaleSec / currentScaleSec);
-					TimelineGlobalVariable.startPx = tempMidPx - w / 2;
-					if (TimelineGlobalVariable.startPx < 0) {
-						TimelineGlobalVariable.startPx = 0;
+					if(TimelineGlobalVariable.startPx == 0) {
+						timelineMaster.setRangeScrollBarStuckState(false);
+					} else if (timelineMaster.isRangeScrollBarStuck()){
+						TimelineGlobalVariable.startPx = maxPx - w;
+					} else {
+						timelineMaster.setRangeScrollBarStuckState(false);
+						int tempMidPx = (int) Math.round((double) (TimelineGlobalVariable.endPx + TimelineGlobalVariable.startPx ) / 2 * originalScaleSec / currentScaleSec);
+						TimelineGlobalVariable.startPx = tempMidPx - w / 2;
+						
+						if (TimelineGlobalVariable.startPx < 0) {
+							TimelineGlobalVariable.startPx = 0;
+						}
 					}
 				} else {
 					TimelineGlobalVariable.startPx = (int) Math.round((double) TimelineGlobalVariable.startPx * originalScaleSec / currentScaleSec);
@@ -114,7 +122,6 @@ public class TimeBar extends Canvas {
 				}
 				
 				TimelineGlobalVariable.endPx = TimelineGlobalVariable.startPx + w;
-				int maxPx = chartRunningPx > TimelineGlobalVariable.originalEndPx ? chartRunningPx : TimelineGlobalVariable.originalEndPx;
 				if(TimelineGlobalVariable.endPx > maxPx) {
 					TimelineGlobalVariable.endPx = maxPx;
 					TimelineGlobalVariable.startPx = maxPx - w;