From 5cec27481e992172e418a8f98fc5a3da601b2e91 Mon Sep 17 00:00:00 2001 From: Andrey Fedorushkov Date: Fri, 14 May 2010 23:31:46 +0400 Subject: [PATCH] fix minor bug russian GOST --- common/common_plot_functions.cpp | 6 ++++-- common/worksheet.cpp | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/common_plot_functions.cpp b/common/common_plot_functions.cpp index 14f42e8114..371fffa757 100644 --- a/common/common_plot_functions.cpp +++ b/common/common_plot_functions.cpp @@ -284,7 +284,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) case WS_IDENTSHEET: if( WsItem->m_Legende ) msg = WsItem->m_Legende; - msg << screen->m_ScreenNumber; + if( screen->m_NumberOfScreen > 1 ) + msg << screen->m_ScreenNumber; plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, @@ -294,7 +295,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) case WS_SHEETS: if( WsItem->m_Legende ) msg = WsItem->m_Legende; - msg << screen->m_NumberOfScreen; + if( screen->m_NumberOfScreen > 1 ) + msg << screen->m_NumberOfScreen; plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, diff --git a/common/worksheet.cpp b/common/worksheet.cpp index 293ec18b7f..9184e0ecb0 100644 --- a/common/worksheet.cpp +++ b/common/worksheet.cpp @@ -549,7 +549,7 @@ Ki_WorkSheetData WS_Art = &WS_Mass, STAMP_X_50 - 30, STAMP_Y_35 + 90, 0, 0, - wxT( "Арт." ),NULL + wxT( "Лит." ),NULL }; Ki_WorkSheetData WS_Mass = @@ -1147,7 +1147,8 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, case WS_IDENTSHEET: if( WsItem->m_Legende ) msg = WsItem->m_Legende; - msg << screen->m_ScreenNumber; + if( screen->m_NumberOfScreen > 1 ) + msg << screen->m_ScreenNumber; DrawGraphicText( DrawPanel, DC, pos, Color, msg, TEXT_ORIENT_HORIZ, size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, width, false, false, @@ -1157,7 +1158,8 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, case WS_SHEETS: if( WsItem->m_Legende ) msg = WsItem->m_Legende; - msg << screen->m_NumberOfScreen; + if( screen->m_NumberOfScreen > 1 ) + msg << screen->m_NumberOfScreen; DrawGraphicText( DrawPanel, DC, pos, Color, msg, TEXT_ORIENT_HORIZ, size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, width, false, false,