haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small improvements for russian GOST

This commit is contained in:
faa 2009-12-02 13:06:55 +00:00
parent e832a6b875
commit 862d3cdbb5
8 changed files with 211 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_read_mesh.cpp
View File

@ -40,7 +40,7 @@ int S3D_MASTER::ReadData()
if( FullFilename.IsEmpty() )
{
wxLogDebug( _( "3D part library <%s> could not be found." ),
wxLogDebug( wxT( "3D part library <%s> could not be found." ),
GetChars( fn.GetFullPath() ) );
return -1;
}

90
common/common_plot_functions.cpp
View File

@ -32,6 +32,11 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
int conv_unit = screen->GetInternalUnits() / 1000;
wxString msg;
wxSize text_size;
#if defined(KICAD_GOST)
wxSize text_size2;
wxSize text_size3;
wxSize text_size1_5;
#endif
int UpperLimit = VARIABLE_BLOCK_START_POSITION;
bool italic = false;
bool bold = false;
@ -234,6 +239,12 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
text_size.x = SIZETEXT * conv_unit;
text_size.y = SIZETEXT * conv_unit;
#if defined(KICAD_GOST)
text_size2.x = SIZETEXT * conv_unit * 2;
text_size2.y = SIZETEXT * conv_unit * 2;
text_size3.x = SIZETEXT * conv_unit * 3;
text_size3.y = SIZETEXT * conv_unit * 3;
text_size1_5.x = SIZETEXT * conv_unit * 1.5;
text_size1_5.y = SIZETEXT * conv_unit * 1.5;
ref.x = PageSize.x - Sheet->m_RightMargin;
ref.y = PageSize.y - Sheet->m_BottomMargin;
@ -261,7 +272,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
case WS_PODPIS:
if( WsItem->m_Legende )
msg = WsItem->m_Legende;
plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size,
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
break;
@ -273,7 +285,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
if( WsItem->m_Legende )
msg = WsItem->m_Legende;
msg << screen->m_ScreenNumber;
plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size,
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
break;
@ -282,27 +295,82 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
if( WsItem->m_Legende )
msg = WsItem->m_Legende;
msg << screen->m_NumberOfScreen;
plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size,
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
break;
case WS_COMPANY_NAME:
msg = screen->m_Company;
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size1_5,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
}
break;
case WS_TITLE:
msg = screen->m_Title;
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size1_5,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
}
break;
case WS_COMMENT1:
msg = screen->m_Commentaire1;
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size3,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
pos.x = (Sheet->m_LeftMargin + 1260) * conv_unit;
pos.y = (Sheet->m_TopMargin + 270) * conv_unit;
plotter->text( pos, color,
msg.GetData(), 1800, text_size2,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
}
break;
case WS_COMMENT2:
msg = screen->m_Commentaire2;
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
}
break;
case WS_COMMENT3:
msg = screen->m_Commentaire3;
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
}
break;
case WS_COMMENT4:
msg = screen->m_Commentaire4;
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
}
break;
case WS_UPPER_SEGMENT:
@ -330,6 +398,22 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
{
case WS_CADRE:
/* Begin list number > 1 */
msg = screen->m_Commentaire1;
if( !msg.IsEmpty() )
{
plotter->text( pos, color,
msg.GetData(), TEXT_ORIENT_HORIZ, text_size3,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
pos.x = (Sheet->m_LeftMargin + 1260) * conv_unit;
pos.y = (Sheet->m_TopMargin + 270) * conv_unit;
plotter->text( pos, color,
msg.GetData(), 1800, text_size2,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
thickness, italic, false );
}
break;
case WS_PODPIS_D:
if( WsItem->m_Legende )
msg = WsItem->m_Legende;

135
common/worksheet.cpp
View File

@ -86,11 +86,13 @@ Ki_WorkSheetData WS_Title =
{
WS_TITLE,
&WS_SheetFilename,
BLOCK_TITLE_X, BLOCK_TITLE_Y,
0, 0,
#if defined(KICAD_GOST)
STAMP_X_85, STAMP_Y_25 + 90,
0, 0,
NULL, NULL
#else
BLOCK_TITLE_X, BLOCK_TITLE_Y,
0, 0,
wxT( "Title: " ), NULL
#endif
};
@ -117,8 +119,13 @@ Ki_WorkSheetData WS_Company =
{
WS_COMPANY_NAME,
&WS_Comment1,
#if defined(KICAD_GOST)
STAMP_X_50 / 2, STAMP_Y_0 + 270,
0, 0,
#else
BLOCK_COMMENT_X,BLOCK_COMPANY_Y,
0, 0,
#endif
NULL, NULL
};
@ -127,7 +134,7 @@ Ki_WorkSheetData WS_Comment1 =
WS_COMMENT1,
&WS_Comment2,
#if defined(KICAD_GOST)
STAMP_OX, STAMP_OY,
STAMP_X_120 / 2,STAMP_Y_40 + 270,
STAMP_OX, 0,
#else
BLOCK_COMMENT_X,BLOCK_COMMENT1_Y,
@ -141,7 +148,7 @@ Ki_WorkSheetData WS_Comment2 =
WS_COMMENT2,
&WS_Comment3,
#if defined(KICAD_GOST)
STAMP_OX, STAMP_OY,
STAMP_X_168 - 30, STAMP_Y_25 + 90,
STAMP_OX, 0,
#else
BLOCK_COMMENT_X,BLOCK_COMMENT2_Y,
@ -155,7 +162,7 @@ Ki_WorkSheetData WS_Comment3 =
WS_COMMENT3,
&WS_Comment4,
#if defined(KICAD_GOST)
STAMP_OX, STAMP_OY,
STAMP_X_168 - 30, STAMP_Y_20 + 90,
STAMP_OX, 0,
#else
BLOCK_COMMENT_X,BLOCK_COMMENT3_Y,
@ -169,7 +176,7 @@ Ki_WorkSheetData WS_Comment4 =
WS_COMMENT4,
&WS_MostLeftLine,
#if defined(KICAD_GOST)
STAMP_OX, STAMP_OY,
STAMP_X_168 - 30, STAMP_Y_0 + 90,
STAMP_OX, 0,
#else
BLOCK_COMMENT_X, BLOCK_COMMENT4_Y,
@ -584,7 +591,7 @@ Ki_WorkSheetData WS_CADRE_D =
{
WS_CADRE,
&WS_Segm1_D,
STAMP_OX, 0,
STAMP_X_65, STAMP_Y_0 + 270,
0, 0,
NULL, NULL
};
@ -935,6 +942,11 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen,
Ki_WorkSheetData* WsItem;
int scale = m_InternalUnits / 1000;
wxSize size( SIZETEXT * scale, SIZETEXT * scale );
#if defined(KICAD_GOST)
wxSize size2( SIZETEXT * scale * 2, SIZETEXT * scale * 2);
wxSize size3( SIZETEXT * scale * 3, SIZETEXT * scale * 3);
wxSize size1_5( SIZETEXT * scale * 1.5, SIZETEXT * scale * 1.5);
#endif
wxSize size_ref( SIZETEXT_REF * scale, SIZETEXT_REF * scale );
wxString msg;
@ -1152,21 +1164,79 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen,
break;
case WS_COMPANY_NAME:
msg = screen->m_Company;
if( !msg.IsEmpty() )
{
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size1_5,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
width,
false, false );
}
break;
case WS_TITLE:
msg = screen->m_Title;
if( !msg.IsEmpty() )
{
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size1_5,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
width,
false, false );
}
break;
case WS_COMMENT1:
msg = screen->m_Commentaire1;
if( !msg.IsEmpty() )
{
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size3,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
width,
false, false );
pos.x = (Sheet->m_LeftMargin + 1260) * scale;
pos.y = (Sheet->m_TopMargin + 270) * scale;
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, 1800, size2,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
width,
false, false );
}
break;
case WS_COMMENT2:
msg = screen->m_Commentaire2;
if( !msg.IsEmpty() )
{
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
width, false, false );
}
break;
case WS_COMMENT3:
msg = screen->m_Commentaire3;
if( !msg.IsEmpty() )
{
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
width, false, false );
}
break;
case WS_COMMENT4:
msg = screen->m_Commentaire4;
if( !msg.IsEmpty() )
{
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
width, false, false );
}
break;
case WS_UPPER_SEGMENT:
@ -1197,41 +1267,42 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen,
{
case WS_CADRE:
/* Begin list number > 1 */
msg = screen->m_Commentaire1;
if( !msg.IsEmpty() )
{
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size3,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
width,
false, false );
pos.x = (Sheet->m_LeftMargin + 1260) * scale;
pos.y = (Sheet->m_TopMargin + 270) * scale;
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, 1800, size2,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
width,
false, false );
}
break;
case WS_PODPIS_D:
if( WsItem->m_Legende )
msg = WsItem->m_Legende;
DrawGraphicText( DrawPanel,
DC,
pos,
Color,
msg,
TEXT_ORIENT_HORIZ,
size,
GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER,
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
width,
false,
false,
false );
false, false, false );
break;
case WS_IDENTSHEET_D:
if( WsItem->m_Legende )
msg = WsItem->m_Legende;
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,
false );
DrawGraphicText( DrawPanel, DC, pos, Color,
msg, TEXT_ORIENT_HORIZ, size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
width, false, false, false );
break;
case WS_LEFT_SEGMENT_D:

