FCL/sftools/ana/dynaanaapps: comparison sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.power/src/com/nokia/carbide/cpp/pi/power/PowerTraceGraph.java

equal deleted inserted replaced

-:5b9d4d8641ce
+:ae255c9aa552
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.text.DecimalFormat;
+import java.text.MessageFormat;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 import java.util.Vector;
+import java.util.Map.Entry;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.FigureCanvas;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.MouseEvent;
 //    private int[] capaValues;
 private double maxAmps = Integer.MIN_VALUE;
 	private double minAmps = Integer.MAX_VALUE;
 	private double maxPower = 0.0;
 private boolean mSelecting = false;
+	private static final int EVENT_TOPOFLINE    = 50;
+	private static final int EVENT_BOTTOMOFLINE = 30;
+	private static final int EVENT_RECTWIDTH    = 5;
+	private static final int EVENT_RECTHEIGHT   = 5;
 	// used when determining when to draw the text over the power bar.
 	private int leftBorder = 0;
 	private static int xLegendHeight = 20;
 	private static DecimalFormat powerFormat   = new DecimalFormat(Messages.getString("powerFormat")); //$NON-NLS-1$
 	private static DecimalFormat voltageFormat = new DecimalFormat(Messages.getString("voltageFormat")); //$NON-NLS-1$
 	private int uid;
-	protected static int SAMPLES_AT_ONE_TIME = 1000;
+	protected final static int SAMPLES_AT_ONE_TIME = 1000;
 	protected int stringTime;
+	private boolean backlightEnabled;
 	// class to pass sample data to the save wizard
 public class SaveSampleString implements ISaveSamples {
 		int startTime;
 		PwrSample lastSample = (PwrSample) sampleVector.get(sampleVector.size() - 1);
 		String returnString = null;
 		if (this.stringTime == startTime) {
-			returnString = Messages.getString("PowerTraceGraph.saveSamplesHeading"); //$NON-NLS-1$
+			if(backlightEnabled){
+				returnString = Messages.getString("PowerTraceGraph.saveBacklightSamplesHeading"); //$NON-NLS-1$
+			}else{
+				returnString = Messages.getString("PowerTraceGraph.saveSamplesHeading"); //$NON-NLS-1$
+			}
 		}
 		this.stringTime++;
 		// check if we have returned everything
 		}
 		double oldCurrent  = -1;
 		double oldVoltage  = -1;
 		double oldCapacity = -1;
+		int oldBacklight = -1;
 		String string = ""; //$NON-NLS-1$
 		if (this.trace.isComplete()) {
 			for ( ;
 				 (this.stringTime < endTime + 1) && (count > 0) && (this.stringTime < sampleVector.size());
 				 this.stringTime++) {
 				PwrSample sample = (PwrSample) sampleVector.get(stringTime);
 				double current  = sample.current;
 				double voltage  = sample.voltage;
 				double capacity = sample.capacity;
+				int backlight = sample.backlight;
-				if ((oldCurrent != current) || (oldVoltage != voltage) || (oldCapacity != capacity)) {
+				if ((oldCurrent != current) || (oldVoltage != voltage) || (oldCapacity != capacity)|| (oldBacklight != backlight)) {
-					string = Messages.getString("PowerTraceGraph.comma") + (int) current + Messages.getString("PowerTraceGraph.comma")  + (int) voltage + Messages.getString("PowerTraceGraph.comma") + (int) capacity + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+					if(backlightEnabled){
+						string = Messages.getString("PowerTraceGraph.comma") + (int) current + Messages.getString("PowerTraceGraph.comma")  + (int) voltage + Messages.getString("PowerTraceGraph.comma") + (int) capacity + Messages.getString("PowerTraceGraph.comma") + PwrSample.getBacklightInformation(backlight) +"\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+					}else{
+						string = Messages.getString("PowerTraceGraph.comma") + (int) current + Messages.getString("PowerTraceGraph.comma")  + (int) voltage + Messages.getString("PowerTraceGraph.comma") + (int) capacity + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+					}
 					oldCurrent  = current;
 					oldVoltage  = voltage;
 					oldCapacity = capacity;
+					oldBacklight = backlight;
 				}
 				returnString += sample.sampleSynchTime + string;
 				count--;
 			}
 					break;
 				double current  = sample.current;
 				double voltage  = sample.voltage;
 				double capacity = sample.capacity;
+				int backlight = sample.backlight;
-				returnString += sample.sampleSynchTime + Messages.getString("PowerTraceGraph.comma") + (int) current + Messages.getString("PowerTraceGraph.comma")  + (int) voltage + Messages.getString("PowerTraceGraph.comma") + (int) capacity + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				if(backlightEnabled){
+					returnString += sample.sampleSynchTime + Messages.getString("PowerTraceGraph.comma") + (int) current + Messages.getString("PowerTraceGraph.comma")  + (int) voltage + Messages.getString("PowerTraceGraph.comma") + (int) capacity + Messages.getString("PowerTraceGraph.comma") + PwrSample.getBacklightInformation(backlight) +"\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+				}else{
+					returnString += sample.sampleSynchTime + Messages.getString("PowerTraceGraph.comma") + (int) current + Messages.getString("PowerTraceGraph.comma")  + (int) voltage + Messages.getString("PowerTraceGraph.comma") + (int) capacity + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				}
 				count--;
 			}
 		}
 		// check if we have returned everything
 //			this.capaValues  = this.trace.getCapaValues();
 			this.maxAmps  = this.trace.getMaxAmps();
 			this.minAmps  = this.trace.getMinAmps();
 			this.maxPower = this.trace.getMaxPower();
 }
+backlightEnabled = trace.isBacklightEnabled();
+if(backlightEnabled){
+	xLegendHeight = 50;
+}
 }
 	public int getUid() {
 		return this.uid;
 	}
 	    // draws the same selection as the Address/Thread trace
 		this.drawSelectionSection(graphics, PowerTraceGraph.xLegendHeight);
 		if (mShowPowerLine)
 			this.drawPowerLine(graphics);
-	}
+		if(backlightEnabled){
+			drawBacklightEvents(graphics);
+		}
+	}
+	private void drawBacklightEvents(Graphics graphics){
+		Map<Long, Integer> backLightChangePoints = ((PwrTrace)getTrace()).getBacklightChangePoints();
+		Set<Entry<Long, Integer>> entrySet = backLightChangePoints.entrySet();
+		Iterator<Entry<Long, Integer>> iterator = entrySet.iterator();
+		int lastXLabelEnd = -1; //the x coordinate at which the last drawn label ended
+		int height = this.getVisualSize().height;
+		String eventName = ""; //$NON-NLS-1$
+		while(iterator.hasNext()){
+			Entry<Long, Integer> entry = iterator.next();
+			double scale = this.getScale();
+			int x = (int)(entry.getKey()/scale);
+			graphics.setForegroundColor(ColorConstants.red);
+			graphics.drawLine(x, height - EVENT_TOPOFLINE, x, height - EVENT_BOTTOMOFLINE);
+			eventName = Messages.getString("PowerTraceGraph.backlightGraphItem") + PwrSample.getBacklightInformation(entry.getValue()); //$NON-NLS-1$
+			graphics.setFont(PIPageEditor.helvetica_8);
+			GC gc = new GC(PIPageEditor.currentPageEditor().getSite().getShell());
+			Point point = gc.stringExtent(eventName);
+			gc.dispose();
+			int xLabelStart = x - (point.x / 2);
+			if(xLabelStart < 0){
+				xLabelStart = 0;
+			}
+			if (xLabelStart > lastXLabelEnd){ //only draw label if it doesn't overlap with previous
+				graphics.setForegroundColor(ColorConstants.red);
+				graphics.drawString(eventName, xLabelStart, height - EVENT_BOTTOMOFLINE + 3 + EVENT_RECTHEIGHT);
+				lastXLabelEnd = x + (point.x / 2);
+			}
+			graphics.setBackgroundColor(ColorConstants.red);
+			graphics.drawLine(x , height - EVENT_BOTTOMOFLINE + 1, x, height - EVENT_BOTTOMOFLINE + 2);
+			graphics.fillRectangle(x - (EVENT_RECTWIDTH / 2), height - EVENT_BOTTOMOFLINE + 3,
+									EVENT_RECTWIDTH, EVENT_RECTHEIGHT);
+		}
+	}
 public void repaint()
 	{
 	    this.parentComponent.repaintComponent();
 	}
 	private void showPowerValueAtX(MouseEvent me)
 	{
 		if (me.y > this.getVisualSizeY() - PowerTraceGraph.xLegendHeight) {
-			this.setToolTipText(null);
+			handleBacklightMouseEvents(me);
 			return;
 		}
 		// scale the value of x
 		int x = (int) (me.x * this.getScale() + 0.5);
 		if (x > (int) (PIPageEditor.currentPageEditor().getMaxEndTime() * 1000 + 0.0005)) {
-			this.setToolTipText(null);
+			handleBacklightMouseEvents(me);
 			return;
 		}
 		if (x > trace.getLastSampleNumber())
 			x = trace.getLastSampleNumber();
 		this.setToolTipText(textToShow + Messages.getString("tooltip2") //$NON-NLS-1$
 							+ PowerTraceGraph.voltageFormat.format(voltage));
 	}
 	public int timeIndex(int time) {
-		if (time < sampleTimes[0])
+		if (sampleTimes.length <= 0 || time < sampleTimes[0])
 			return -1;
 		if (time >= sampleTimes[sampleTimes.length - 1])
 			return sampleTimes.length - 1;
 if (selEnd < trace.getFirstSampleNumber() || selStart > selEnd)
 	return;
 // find the first sample greater than or equal to selStart
 int index = timeIndex(selStart);
+if(index == -1){
+	return;
+}
 // count time before the first sample as a bunch of zeros
 if (selStart < trace.getFirstSampleNumber()) {
 	sum = trace.getFirstSampleNumber() - selStart;
 	index = 0;
 	 * @see com.nokia.carbide.cpp.internal.pi.plugin.model.ITitleBarMenu#getContextHelpId()
 	 */
 	public String getContextHelpId() {
 		return PowerPlugin.HELP_CONTEXT_ID_MAIN_PAGE;
 	}
+	private void handleBacklightMouseEvents(MouseEvent me) {
+		if (!backlightEnabled){
+			setToolTipText(null);
+			return;
+		}
+		long x = me.x;
+		long y = me.y;
+		int height = this.getVisualSize().height;
+		// make sure we're in the right area of the graph window
+		if ((y < height - EVENT_BOTTOMOFLINE) || (y > height - EVENT_BOTTOMOFLINE + EVENT_RECTHEIGHT + 2))
+			return;
+		double scale = this.getScale();
+		String tooltip = ""; //$NON-NLS-1$
+		Map<Long, Integer> backLightChangePoints = ((PwrTrace)getTrace()).getBacklightChangePoints();
+		Set<Entry<Long, Integer>> entrySet = backLightChangePoints.entrySet();
+		Iterator<Entry<Long, Integer>> iterator = entrySet.iterator();
+		while(iterator.hasNext()){
+			Entry<Long, Integer> entry = iterator.next();
+			long xSample = (long)(entry.getKey()/scale + 0.5);
+			// samples are in timestamp order, so stop when xSample + EVENT_RECTWIDTH is too high
+			if (x < xSample - EVENT_RECTWIDTH)
+				break;
+			if ((x >= xSample - EVENT_RECTWIDTH) && (x <= xSample + EVENT_RECTWIDTH))
+			{
+				String parsedName = PwrSample.getBacklightInformation(entry.getValue());
+				if (tooltip.length() > 0){
+					tooltip += Messages.getString("PowerTraceGraph.newLine");  //$NON-NLS-1$
+				}
+				tooltip += MessageFormat.format(Messages.getString("PowerTraceGraph.backlightTooltip"), parsedName,entry.getKey()/1000.0 ); //$NON-NLS-1$
+			}
+		}
+		if (tooltip.length() > 0) {
+			setToolTipText(tooltip);
+		}
+		else{
+			setToolTipText(null);
+		}
+	}
 }

changeset 12	ae255c9aa552
parent 5	844b047e260d