diff options
Diffstat (limited to 'valgrind')
-rw-r--r-- | valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java | 18 | ||||
-rw-r--r-- | valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java | 6 | ||||
-rw-r--r-- | valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditor.java | 5 | ||||
-rw-r--r-- | valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartPNG.java (renamed from valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartSVG.java) | 9 | ||||
-rw-r--r-- | valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/messages.properties | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java index 6404d7bb24..92c66ce77f 100644 --- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java +++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java @@ -16,26 +16,26 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartEditorInput; -import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartSVG; +import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartPNG; import org.eclipse.linuxtools.internal.valgrind.massif.birt.HeapChart; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.PlatformUI; public class ChartExportTest extends AbstractMassifTest { - private IPath svgPath; + private IPath pngPath; @Override protected void setUp() throws Exception { super.setUp(); proj = createProjectAndBuild("alloctest"); //$NON-NLS-1$ - svgPath = ResourcesPlugin.getWorkspace().getRoot().getLocation(); - assertNotNull(svgPath); - svgPath = svgPath.append("alloctest").append("chart.svg"); //$NON-NLS-1$ //$NON-NLS-2$ + pngPath = ResourcesPlugin.getWorkspace().getRoot().getLocation(); + assertNotNull(pngPath); + pngPath = pngPath.append("alloctest").append("chart.png"); //$NON-NLS-1$ //$NON-NLS-2$ } @Override protected void tearDown() throws Exception { - File chartFile = svgPath.toFile(); + File chartFile = pngPath.toFile(); if (chartFile.exists()) { chartFile.delete(); } @@ -52,10 +52,10 @@ public class ChartExportTest extends AbstractMassifTest { if (input instanceof ChartEditorInput) { HeapChart chart = ((ChartEditorInput) input).getChart(); - ChartSVG svg = new ChartSVG(chart); - svg.renderSVG(svgPath); + ChartPNG png = new ChartPNG(chart); + png.renderPNG(pngPath); - File chartFile = svgPath.toFile(); + File chartFile = pngPath.toFile(); assertTrue(chartFile.exists()); assertTrue(chartFile.length() > 0); } else { diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java index bfa980a2a8..12623dbc4b 100644 --- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java +++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java @@ -33,7 +33,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.linuxtools.internal.valgrind.massif.MassifSnapshot.SnapshotType; import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartEditorInput; -import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartSVG; +import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartPNG; import org.eclipse.linuxtools.internal.valgrind.massif.birt.HeapChart; import org.eclipse.linuxtools.valgrind.ui.IValgrindToolView; import org.eclipse.swt.SWT; @@ -250,8 +250,8 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView { ChartEditorInput currentInput = getChartInput(pid); String path = getChartSavePath(currentInput.getName() + ".png"); //$NON-NLS-1$ if (path != null) { - ChartSVG renderer = new ChartSVG(currentInput.getChart()); - renderer.renderSVG(Path.fromOSString(path)); + ChartPNG renderer = new ChartPNG(currentInput.getChart()); + renderer.renderPNG(Path.fromOSString(path)); } } }; diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditor.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditor.java index 51ac9c24ba..d63c12e19c 100644 --- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditor.java +++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditor.java @@ -90,6 +90,7 @@ public class ChartEditor extends EditorPart { final Color RED = new Color(Display.getDefault(), 255, 0, 0); final Color ORANGE = new Color(Display.getDefault(), 255, 165, 0); final Color GREEN = new Color(Display.getDefault(), 0, 255, 0); + final Color DARK_BLUE = new Color(Display.getDefault(), 64, 128, 128); control.setBackground(WHITE); control.setBackgroundInPlotArea(LIGHTYELLOW); @@ -147,8 +148,8 @@ public class ChartEditor extends EditorPart { lsStack.setXSeries(heapChart.time); lsStack.setYSeries(heapChart.dataStacks); lsStack.setSymbolType(PlotSymbolType.DIAMOND); - lsUseful.setSymbolColor(RED); - lsUseful.setLineColor(RED); + lsStack.setSymbolColor(DARK_BLUE); + lsStack.setLineColor(DARK_BLUE); } final ILineSeries lsTotal = (ILineSeries) control.getSeriesSet(). diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartSVG.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartPNG.java index 22f71a84ad..4c83e9b3ce 100644 --- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartSVG.java +++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartPNG.java @@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.valgrind.massif.birt; import org.eclipse.core.runtime.IPath; -import org.eclipse.linuxtools.internal.valgrind.massif.MassifViewPart; import org.eclipse.linuxtools.valgrind.ui.ValgrindUIConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.GC; @@ -25,15 +24,15 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; -public class ChartSVG { +public class ChartPNG { protected HeapChart cm = null; - public ChartSVG(HeapChart chart) { + public ChartPNG(HeapChart chart) { cm = chart; } - public void renderSVG(IPath svgPath) { + public void renderPNG(IPath pngPath) { Composite comp = cm.getChartControl(); Display dsp = Display.getCurrent(); GC gc = new GC(comp); @@ -42,7 +41,7 @@ public class ChartSVG { gc.dispose(); ImageLoader imageLoader = new ImageLoader(); imageLoader.data = new ImageData[] {img.getImageData()}; - imageLoader.save(svgPath.toOSString(), SWT.IMAGE_PNG); + imageLoader.save(pngPath.toOSString(), SWT.IMAGE_PNG); } public HeapChart getDesignTimeModel() { diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/messages.properties b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/messages.properties index a920d6c03f..ea833d980f 100644 --- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/messages.properties +++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/messages.properties @@ -31,7 +31,7 @@ MassifToolPage.Remove=Rem&ove MassifToolPage.time_unit=Time unit: MassifViewPart.Display_Heap_Allocation=Display Heap Allocation Graph MassifViewPart.Extra_Heap=Extra Heap (B) -MassifViewPart.Save_Chart=Save Chart As SVG +MassifViewPart.Save_Chart=Save Chart As PNG MassifViewPart.Save_chart_dialog_title=Save Chart MassifViewPart.Show_Heap_Tree=Show Heap Tree MassifViewPart.Snapshot=Snapshot |