2
common/zoom.cpp
View File

@ -159,7 +159,7 @@ void WinEDA_DrawFrame::OnZoom( wxCommandEvent& event )
if( ( i < 0 ) || ( (size_t) i >= screen->m_ZoomList.GetCount() ) )
{
wxLogDebug( _T( "%s %d: index %d is outside the bounds of the zoom list." ),
wxLogDebug( wxT( "%s %d: index %d is outside the bounds of the zoom list." ),
__TFILE__, __LINE__, i );
return;
}

4
eeschema/pinedit.cpp
View File

@ -299,7 +299,7 @@ static void DrawMovePin( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
/* Erase pin in old position */
if( erase || CurrentPin->IsNew() )
{
wxLogDebug( _( "Initial pin position (%d, %d)" ),
wxLogDebug( wxT( "Initial pin position (%d, %d)" ),
PinPreviousPos.x, PinPreviousPos.y );
CurrentPin->m_Pos = PinPreviousPos;
CurrentPin->Draw( panel, DC, wxPoint( 0, 0 ), -1, g_XorMode,
@ -417,7 +417,7 @@ void WinEDA_LibeditFrame::CreatePin( wxDC* DC )
DefaultTransformMatrix );
PinPreviousPos = pin->m_Pos;
wxLogDebug( _( "Initial pin position (%d, %d)" ),
wxLogDebug( wxT( "Initial pin position (%d, %d)" ),
PinPreviousPos.x, PinPreviousPos.y );
DrawPanel->m_IgnoreMouseEvents = true;
wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED );

2
include/worksheet.h
View File

@ -43,8 +43,10 @@
#define STAMP_X_45 45 * 10000 / 254
#define STAMP_X_50 50 * 10000 / 254
#define STAMP_X_53 53 * 10000 / 254
#define STAMP_X_65 65 * 10000 / 254
#define STAMP_X_70 70 * 10000 / 254
#define STAMP_X_84 84 * 10000 / 254
#define STAMP_X_85 85 * 10000 / 254
#define STAMP_X_120 120 * 10000 / 254
#define STAMP_X_130 130 * 10000 / 254
#define STAMP_X_137 137 * 10000 / 254

BIN
internat/ru/kicad.mo
View File

Binary file not shown.

46
internat/ru/kicad.po
View File

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: KiCAD\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-11-26 21:07+0300\n"
"PO-Revision-Date: 2009-12-02 08:19+0300\n"
"PO-Revision-Date: 2009-12-02 16:03+0300\n"
"Last-Translator: faa <faa@ntcsm.ru>\n"
"Language-Team: KiCAD russian team <andrf@mail.ru>\n"
"MIME-Version: 1.0\n"
@ -1095,11 +1095,6 @@ msgstr ""
msgid "Read Project File"
msgstr "Читать файл проекта"
#: eeschema/eeschema_config.cpp:111
#, c-format
msgid "Current grid array index %d."
msgstr "Текущий индекс сетки %d."
#: eeschema/eeschema_config.cpp:326
msgid "Save Project Settings"
msgstr "Сохранить настройки проекта"
@ -1441,12 +1436,6 @@ msgstr "Была сделана попытка удалить поле %s у к
msgid "This position is already occupied by another pin. Continue?"
msgstr "Позиция занята другим выводом. Продолжить?"
#: eeschema/pinedit.cpp:302
#: eeschema/pinedit.cpp:420
#, c-format
msgid "Initial pin position (%d, %d)"
msgstr "Начальная позиция вывода (%d, %d)"
#: eeschema/pinedit.cpp:626
msgid "No pins!"
msgstr "Нет выводов!"
@ -5459,7 +5448,7 @@ msgstr "Просмотр выбранного посад.места"
#: cvpcb/tool_cvpcb.cpp:49
msgid "Perform automatic footprint association"
msgstr "Perform automatic footprint association"
msgstr "Выполнить автоматический выбор посадочных мест"
#: cvpcb/tool_cvpcb.cpp:54
msgid "Select previous free component"
@ -7168,11 +7157,6 @@ msgstr "Сдвинуть вниз"
msgid "3D Image filename:"
msgstr "Имя файла 3D изображения:"
#: 3d-viewer/3d_read_mesh.cpp:43
#, c-format
msgid "3D part library <%s> could not be found."
msgstr "3D библиотека <%s> не найдена."
#: 3d-viewer/3d_aux.cpp:195
msgid "Vertex "
msgstr "Узел "
@ -10225,11 +10209,11 @@ msgstr "Ввод значения зазора в единицах (mils или
#: pcbnew/dialog_drc_base.cpp:54
msgid "Min via size"
msgstr "Минимальный размер переходного отверстия"
msgstr "Мин. размер переходного отверстия"
#: pcbnew/dialog_drc_base.cpp:63
msgid "Min uVia size"
msgstr "Минимальный размер микропереходного отверстия"
msgstr "Мин. размер микропереходного отверстия"
#: pcbnew/dialog_drc_base.cpp:75
msgid "Create Report File"
@ -10397,12 +10381,12 @@ msgstr "Печать выбранного"
msgid "Print Board"
msgstr "Печать платы"
#: pcbnew/hotkeys.cpp:480
#: pcbnew/hotkeys.cpp:544
#, c-format
msgid "Footprint %s found, but locked"
msgstr "Посадочное место %s найдено, не заблокировано"
#: pcbnew/hotkeys.cpp:647
#: pcbnew/hotkeys.cpp:726
msgid "Delete module?"
msgstr "Удалить модуль?"
@ -10582,7 +10566,7 @@ msgstr "Считать список цепей"
#: pcbnew/tool_pcb.cpp:270
msgid "Perform design rules check"
msgstr "Perform design rules check"
msgstr "Выполнить проверку правил проекттрования"
#: pcbnew/tool_pcb.cpp:283
msgid "Manual and automatic move or place of modules"
@ -12358,11 +12342,11 @@ msgstr ""
#: pcbnew/dialog_design_rules_base.cpp:180
msgid "Min via diameter"
msgstr "Минимальный диаметр переходного отверстия"
msgstr "Мин. диаметр переходного отверстия"
#: pcbnew/dialog_design_rules_base.cpp:187
msgid "Min via drill dia"
msgstr "Минимальный диаметр сверла переходного отверстия"
msgstr "Мин. диаметр сверла переходного отверстия"
#: pcbnew/dialog_design_rules_base.cpp:199
msgid "Micro Via Options:"
@ -12386,11 +12370,11 @@ msgstr ""
#: pcbnew/dialog_design_rules_base.cpp:215
msgid "Min uvia diameter"
msgstr "Минимальный диаметр микропереходного отверстия"
msgstr "Мин. диаметр микропереходного отверстия"
#: pcbnew/dialog_design_rules_base.cpp:223
msgid "Min uvia drill dia"
msgstr "Минимальное сверло микропереходного отверстия"
msgstr "Мин. сверло микропереходного отверстия"
#: pcbnew/dialog_design_rules_base.cpp:236
msgid "Minimum Allowed Values:"
@ -12403,12 +12387,12 @@ msgid ""
"on demand, for arbitrary via or track segments."
msgstr ""
"Особые диаметры переходных отверстий и ширины дорожек, которые \n"
"могут использоваться для замены значений класса цепи \n"
"при необходимости для произвольных переходных отверстий и сегментов дорожек."
"при необходимости могут использоваться для замены значений класса цепи \n"
"для произвольных переходных отверстий и сегментов дорожек."
#: pcbnew/dialog_design_rules_base.cpp:268
msgid "Custom Via Sizes:"
msgstr "Заказанные переходные отверстия:"
msgstr "Особые переходные отверстия:"
#: pcbnew/dialog_design_rules_base.cpp:270
msgid "Drill value: a blank or 0 => default Netclass value"
@ -12448,7 +12432,7 @@ msgstr "Via 7"
#: pcbnew/dialog_design_rules_base.cpp:312
msgid "Custom Track Widths:"
msgstr "Заказанные дорожки:"
msgstr "Особые дорожки:"
#: pcbnew/dialog_design_rules_base.cpp:337
msgid "Track 1"