From 736fa6b7f9fc76cccc34d528f87008414943f335 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 22 Mar 2021 08:57:01 -0400 Subject: [PATCH] fixes --- .../autopsy/datasourcesummary/ui/Bundle.properties-MERGED | 2 ++ .../autopsy/datasourcesummary/uiutils/BarChartExport.java | 6 +++--- .../autopsy/datasourcesummary/uiutils/PieChartExport.java | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED index bfd955692f..a7b3c8870c 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED @@ -76,6 +76,8 @@ ExcelExportAction_exportToXLSX_gatheringTabData=Fetching Data for {0} Tab... ExcelExportAction_exportToXLSX_writingToFile=Writing to File... ExcelExportAction_getXLSXPath_directory=DataSourceSummary ExcelExportAction_moduleName=Data Source Summary +ExcelExportAction_runXLSXExport_errorMessage=There was an error while exporting. +ExcelExportAction_runXLSXExport_errorTitle=Error While Exporting ExcelExportAction_runXLSXExport_progressCancelActionTitle=Cancelling... ExcelExportAction_runXLSXExport_progressCancelTitle=Cancel # {0} - dataSource diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartExport.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartExport.java index 3ab6796173..e538a64ca5 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartExport.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartExport.java @@ -129,8 +129,8 @@ public class BarChartExport implements ExcelItemExportable, ExcelSheetExport { ); } - private static final int DEFAULT_ROW_SIZE = 8; - private static final int DEFAULT_COL_SIZE = 15; + private static final int DEFAULT_ROW_SIZE = 15; + private static final int DEFAULT_COL_SIZE = 10; private static final int DEFAULT_ROW_PADDING = 1; private static final int DEFAULT_COL_OFFSET = 1; @@ -219,7 +219,7 @@ public class BarChartExport implements ExcelItemExportable, ExcelSheetExport { int chartColStart = colStart + categories.size() + 1 + colOffset; //createAnchor has arguments of (int dx1, int dy1, int dx2, int dy2, int col1, int row1, int col2, int row2); - XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, chartColStart, rowStart + rowPadding, chartColStart + colSize, rowStart + rowSize); + XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, chartColStart, rowStart + rowPadding, chartColStart + colSize + 1, rowStart + rowSize + 1); XSSFChart chart = drawing.createChart(anchor); chart.setTitleText(chartTitle); diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/PieChartExport.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/PieChartExport.java index 7b1490a20b..4005a34ebc 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/PieChartExport.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/PieChartExport.java @@ -46,8 +46,8 @@ import org.sleuthkit.autopsy.datasourcesummary.uiutils.ExcelSpecialFormatExport. */ public class PieChartExport implements ExcelItemExportable, ExcelSheetExport { - private static final int DEFAULT_ROW_SIZE = 8; - private static final int DEFAULT_COL_SIZE = 15; + private static final int DEFAULT_ROW_SIZE = 20; + private static final int DEFAULT_COL_SIZE = 10; private static final int DEFAULT_ROW_PADDING = 1; private static final int DEFAULT_COL_OFFSET = 1; @@ -139,7 +139,7 @@ public class PieChartExport implements ExcelItemExportable, ExcelSheetExport { int chartColStart = colStart + 2 + colOffset; //createAnchor has arguments of (int dx1, int dy1, int dx2, int dy2, int col1, int row1, int col2, int row2); - XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, chartColStart, rowStart + rowPadding, chartColStart + colSize, rowStart + rowSize); + XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, chartColStart, rowStart + rowPadding, chartColStart + colSize + 1, rowStart + rowSize + 1); XSSFChart chart = drawing.createChart(anchor); chart.setTitleText(chartTitle);