From ee6cd0883da5e7cbf44d86da0e06083eab069a1c Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 7 Jun 2013 18:37:44 +0200 Subject: [PATCH] Plot files : fix Bug #1188664 (full filename instead of short file name, and swapping between sheet path and file name) --- common/common_plot_functions.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/common_plot_functions.cpp b/common/common_plot_functions.cpp index f67f781fb2..50da2d814f 100644 --- a/common/common_plot_functions.cpp +++ b/common/common_plot_functions.cpp @@ -98,8 +98,12 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock, drawList.SetSheetNumber( aSheetNumber ); drawList.SetSheetCount( aNumberOfSheets ); - drawList.BuildWorkSheetGraphicList( aPageInfo.GetType(), aSheetDesc, - aFilename, aTitleBlock, plotColor, plotColor ); + // Print only a short filename, if aFilename is the full filename + + wxFileName fn( aFilename ); + + drawList.BuildWorkSheetGraphicList( aPageInfo.GetType(), fn.GetFullName(), + aSheetDesc, aTitleBlock, plotColor, plotColor ); // Draw item list for( WS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item;