minor changes
This commit is contained in:
parent
374f9f5dc6
commit
a72ddb3804
|
@ -273,7 +273,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( WsItem->m_Legende )
|
if( WsItem->m_Legende )
|
||||||
msg = WsItem->m_Legende;
|
msg = WsItem->m_Legende;
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
|
msg, TEXT_ORIENT_HORIZ, text_size,
|
||||||
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
break;
|
break;
|
||||||
|
@ -286,7 +286,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
msg = WsItem->m_Legende;
|
msg = WsItem->m_Legende;
|
||||||
msg << screen->m_ScreenNumber;
|
msg << screen->m_ScreenNumber;
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
|
msg, TEXT_ORIENT_HORIZ, text_size,
|
||||||
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
break;
|
break;
|
||||||
|
@ -296,7 +296,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
msg = WsItem->m_Legende;
|
msg = WsItem->m_Legende;
|
||||||
msg << screen->m_NumberOfScreen;
|
msg << screen->m_NumberOfScreen;
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
|
msg, TEXT_ORIENT_HORIZ, text_size,
|
||||||
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
break;
|
break;
|
||||||
|
@ -306,7 +306,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size1_5,
|
msg, TEXT_ORIENT_HORIZ, text_size1_5,
|
||||||
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
}
|
}
|
||||||
|
@ -317,7 +317,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size1_5,
|
msg, TEXT_ORIENT_HORIZ, text_size1_5,
|
||||||
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
}
|
}
|
||||||
|
@ -328,7 +328,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size3,
|
msg, TEXT_ORIENT_HORIZ, text_size3,
|
||||||
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
pos.x = (Sheet->m_LeftMargin + 1260) * conv_unit;
|
pos.x = (Sheet->m_LeftMargin + 1260) * conv_unit;
|
||||||
|
@ -345,7 +345,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
|
msg, TEXT_ORIENT_HORIZ, text_size,
|
||||||
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
}
|
}
|
||||||
|
@ -356,7 +356,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
|
msg, TEXT_ORIENT_HORIZ, text_size,
|
||||||
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
}
|
}
|
||||||
|
@ -367,7 +367,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
|
msg, TEXT_ORIENT_HORIZ, text_size,
|
||||||
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
}
|
}
|
||||||
|
@ -402,13 +402,13 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size3,
|
msg, TEXT_ORIENT_HORIZ, text_size3,
|
||||||
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
pos.x = (Sheet->m_LeftMargin + 1260) * conv_unit;
|
pos.x = (Sheet->m_LeftMargin + 1260) * conv_unit;
|
||||||
pos.y = (Sheet->m_TopMargin + 270) * conv_unit;
|
pos.y = (Sheet->m_TopMargin + 270) * conv_unit;
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), 1800, text_size2,
|
msg, 1800, text_size2,
|
||||||
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, false );
|
thickness, italic, false );
|
||||||
}
|
}
|
||||||
|
@ -556,7 +556,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
|
||||||
if( !msg.IsEmpty() )
|
if( !msg.IsEmpty() )
|
||||||
{
|
{
|
||||||
plotter->text( pos, color,
|
plotter->text( pos, color,
|
||||||
msg.GetData(), TEXT_ORIENT_HORIZ, text_size,
|
msg, TEXT_ORIENT_HORIZ, text_size,
|
||||||
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER,
|
||||||
thickness, italic, bold );
|
thickness, italic, bold );
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
1818
internat/fr/kicad.po
1818
internat/fr/kicad.po
File diff suppressed because it is too large
Load Diff
|
@ -641,6 +641,8 @@ void DIALOG_DESIGN_RULES::OnOkButtonClick( wxCommandEvent& event )
|
||||||
|
|
||||||
EndModal( wxID_OK );
|
EndModal( wxID_OK );
|
||||||
|
|
||||||
|
m_Pcb->SetCurrentNetClass( NETCLASS::Default );
|
||||||
|
m_Parent->m_TrackAndViasSizesList_Changed = true;
|
||||||
m_Parent->AuxiliaryToolBar_Update_UI();
|
m_Parent->AuxiliaryToolBar_Update_UI();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -265,6 +265,12 @@ this file again."));
|
||||||
*/
|
*/
|
||||||
GetBoard()->SetVisibleLayers( GetBoard()->GetEnabledLayers() );
|
GetBoard()->SetVisibleLayers( GetBoard()->GetEnabledLayers() );
|
||||||
|
|
||||||
|
// Update info shown by the horizontal toolbars
|
||||||
|
GetBoard()->SetCurrentNetClass( NETCLASS::Default );
|
||||||
|
m_TrackAndViasSizesList_Changed = true;
|
||||||
|
ReCreateLayerBox( NULL );
|
||||||
|
AuxiliaryToolBar_Update_UI();
|
||||||
|
|
||||||
// Display the loaded board:
|
// Display the loaded board:
|
||||||
DrawPanel->Refresh( true);
|
DrawPanel->Refresh( true);
|
||||||
wxSafeYield(); // Needed if we want to see the board now.
|
wxSafeYield(); // Needed if we want to see the board now.
|
||||||
|
|
|
@ -597,9 +597,10 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
|
||||||
/* edge in progress : the current corner coordinate was set by Show_New_Edge_While_Move_Mouse */
|
/* edge in progress : the current corner coordinate was set by Show_New_Edge_While_Move_Mouse */
|
||||||
if( zone->GetCornerPosition( ii - 1 ) != zone->GetCornerPosition( ii ) )
|
if( zone->GetCornerPosition( ii - 1 ) != zone->GetCornerPosition( ii ) )
|
||||||
{
|
{
|
||||||
if( (Drc_On && m_drc->Drc( zone, ii - 1 ) == OK_DRC)
|
if( !Drc_On || !zone->IsOnCopperLayer()
|
||||||
|| !Drc_On || !zone->IsOnCopperLayer() ) // Ok, we can add a new corner
|
|| ( m_drc->Drc( zone, ii - 1 ) == OK_DRC )
|
||||||
{
|
)
|
||||||
|
{ // Ok, we can add a new corner
|
||||||
zone->AppendCorner( GetScreen()->m_Curseur );
|
zone->AppendCorner( GetScreen()->m_Curseur );
|
||||||
SetCurItem( zone ); // calls DisplayInfo().
|
SetCurItem( zone ); // calls DisplayInfo().
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue