From a4cec097819a3f00bbeed13f1c59855b66966c0c Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 22 May 2013 10:45:25 +0200 Subject: [PATCH] Worksheet code: cleanup and remove useless parameters. --- common/common_plot_functions.cpp | 9 +- common/dialogs/dialog_page_settings.cpp | 21 +- common/title_block_shapes.h | 140 +- common/title_block_shapes_gost.h | 212 +- common/worksheet.cpp | 160 +- common/worksheet_shape_builder.h | 427 +- eeschema/dialogs/dialog_eeschema_config.cpp | 6 +- eeschema/dialogs/dialog_eeschema_options.cpp | 10 + eeschema/dialogs/dialog_eeschema_options.h | 2 + .../dialogs/dialog_eeschema_options_base.cpp | 658 +- .../dialogs/dialog_eeschema_options_base.fbp | 10013 ++++++++-------- .../dialogs/dialog_eeschema_options_base.h | 260 +- .../dialogs/dialog_print_using_printer.cpp | 2 +- eeschema/eeredraw.cpp | 2 +- eeschema/eeschema_config.cpp | 4 + eeschema/schframe.cpp | 4 +- gerbview/draw_gerber_screen.cpp | 4 +- include/worksheet.h | 41 +- include/wxstruct.h | 32 +- pcbnew/printout_controler.cpp | 2 +- pcbnew/tracepcb.cpp | 4 +- 21 files changed, 6282 insertions(+), 5731 deletions(-) diff --git a/common/common_plot_functions.cpp b/common/common_plot_functions.cpp index a4a4835cd0..e957191026 100644 --- a/common/common_plot_functions.cpp +++ b/common/common_plot_functions.cpp @@ -66,11 +66,16 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock, plotter->SetCurrentLineWidth( PLOTTER::DEFAULT_LINE_WIDTH ); WS_DRAW_ITEM_LIST drawList; - drawList.BuildWorkSheetGraphicList( pageSize, LTmargin, RBmargin, + // Initialize plot parameters + drawList.SetMargins( LTmargin, RBmargin); + drawList.SetPenSize(PLOTTER::DEFAULT_LINE_WIDTH ); + drawList.SetMilsToIUfactor( iusPerMil ); + drawList.SetPageSize( pageSize ); + + drawList.BuildWorkSheetGraphicList( aPageInfo.GetType(), aFilename, aSheetDesc, aTitleBlock, aNumberOfSheets, aSheetNumber, - PLOTTER::DEFAULT_LINE_WIDTH, iusPerMil, plotColor, plotColor ); // Draw item list diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp index dc1f93da08..3e4279c86d 100644 --- a/common/dialogs/dialog_page_settings.cpp +++ b/common/dialogs/dialog_page_settings.cpp @@ -43,6 +43,7 @@ #include #endif +#include #include @@ -577,10 +578,6 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample() if( m_page_bitmap->IsOk() ) { - // Save current clip box and temporary expand it. - EDA_RECT save_clip_box = *m_Parent->GetCanvas()->GetClipBox(); - m_Parent->GetCanvas()->SetClipBox( EDA_RECT( wxPoint( 0, 0 ), - wxSize( INT_MAX / 2, INT_MAX / 2 ) ) ); // Calculate layout preview scale. int appScale = m_Screen->MilsToIuScalar(); @@ -601,10 +598,6 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample() pageDUMMY.SetWidthMils( clamped_layout_size.x ); pageDUMMY.SetHeightMils( clamped_layout_size.y ); - wxSize dummySize = pageDUMMY.GetSizeMils(); - wxPoint pointLeftTop( pageDUMMY.GetLeftMarginMils(), pageDUMMY.GetTopMarginMils() ); - wxPoint pointRightBottom( pageDUMMY.GetRightMarginMils(), pageDUMMY.GetBottomMarginMils() ); - // Get page type int idx = m_paperSizeComboBox->GetSelection(); @@ -615,18 +608,16 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample() // Draw layout preview. wxString emptyString; - GRResetPenAndBrush( ( wxDC* ) &memDC ); + GRResetPenAndBrush( &memDC ); - m_Parent->TraceWorkSheet( (wxDC*) &memDC, dummySize, pointLeftTop, pointRightBottom, - paperType, emptyString, m_tb, m_Screen->m_NumberOfScreens, - m_Screen->m_ScreenNumber, 1, appScale, LIGHTGRAY, RED ); + DrawPageLayout( &memDC, NULL, pageDUMMY, + paperType, emptyString, emptyString, + m_tb, m_Screen->m_NumberOfScreens, + m_Screen->m_ScreenNumber, 1, appScale, DARKGRAY, RED ); memDC.SelectObject( wxNullBitmap ); m_PageLayoutExampleBitmap->SetBitmap( *m_page_bitmap ); - // Restore current clip box. - m_Parent->GetCanvas()->SetClipBox( save_clip_box ); - // Refresh the dialog. Layout(); Refresh(); diff --git a/common/title_block_shapes.h b/common/title_block_shapes.h index 3ad43428f3..5f7817b446 100644 --- a/common/title_block_shapes.h +++ b/common/title_block_shapes.h @@ -317,14 +317,12 @@ Ki_WorkSheetData WS_Segm7 = #include -void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, - wxPoint& aLTmargin, wxPoint& aRBmargin, +void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( const wxString& aPaperFormat, const wxString& aFileName, const wxString& aSheetPathHumanReadable, const TITLE_BLOCK& aTitleBlock, int aSheetCount, int aSheetNumber, - int aPenWidth, double aScalar, EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ) { wxPoint pos; @@ -332,18 +330,18 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, int refx, refy; wxString Line; Ki_WorkSheetData* WsItem; - wxSize size( SIZETEXT * aScalar, SIZETEXT * aScalar ); - wxSize size_ref( SIZETEXT_REF * aScalar, SIZETEXT_REF * aScalar ); + wxSize size( SIZETEXT * m_milsToIu, SIZETEXT * m_milsToIu ); + wxSize size_ref( SIZETEXT_REF * m_milsToIu, SIZETEXT_REF * m_milsToIu ); wxString msg; // Upper left corner - refx = aLTmargin.x; - refy = aLTmargin.y; + refx = m_LTmargin.x; + refy = m_LTmargin.y; // lower right corner - int xg, yg; - xg = aPageSize.x - aRBmargin.x; - yg = aPageSize.y - aRBmargin.y; + wxPoint currpos; + currpos.x = m_pageSize.x - m_RBmargin.x; + currpos.y = m_pageSize.y - m_RBmargin.y; // Draw the border. int ii, jj, ipas, gxpas, gypas; @@ -351,58 +349,60 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, for( ii = 0; ii < 2; ii++ ) { Append( new WS_DRAW_ITEM_RECT( - wxPoint( refx * aScalar, refy * aScalar ), - wxPoint( xg * aScalar, yg * aScalar ), - aPenWidth, aLineColor ) ); + wxPoint( refx * m_milsToIu, refy * m_milsToIu ), + wxPoint( currpos.x * m_milsToIu, currpos.y * m_milsToIu ), + m_penSize, aLineColor ) ); - refx += GRID_REF_W; refy += GRID_REF_W; - xg -= GRID_REF_W; yg -= GRID_REF_W; + refx += GRID_REF_W; + refy += GRID_REF_W; + currpos.x -= GRID_REF_W; + currpos.y -= GRID_REF_W; } // Upper left corner - refx = aLTmargin.x; - refy = aLTmargin.y; + refx = m_LTmargin.x; + refy = m_LTmargin.y; // lower right corner - xg = aPageSize.x - aRBmargin.x; - yg = aPageSize.y - aRBmargin.y; + currpos.x = m_pageSize.x - m_RBmargin.x; + currpos.y = m_pageSize.y - m_RBmargin.y; - ipas = ( xg - refx ) / PAS_REF; - gxpas = ( xg - refx ) / ipas; + ipas = ( currpos.x - refx ) / PAS_REF; + gxpas = ( currpos.x - refx ) / ipas; for( ii = refx + gxpas, jj = 1; ipas > 0; ii += gxpas, jj++, ipas-- ) { Line.Printf( wxT( "%d" ), jj ); - if( ii < xg - PAS_REF / 2 ) + if( ii < currpos.x - PAS_REF / 2 ) { Append( new WS_DRAW_ITEM_LINE( - wxPoint( ii * aScalar, refy * aScalar ), - wxPoint( ii * aScalar, ( refy + GRID_REF_W ) * aScalar ), - aPenWidth, aLineColor ) ); + wxPoint( ii * m_milsToIu, refy * m_milsToIu ), + wxPoint( ii * m_milsToIu, ( refy + GRID_REF_W ) * m_milsToIu ), + m_penSize, aLineColor ) ); } Append( new WS_DRAW_ITEM_TEXT( Line, - wxPoint( ( ii - gxpas / 2 ) * aScalar, - ( refy + GRID_REF_W / 2 ) * aScalar ), - size_ref, aPenWidth, aLineColor ) ); + wxPoint( ( ii - gxpas / 2 ) * m_milsToIu, + ( refy + GRID_REF_W / 2 ) * m_milsToIu ), + size_ref, m_penSize, aLineColor ) ); - if( ii < xg - PAS_REF / 2 ) + if( ii < currpos.x - PAS_REF / 2 ) { Append( new WS_DRAW_ITEM_LINE( - wxPoint( ii * aScalar, yg * aScalar ), - wxPoint( ii * aScalar, (yg - GRID_REF_W ) * aScalar ), - aPenWidth, aLineColor ) ); + wxPoint( ii * m_milsToIu, currpos.y * m_milsToIu ), + wxPoint( ii * m_milsToIu, (currpos.y - GRID_REF_W ) * m_milsToIu ), + m_penSize, aLineColor ) ); } Append( new WS_DRAW_ITEM_TEXT( Line, - wxPoint( ( ii - gxpas / 2 ) * aScalar, - ( yg - GRID_REF_W / 2) * aScalar ), - size_ref, aPenWidth, aLineColor ) ); + wxPoint( ( ii - gxpas / 2 ) * m_milsToIu, + ( currpos.y - GRID_REF_W / 2) * m_milsToIu ), + size_ref, m_penSize, aLineColor ) ); } - ipas = ( yg - refy ) / PAS_REF; - gypas = ( yg - refy ) / ipas; + ipas = ( currpos.y - refy ) / PAS_REF; + gypas = ( currpos.y - refy ) / ipas; for( ii = refy + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- ) { @@ -411,43 +411,43 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, else // I hope 52 identifiers are enough... Line.Printf( wxT( "%c" ), 'a' + jj - 26 ); - if( ii < yg - PAS_REF / 2 ) + if( ii < currpos.y - PAS_REF / 2 ) { Append( new WS_DRAW_ITEM_LINE( - wxPoint( refx * aScalar, ii * aScalar ), - wxPoint( ( refx + GRID_REF_W ) * aScalar, ii * aScalar ), - aPenWidth, aLineColor ) ); + wxPoint( refx * m_milsToIu, ii * m_milsToIu ), + wxPoint( ( refx + GRID_REF_W ) * m_milsToIu, ii * m_milsToIu ), + m_penSize, aLineColor ) ); } Append( new WS_DRAW_ITEM_TEXT( Line, - wxPoint( ( refx + GRID_REF_W / 2 ) * aScalar, - ( ii - gypas / 2 ) * aScalar ), - size_ref, aPenWidth, aLineColor ) ); + wxPoint( ( refx + GRID_REF_W / 2 ) * m_milsToIu, + ( ii - gypas / 2 ) * m_milsToIu ), + size_ref, m_penSize, aLineColor ) ); - if( ii < yg - PAS_REF / 2 ) + if( ii < currpos.y - PAS_REF / 2 ) { Append( new WS_DRAW_ITEM_LINE( - wxPoint( xg * aScalar, ii * aScalar ), - wxPoint( ( xg - GRID_REF_W ) * aScalar, ii * aScalar ), - aPenWidth, aLineColor ) ); + wxPoint( currpos.x * m_milsToIu, ii * m_milsToIu ), + wxPoint( ( currpos.x - GRID_REF_W ) * m_milsToIu, ii * m_milsToIu ), + m_penSize, aLineColor ) ); } Append( new WS_DRAW_ITEM_TEXT( Line, - wxPoint( ( xg - GRID_REF_W / 2 ) * aScalar, - ( ii - gxpas / 2 ) * aScalar ), - size_ref, aPenWidth, aLineColor ) ); + wxPoint( ( currpos.x - GRID_REF_W / 2 ) * m_milsToIu, + ( ii - gxpas / 2 ) * m_milsToIu ), + size_ref, m_penSize, aLineColor ) ); } int UpperLimit = VARIABLE_BLOCK_START_POSITION; - refx = aPageSize.x - aRBmargin.x - GRID_REF_W; - refy = aPageSize.y - aRBmargin.y - GRID_REF_W; + refx = m_pageSize.x - m_RBmargin.x - GRID_REF_W; + refy = m_pageSize.y - m_RBmargin.y - GRID_REF_W; WS_DRAW_ITEM_TEXT* gtext; for( WsItem = &WS_Date; WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = (refx - WsItem->m_Posx) * aScalar; - pos.y = (refy - WsItem->m_Posy) * aScalar; + pos.x = (refx - WsItem->m_Posx) * m_milsToIu; + pos.y = (refy - WsItem->m_Posy) * m_milsToIu; msg.Empty(); switch( WsItem->m_Type ) @@ -459,7 +459,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, msg += aTitleBlock.GetDate(); Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor, false, + size, m_penSize, aLineColor, false, true ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); break; @@ -495,7 +495,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, msg += g_ProductName + wxGetApp().GetAppName(); msg += wxT( " " ) + GetBuildVersion(); Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aLineColor ) ); + m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); break; @@ -506,7 +506,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, msg += aPaperFormat; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aLineColor ) ); + m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); break; @@ -518,7 +518,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, msg << aSheetNumber << wxT( "/" ) << aSheetCount; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aLineColor ) ); + m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); break; @@ -531,7 +531,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, msg << fn.GetFullName(); Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aLineColor ) ); + m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); } break; @@ -543,7 +543,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, msg += aSheetPathHumanReadable; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aLineColor ) ); + m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); break; @@ -602,7 +602,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aTextColor ) ); + m_penSize, aTextColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); UpperLimit = std::max( UpperLimit, WsItem->m_Posy + SIZETEXT ); } @@ -619,7 +619,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aTextColor ) ); + m_penSize, aTextColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); UpperLimit = std::max( UpperLimit, WsItem->m_Posy + SIZETEXT ); } @@ -636,7 +636,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aTextColor ) ); + m_penSize, aTextColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); UpperLimit = std::max( UpperLimit, WsItem->m_Posy + SIZETEXT ); } @@ -653,7 +653,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, size, - aPenWidth, aTextColor ) ); + m_penSize, aTextColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); UpperLimit = std::max( UpperLimit, WsItem->m_Posy + SIZETEXT ); } @@ -669,14 +669,14 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, WS_MostUpperLine.m_Posy = WS_MostUpperLine.m_Endy = WS_MostLeftLine.m_Posy = UpperLimit; - pos.y = (refy - WsItem->m_Posy) * aScalar; + pos.y = (refy - WsItem->m_Posy) * m_milsToIu; case WS_SEGMENT: - xg = aPageSize.x - GRID_REF_W - aRBmargin.x - WsItem->m_Endx; - yg = aPageSize.y - GRID_REF_W - aRBmargin.y - WsItem->m_Endy; + currpos.x = m_pageSize.x - GRID_REF_W - m_RBmargin.x - WsItem->m_Endx; + currpos.y = m_pageSize.y - GRID_REF_W - m_RBmargin.y - WsItem->m_Endy; Append( new WS_DRAW_ITEM_LINE( pos, - wxPoint( xg * aScalar, yg * aScalar ), - aPenWidth, aLineColor ) ); + wxPoint( currpos.x * m_milsToIu, currpos.y * m_milsToIu ), + m_penSize, aLineColor ) ); break; } } diff --git a/common/title_block_shapes_gost.h b/common/title_block_shapes_gost.h index b15aa4f3e0..e020b2ea7b 100644 --- a/common/title_block_shapes_gost.h +++ b/common/title_block_shapes_gost.h @@ -963,14 +963,12 @@ Ki_WorkSheetData WS_DopTop_Line6 = #include -void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, - wxPoint& aLTmargin, wxPoint& aRBmargin, +void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( const wxString& aPaperFormat, const wxString& aFileName, const wxString& aSheetPathHumanReadable, const TITLE_BLOCK& aTitleBlock, int aSheetCount, int aSheetNumber, - int aPenWidth, double aScalar, EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ) { wxPoint pos; @@ -978,48 +976,48 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, int refx, refy; wxString Line; Ki_WorkSheetData* WsItem; - wxSize size( SIZETEXT * aScalar, SIZETEXT * aScalar ); - wxSize size_ref( SIZETEXT_REF * aScalar, SIZETEXT_REF * aScalar ); + wxSize size( SIZETEXT * m_milsToIu, SIZETEXT * m_milsToIu ); + wxSize size_ref( SIZETEXT_REF * m_milsToIu, SIZETEXT_REF * m_milsToIu ); wxString msg; WS_DRAW_ITEM_TEXT* gtext; // Upper left corner - refx = aLTmargin.x; - refy = aLTmargin.y; + refx = m_LTmargin.x; + refy = m_LTmargin.y; // lower right corner int xg, yg; - xg = aPageSize.x - aRBmargin.x; - yg = aPageSize.y - aRBmargin.y; + xg = m_pageSize.x - m_RBmargin.x; + yg = m_pageSize.y - m_RBmargin.y; int lnMsg, ln; - int lnWosn = aPenWidth * 2; - int lnWtonk = aPenWidth; + int lnWosn = m_penSize * 2; + int lnWtonk = m_penSize; wxSize sz; - wxSize size0_8( SIZETEXT * aScalar * 0.8, SIZETEXT * aScalar * 1 ); - wxSize size1_5( SIZETEXT * aScalar * 1.5, SIZETEXT * aScalar * 1.5 ); - wxSize size2( SIZETEXT * aScalar * 2, SIZETEXT * aScalar * 2 ); - wxSize size3( SIZETEXT * aScalar * 3, SIZETEXT * aScalar * 3 ); + wxSize size0_8( SIZETEXT * m_milsToIu * 0.8, SIZETEXT * m_milsToIu * 1 ); + wxSize size1_5( SIZETEXT * m_milsToIu * 1.5, SIZETEXT * m_milsToIu * 1.5 ); + wxSize size2( SIZETEXT * m_milsToIu * 2, SIZETEXT * m_milsToIu * 2 ); + wxSize size3( SIZETEXT * m_milsToIu * 3, SIZETEXT * m_milsToIu * 3 ); // Draw the border. Append( new WS_DRAW_ITEM_RECT( - wxPoint( refx * aScalar, refy * aScalar ), - wxPoint( xg * aScalar, yg * aScalar ), + wxPoint( refx * m_milsToIu, refy * m_milsToIu ), + wxPoint( xg * m_milsToIu, yg * m_milsToIu ), lnWosn, aLineColor ) ); // Center - right bottom corner - refx = aPageSize.x - aRBmargin.x; - refy = aPageSize.y - aRBmargin.y; + refx = m_pageSize.x - m_RBmargin.x; + refy = m_pageSize.y - m_RBmargin.y; // First page if( aSheetNumber == 1 ) { for( WsItem = &WS_Osn1_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = (refx - WsItem->m_Posx) * aScalar; - pos.y = (refy - WsItem->m_Posy) * aScalar; - end.x = (refx - WsItem->m_Endx) * aScalar; - end.y = (refy - WsItem->m_Endy) * aScalar; + pos.x = (refx - WsItem->m_Posx) * m_milsToIu; + pos.y = (refy - WsItem->m_Posy) * m_milsToIu; + end.x = (refx - WsItem->m_Endx) * m_milsToIu; + end.y = (refy - WsItem->m_Endy) * m_milsToIu; msg = WsItem->m_Legende; switch( WsItem->m_Type ) @@ -1040,11 +1038,11 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, { if( WsItem == &WS_Osn1_Text1 ) Append( new WS_DRAW_ITEM_TEXT( msg, pos, - size0_8, aPenWidth, + size0_8, m_penSize, aLineColor ) ); else Append( new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); } break; @@ -1054,7 +1052,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); } @@ -1065,21 +1063,21 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, // Sheet number if( aSheetCount > 1 ) { - pos.x = ( refx - Mm2mils( 36 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 17.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 36 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 17.5 ) ) * m_milsToIu; msg.Empty(); msg << aSheetNumber; Append( new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); } // Count of sheets - pos.x = ( refx - Mm2mils( 10 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 17.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 10 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 17.5 ) ) * m_milsToIu; msg.Empty(); msg << aSheetCount; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); // Company name @@ -1088,16 +1086,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size1_5; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 49 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx - Mm2mils( 25 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 7.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 25 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 7.5 ) ) * m_milsToIu; Append( new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aLineColor ) ); + sz, m_penSize, aLineColor ) ); } // Title @@ -1108,7 +1106,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, sz = size1_5; wxArrayString lines; int titleWidth = 0; - int titleHeight = (sz.y + sz.y * 0.5) / aScalar; + int titleHeight = (sz.y + sz.y * 0.5) / m_milsToIu; int titleFieldWidth = Mm2mils( 69 ); int titleFieldHeight = Mm2mils( 24 ); int index = 0; @@ -1118,7 +1116,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, { do // Wrap the title { - titleWidth = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + titleWidth = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; if( titleWidth > titleFieldWidth ) { @@ -1132,14 +1130,14 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, { lines.Clear(); msg = fullMsg; - sz.x -= aScalar; + sz.x -= m_milsToIu; break; } else { index++; titleWidth = - ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; wxString ch = wxString( msg.Last() ); @@ -1186,8 +1184,8 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( titleFieldHeight < (int) ( titleHeight * lines.Count() ) ) { - sz.y -= aScalar; - sz.x -= aScalar; + sz.y -= m_milsToIu; + sz.x -= m_milsToIu; msg = fullMsg; lines.Clear(); } @@ -1195,16 +1193,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, break; } while( 1 ); - pos.x = ( refx - Mm2mils( 85 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 85 ) ) * m_milsToIu; pos.y = - ( refy - Mm2mils( 27.5 ) - (titleHeight * (lines.Count() - 1) / 2) ) * aScalar; + ( refy - Mm2mils( 27.5 ) - (titleHeight * (lines.Count() - 1) / 2) ) * m_milsToIu; for( unsigned curLn = 0; curLn < lines.Count(); curLn++ ) { msg = lines[curLn]; Append( new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); - pos.y += titleHeight * aScalar; + sz, m_penSize, aTextColor ) ); + pos.y += titleHeight * m_milsToIu; } } @@ -1214,16 +1212,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size3; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 119 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx - Mm2mils( 60 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 47.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 60 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 47.5 ) ) * m_milsToIu; Append( new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); + sz, m_penSize, aTextColor ) ); } // Developer @@ -1232,16 +1230,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 22 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx - Mm2mils( 167.5 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 27.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 167.5 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 27.5 ) ) * m_milsToIu; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); + sz, m_penSize, aTextColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); } @@ -1251,16 +1249,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 22 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx - Mm2mils( 167 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 22.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 167 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 22.5 ) ) * m_milsToIu; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); + sz, m_penSize, aTextColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); } @@ -1270,16 +1268,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 22 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx - Mm2mils( 167 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 2.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 167 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 2.5 ) ) * m_milsToIu; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); + sz, m_penSize, aTextColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); } } @@ -1287,10 +1285,10 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, { for( WsItem = &WS_Osn2a_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = (refx - WsItem->m_Posx) * aScalar; - pos.y = (refy - WsItem->m_Posy) * aScalar; - end.x = (refx - WsItem->m_Endx) * aScalar; - end.y = (refy - WsItem->m_Endy) * aScalar; + pos.x = (refx - WsItem->m_Posx) * m_milsToIu; + pos.y = (refy - WsItem->m_Posy) * m_milsToIu; + end.x = (refx - WsItem->m_Endx) * m_milsToIu; + end.y = (refy - WsItem->m_Endy) * m_milsToIu; msg = WsItem->m_Legende; switch( WsItem->m_Type ) @@ -1311,11 +1309,11 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, { if( WsItem == &WS_Osn2a_Text1 ) Append( new WS_DRAW_ITEM_TEXT( msg, pos, - size0_8, aPenWidth, + size0_8, m_penSize, aLineColor ) ); else Append( new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); } break; @@ -1325,7 +1323,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, + size, m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); } @@ -1335,12 +1333,12 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, } // Sheet number - pos.x = ( refx - Mm2mils( 5 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 4 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 5 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 4 ) ) * m_milsToIu; msg.Empty(); msg << aSheetNumber; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); // Decimal number msg = aTitleBlock.GetComment1(); @@ -1348,41 +1346,41 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size3; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 109 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx - Mm2mils( 65 ) ) * aScalar; - pos.y = ( refy - Mm2mils( 7.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 65 ) ) * m_milsToIu; + pos.y = ( refy - Mm2mils( 7.5 ) ) * m_milsToIu; Append( new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); + sz, m_penSize, aTextColor ) ); } } // Format - pos.x = ( refx - Mm2mils( 23 ) ) * aScalar; - pos.y = ( refy + Mm2mils( 2.5 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 23 ) ) * m_milsToIu; + pos.y = ( refy + Mm2mils( 2.5 ) ) * m_milsToIu; msg.Empty(); msg << aPaperFormat; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); // Center - left bottom corner - refx = aLTmargin.x; - refy = aPageSize.y - aRBmargin.y; + refx = m_LTmargin.x; + refy = m_pageSize.y - m_RBmargin.y; for( WsItem = &WS_DopLeft_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) { if( aSheetNumber > 1 && WsItem == &WS_DopLeft_Line9 ) // Some fields for first page only break; - pos.x = (refx - WsItem->m_Posx) * aScalar; - pos.y = (refy - WsItem->m_Posy) * aScalar; - end.x = (refx - WsItem->m_Endx) * aScalar; - end.y = (refy - WsItem->m_Endy) * aScalar; + pos.x = (refx - WsItem->m_Posx) * m_milsToIu; + pos.y = (refy - WsItem->m_Posy) * m_milsToIu; + end.x = (refx - WsItem->m_Endx) * m_milsToIu; + end.y = (refy - WsItem->m_Endy) * m_milsToIu; msg = WsItem->m_Legende; switch( WsItem->m_Type ) @@ -1397,7 +1395,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - size, aPenWidth, aLineColor ) ); + size, m_penSize, aLineColor ) ); gtext->SetOrientation( TEXT_ORIENT_VERT ); } @@ -1405,21 +1403,21 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, } } - if( aPaperFormat == PAGE_INFO::A4 || aPageSize.x > aPageSize.y ) // A4 or Landscape + if( aPaperFormat == PAGE_INFO::A4 || m_pageSize.x > m_pageSize.y ) // A4 or Landscape { // Center - left top corner - refx = aLTmargin.x; - refy = aLTmargin.y; + refx = m_LTmargin.x; + refy = m_LTmargin.y; for( WsItem = &WS_DopTop_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) { if( aSheetNumber > 1 && WsItem == &WS_DopTop_Line3 ) // Some fields for first page only break; - pos.x = (refx + WsItem->m_Posx) * aScalar; - pos.y = (refy + WsItem->m_Posy) * aScalar; - end.x = (refx + WsItem->m_Endx) * aScalar; - end.y = (refy + WsItem->m_Endy) * aScalar; + pos.x = (refx + WsItem->m_Posx) * m_milsToIu; + pos.y = (refy + WsItem->m_Posy) * m_milsToIu; + end.x = (refx + WsItem->m_Endx) * m_milsToIu; + end.y = (refy + WsItem->m_Endy) * m_milsToIu; msg = WsItem->m_Legende; switch( WsItem->m_Type ) @@ -1442,16 +1440,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size2; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 69 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx + Mm2mils( 35 ) ) * aScalar; - pos.y = ( refy + Mm2mils( 7 ) ) * aScalar; + pos.x = ( refx + Mm2mils( 35 ) ) * m_milsToIu; + pos.y = ( refy + Mm2mils( 7 ) ) * m_milsToIu; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); + sz, m_penSize, aTextColor ) ); gtext->SetOrientation( 1800.0 ); } } @@ -1459,18 +1457,18 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, { // Center - right top corner // Lines are used from the upper left corner by the change of coordinates - refx = aPageSize.x - aRBmargin.x; - refy = aLTmargin.y; + refx = m_pageSize.x - m_RBmargin.x; + refy = m_LTmargin.y; for( WsItem = &WS_DopTop_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) { if( aSheetNumber > 1 && WsItem == &WS_DopTop_Line3 ) // Some fields for first page only break; - pos.x = (refx - WsItem->m_Posy) * aScalar; - pos.y = (refy + WsItem->m_Posx) * aScalar; - end.x = (refx - WsItem->m_Endy) * aScalar; - end.y = (refy + WsItem->m_Endx) * aScalar; + pos.x = (refx - WsItem->m_Posy) * m_milsToIu; + pos.y = (refy + WsItem->m_Posx) * m_milsToIu; + end.x = (refx - WsItem->m_Endy) * m_milsToIu; + end.y = (refy + WsItem->m_Endx) * m_milsToIu; msg = WsItem->m_Legende; switch( WsItem->m_Type ) @@ -1493,16 +1491,16 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( wxSize& aPageSize, if( !msg.IsEmpty() ) { sz = size2; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / aScalar; + lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; ln = Mm2mils( 69 ); if( lnMsg > ln ) sz.x *= float(ln) / lnMsg; - pos.x = ( refx - Mm2mils( 7 ) ) * aScalar; - pos.y = ( refy + Mm2mils( 35 ) ) * aScalar; + pos.x = ( refx - Mm2mils( 7 ) ) * m_milsToIu; + pos.y = ( refy + Mm2mils( 35 ) ) * m_milsToIu; Append( gtext = new WS_DRAW_ITEM_TEXT( msg, pos, - sz, aPenWidth, aTextColor ) ); + sz, m_penSize, aTextColor ) ); gtext->SetOrientation( TEXT_ORIENT_VERT ); } } diff --git a/common/worksheet.cpp b/common/worksheet.cpp index 289822e186..4e382dadf8 100644 --- a/common/worksheet.cpp +++ b/common/worksheet.cpp @@ -55,8 +55,84 @@ #include "title_block_shapes.h" #endif +void DrawPageLayout( wxDC* aDC, EDA_DRAW_PANEL * aCanvas, + const PAGE_INFO& aPageInfo, + const wxString& aPaperFormat, + const wxString &aFullSheetName, + const wxString& aFileName, + TITLE_BLOCK& aTitleBlock, + int aSheetCount, int aSheetNumber, + int aPenWidth, double aScalar, + EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ) +{ + GRSetDrawMode( aDC, GR_COPY ); + WS_DRAW_ITEM_LIST drawList; -void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* aDC, BASE_SCREEN* aScreen, int aLineWidth, + wxPoint LTmargin( aPageInfo.GetLeftMarginMils(), aPageInfo.GetTopMarginMils() ); + wxPoint RBmargin( aPageInfo.GetRightMarginMils(), aPageInfo.GetBottomMarginMils() ); + wxSize pagesize = aPageInfo.GetSizeMils(); + + drawList.SetMargins( LTmargin, RBmargin ); + drawList.SetPenSize( aPenWidth ); + drawList.SetMilsToIUfactor( aScalar ); + drawList.SetPageSize( pagesize ); + + drawList.BuildWorkSheetGraphicList( + aPaperFormat, aFullSheetName, aFileName, + aTitleBlock, aSheetCount, aSheetNumber, + aLineColor, aTextColor ); + + // Draw item list + for( WS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item; + item = drawList.GetNext() ) + { + switch( item->GetType() ) + { + case WS_DRAW_ITEM_BASE::wsg_line: + { + WS_DRAW_ITEM_LINE* line = (WS_DRAW_ITEM_LINE*) item; + GRLine( aCanvas ? aCanvas->GetClipBox() : NULL, aDC, + line->GetStart(), line->GetEnd(), + line->GetPenWidth(), line->GetColor() ); + } + break; + + case WS_DRAW_ITEM_BASE::wsg_rect: + { + WS_DRAW_ITEM_RECT* rect = (WS_DRAW_ITEM_RECT*) item; + GRRect( aCanvas ? aCanvas->GetClipBox() : NULL, aDC, + rect->GetStart().x, rect->GetStart().y, + rect->GetEnd().x, rect->GetEnd().y, + rect->GetPenWidth(), rect->GetColor() ); + } + break; + + case WS_DRAW_ITEM_BASE::wsg_text: + { + WS_DRAW_ITEM_TEXT* text = (WS_DRAW_ITEM_TEXT*) item; + DrawGraphicText( aCanvas, aDC, text->GetTextPosition(), + text->GetColor(), text->GetText(), + text->GetOrientation(), text->GetSize(), + text->GetHorizJustify(), text->GetVertJustify(), + text->GetPenWidth(), text->IsItalic(), text->IsBold() ); + } + break; + + case WS_DRAW_ITEM_BASE::wsg_poly: + { + WS_DRAW_ITEM_POLYGON* poly = (WS_DRAW_ITEM_POLYGON*) item; + GRPoly( aCanvas ? aCanvas->GetClipBox() : NULL, aDC, + poly->m_Corners.size(), &poly->m_Corners[0], + true, poly->GetPenWidth(), + poly->GetColor(), poly->GetColor() ); + } + break; + } + } +} + + +void EDA_DRAW_FRAME::DrawWorkSheet( wxDC* aDC, BASE_SCREEN* aScreen, int aLineWidth, double aScalar, const wxString &aFilename ) { if( !m_showBorderAndTitleBlock ) @@ -74,17 +150,14 @@ void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* aDC, BASE_SCREEN* aScreen, int aLineW g_DrawBgColor == WHITE ? LIGHTGRAY : DARKDARKGRAY ); } - wxPoint margin_left_top( pageInfo.GetLeftMarginMils(), pageInfo.GetTopMarginMils() ); - wxPoint margin_right_bottom( pageInfo.GetRightMarginMils(), pageInfo.GetBottomMarginMils() ); wxString paper = pageInfo.GetType(); - wxString file = aFilename; TITLE_BLOCK t_block = GetTitleBlock(); - int number_of_screens = aScreen->m_NumberOfScreens; - int screen_to_draw = aScreen->m_ScreenNumber; + EDA_COLOR_T color = RED; - TraceWorkSheet( aDC, pageSize, margin_left_top, margin_right_bottom, - paper, file, t_block, number_of_screens, screen_to_draw, - aLineWidth, aScalar ); + DrawPageLayout( aDC, m_canvas, pageInfo, + paper, aFilename, GetScreenDesc(), t_block, + aScreen->m_NumberOfScreens, aScreen->m_ScreenNumber, + aLineWidth, aScalar, color, color ); } @@ -191,72 +264,3 @@ void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aCont aFormatter->Print( aNestLevel, ")\n\n" ); } } - - -void EDA_DRAW_FRAME::TraceWorkSheet( wxDC* aDC, wxSize& aPageSize, - wxPoint& aLTmargin, wxPoint& aRBmargin, - wxString& aPaperFormat, - wxString& aFileName, - TITLE_BLOCK& aTitleBlock, - int aSheetCount, int aSheetNumber, - int aPenWidth, double aScalar, - EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ) -{ - GRSetDrawMode( aDC, GR_COPY ); - WS_DRAW_ITEM_LIST drawList; - - drawList.BuildWorkSheetGraphicList( aPageSize, aLTmargin, aRBmargin, - aPaperFormat, aFileName, - GetScreenDesc(), - aTitleBlock, aSheetCount, aSheetNumber, - aPenWidth, aScalar, aLineColor, aTextColor ); - - // Draw item list - for( WS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item; - item = drawList.GetNext() ) - { - switch( item->GetType() ) - { - case WS_DRAW_ITEM_BASE::wsg_line: - { - WS_DRAW_ITEM_LINE* line = (WS_DRAW_ITEM_LINE*) item; - GRLine( m_canvas->GetClipBox(), aDC, - line->GetStart(), line->GetEnd(), - line->GetPenWidth(), line->GetColor() ); - } - break; - - case WS_DRAW_ITEM_BASE::wsg_rect: - { - WS_DRAW_ITEM_RECT* rect = (WS_DRAW_ITEM_RECT*) item; - GRRect( m_canvas->GetClipBox(), aDC, - rect->GetStart().x, rect->GetStart().y, - rect->GetEnd().x, rect->GetEnd().y, - rect->GetPenWidth(), rect->GetColor() ); - } - break; - - case WS_DRAW_ITEM_BASE::wsg_text: - { - WS_DRAW_ITEM_TEXT* text = (WS_DRAW_ITEM_TEXT*) item; - DrawGraphicText( m_canvas, aDC, text->GetTextPosition(), - text->GetColor(), - text->GetText(), - text->GetOrientation(), text->GetSize(), - text->GetHorizJustify(), text->GetVertJustify(), - text->GetPenWidth(), text->IsItalic(), text->IsBold() ); - } - break; - - case WS_DRAW_ITEM_BASE::wsg_poly: - { - WS_DRAW_ITEM_POLYGON* poly = (WS_DRAW_ITEM_POLYGON*) item; - GRPoly( m_canvas->GetClipBox(), aDC, - poly->m_Corners.size(), &poly->m_Corners[0], - true, poly->GetPenWidth(), - poly->GetColor(), poly->GetColor() ); - } - break; - } - } -} diff --git a/common/worksheet_shape_builder.h b/common/worksheet_shape_builder.h index cde85045b4..8174c90225 100644 --- a/common/worksheet_shape_builder.h +++ b/common/worksheet_shape_builder.h @@ -1,195 +1,232 @@ -/** - * @file worksheet_shape_builder.h - * @brief classes and function to generate graphics to plt or draw titles blocks - * and frame references - */ - -#ifndef WORKSHEET_SHAPE_BUILDER_H -#define WORKSHEET_SHAPE_BUILDER_H - - -/* - * Helper classes to handle basic graphic items used to raw/plot - * title blocks and frame references - * segments - * rect - * polygons (for logos) - * graphic texts - */ -class WS_DRAW_ITEM_BASE // This basic class, not directly usable. -{ -public: - enum WS_DRAW_TYPE { - wsg_line, wsg_rect, wsg_poly, wsg_text - }; -protected: - WS_DRAW_TYPE m_type; // wsg_line, wsg_rect, wsg_poly, wsg_text - EDA_COLOR_T m_color; -protected: - WS_DRAW_ITEM_BASE( WS_DRAW_TYPE aType, EDA_COLOR_T aColor ) - { - m_type = aType; - m_color = aColor; - } - -public: - virtual ~WS_DRAW_ITEM_BASE() {} - - // Accessors: - EDA_COLOR_T GetColor() { return m_color; } - WS_DRAW_TYPE GetType() { return m_type; }; -}; - -// This class draws a thick segment -class WS_DRAW_ITEM_LINE : public WS_DRAW_ITEM_BASE -{ - wxPoint m_start; // start point of line/rect - wxPoint m_end; // end point - int m_penWidth; -public: - WS_DRAW_ITEM_LINE( wxPoint aStart, wxPoint aEnd, - int aPenWidth, EDA_COLOR_T aColor ) : - WS_DRAW_ITEM_BASE( wsg_line, aColor ) - { - m_start = aStart; - m_end = aEnd; - m_penWidth = aPenWidth; - } - - // Accessors: - int GetPenWidth() { return m_penWidth; } - const wxPoint& GetStart() { return m_start; } - const wxPoint& GetEnd() { return m_end; } -}; - -// This class draws a polygon -class WS_DRAW_ITEM_POLYGON : public WS_DRAW_ITEM_BASE -{ - int m_penWidth; -public: - std::vector m_Corners; -public: - WS_DRAW_ITEM_POLYGON( wxPoint aStart, wxPoint aEnd, - int aPenWidth, EDA_COLOR_T aColor ) : - WS_DRAW_ITEM_BASE( wsg_poly, aColor ) - { - m_penWidth = aPenWidth; - } - - // Accessors: - int GetPenWidth() { return m_penWidth; } -}; - -// This class draws a not filled rectangle with thick segment -class WS_DRAW_ITEM_RECT : public WS_DRAW_ITEM_LINE -{ -public: - WS_DRAW_ITEM_RECT( wxPoint aStart, wxPoint aEnd, - int aPenWidth, EDA_COLOR_T aColor ) : - WS_DRAW_ITEM_LINE( aStart, aEnd, aPenWidth, aColor ) - { - m_type = wsg_rect; - } -}; - -// This class draws a graphic text. -// it is derived from an EDA_TEXT, so it handle all caracteristics -// of this graphic text (justification, rotation ... ) -class WS_DRAW_ITEM_TEXT : public WS_DRAW_ITEM_BASE, public EDA_TEXT -{ -public: - WS_DRAW_ITEM_TEXT( wxString& aText, wxPoint aPos, wxSize aSize, - int aPenWidth, EDA_COLOR_T aColor, - bool aItalic = false, bool aBold = false ) : - WS_DRAW_ITEM_BASE( wsg_text, aColor ), EDA_TEXT( aText ) - { - SetTextPosition( aPos ); - SetSize( aSize ); - SetThickness( aPenWidth ); - SetItalic( aItalic ); - SetBold( aBold ); - } - - // Accessors: - int GetPenWidth() { return GetThickness(); } -}; - -/* - * this class stores the list of graphic items to draw/plot - * the title block and frame references - */ -class WS_DRAW_ITEM_LIST -{ - std::vector m_graphicList; - unsigned m_idx; - -public: - WS_DRAW_ITEM_LIST() - { - m_idx = 0; - } - - ~WS_DRAW_ITEM_LIST() - { - for( unsigned ii = 0; ii < m_graphicList.size(); ii++ ) - delete m_graphicList[ii]; - } - - void Append( WS_DRAW_ITEM_BASE* aItem ) - { - m_graphicList.push_back( aItem ); - } - - WS_DRAW_ITEM_BASE* GetFirst() - { - m_idx = 0; - - if( m_graphicList.size() ) - return m_graphicList[0]; - else - return NULL; - } - - WS_DRAW_ITEM_BASE* GetNext() - { - m_idx++; - - if( m_graphicList.size() > m_idx ) - return m_graphicList[m_idx]; - else - return NULL; - } - - /** - * Function BuildWorkSheetGraphicList is a core function for - * drawing or plotting the page layout with - * the frame and the basic inscriptions. - * It fills the list of basic graphic items to draw or plot. - * currently lines, rect, polygons and texts - * - * @param aPageSize The size of the page layout. - * @param aLTmargin The left top margin of the page layout. - * @param aRBmargin The right bottom margin of the page layout. - * @param aPaperFormat The paper size type, for basic inscriptions. - * @param aFileName The file name, for basic inscriptions. - * @param aTitleBlock The sheet title block, for basic inscriptions. - * @param aSheetCount The number of sheets (for basic inscriptions). - * @param aSheetNumber The sheet number (for basic inscriptions). - * @param aPenWidth The line width for drawing. - * @param aScalar Scalar to convert from mils to internal units. - * @param aLineColor The color for drawing. - * @param aTextColor The color for inscriptions. - */ - void BuildWorkSheetGraphicList( wxSize& aPageSize, - wxPoint& aLTmargin, wxPoint& aRBmargin, - const wxString& aPaperFormat, - const wxString& aFileName, - const wxString& aSheetPathHumanReadable, - const TITLE_BLOCK& aTitleBlock, - int aSheetCount, int aSheetNumber, - int aPenWidth, double aScalar, - EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ); -}; - - -#endif // WORKSHEET_SHAPE_BUILDER_H +/** + * @file worksheet_shape_builder.h + * @brief classes and function to generate graphics to plt or draw titles blocks + * and frame references + */ + +#ifndef WORKSHEET_SHAPE_BUILDER_H +#define WORKSHEET_SHAPE_BUILDER_H + + +/* + * Helper classes to handle basic graphic items used to raw/plot + * title blocks and frame references + * segments + * rect + * polygons (for logos) + * graphic texts + */ +class WS_DRAW_ITEM_BASE // This basic class, not directly usable. +{ +public: + enum WS_DRAW_TYPE { + wsg_line, wsg_rect, wsg_poly, wsg_text + }; +protected: + WS_DRAW_TYPE m_type; // wsg_line, wsg_rect, wsg_poly, wsg_text + EDA_COLOR_T m_color; +protected: + WS_DRAW_ITEM_BASE( WS_DRAW_TYPE aType, EDA_COLOR_T aColor ) + { + m_type = aType; + m_color = aColor; + } + +public: + virtual ~WS_DRAW_ITEM_BASE() {} + + // Accessors: + EDA_COLOR_T GetColor() { return m_color; } + WS_DRAW_TYPE GetType() { return m_type; }; +}; + +// This class draws a thick segment +class WS_DRAW_ITEM_LINE : public WS_DRAW_ITEM_BASE +{ + wxPoint m_start; // start point of line/rect + wxPoint m_end; // end point + int m_penWidth; +public: + WS_DRAW_ITEM_LINE( wxPoint aStart, wxPoint aEnd, + int aPenWidth, EDA_COLOR_T aColor ) : + WS_DRAW_ITEM_BASE( wsg_line, aColor ) + { + m_start = aStart; + m_end = aEnd; + m_penWidth = aPenWidth; + } + + // Accessors: + int GetPenWidth() { return m_penWidth; } + const wxPoint& GetStart() { return m_start; } + const wxPoint& GetEnd() { return m_end; } +}; + +// This class draws a polygon +class WS_DRAW_ITEM_POLYGON : public WS_DRAW_ITEM_BASE +{ + int m_penWidth; +public: + std::vector m_Corners; +public: + WS_DRAW_ITEM_POLYGON( wxPoint aStart, wxPoint aEnd, + int aPenWidth, EDA_COLOR_T aColor ) : + WS_DRAW_ITEM_BASE( wsg_poly, aColor ) + { + m_penWidth = aPenWidth; + } + + // Accessors: + int GetPenWidth() { return m_penWidth; } +}; + +// This class draws a not filled rectangle with thick segment +class WS_DRAW_ITEM_RECT : public WS_DRAW_ITEM_LINE +{ +public: + WS_DRAW_ITEM_RECT( wxPoint aStart, wxPoint aEnd, + int aPenWidth, EDA_COLOR_T aColor ) : + WS_DRAW_ITEM_LINE( aStart, aEnd, aPenWidth, aColor ) + { + m_type = wsg_rect; + } +}; + +// This class draws a graphic text. +// it is derived from an EDA_TEXT, so it handle all caracteristics +// of this graphic text (justification, rotation ... ) +class WS_DRAW_ITEM_TEXT : public WS_DRAW_ITEM_BASE, public EDA_TEXT +{ +public: + WS_DRAW_ITEM_TEXT( wxString& aText, wxPoint aPos, wxSize aSize, + int aPenWidth, EDA_COLOR_T aColor, + bool aItalic = false, bool aBold = false ) : + WS_DRAW_ITEM_BASE( wsg_text, aColor ), EDA_TEXT( aText ) + { + SetTextPosition( aPos ); + SetSize( aSize ); + SetThickness( aPenWidth ); + SetItalic( aItalic ); + SetBold( aBold ); + } + + // Accessors: + int GetPenWidth() { return GetThickness(); } +}; + +/* + * this class stores the list of graphic items to draw/plot + * the title block and frame references + */ +class WS_DRAW_ITEM_LIST +{ + std::vector m_graphicList; // Items to draw/plot + unsigned m_idx; // for GetFirst, GetNext functions + wxPoint m_LTmargin; // The left top margin in mils of the page layout. + wxPoint m_RBmargin; // The right bottom margin in mils of the page layout. + wxSize m_pageSize; // the page size in mils + double m_milsToIu; // the scalar to convert pages units ( mils) + // to draw/plot units. + int m_penSize; // The line width for drawings. + +public: + WS_DRAW_ITEM_LIST() + { + m_idx = 0; + } + + ~WS_DRAW_ITEM_LIST() + { + for( unsigned ii = 0; ii < m_graphicList.size(); ii++ ) + delete m_graphicList[ii]; + } + + /* Function SetPenSize + * Set the defualt pen size to draw/plot lines and texts + * @param aPenSize the thickness of lines + */ + void SetPenSize( int aPenSize ) + { + m_penSize = aPenSize; + } + + /* Function SetMilsToIUfactor + * Set the scalar to convert pages units ( mils) to draw/plot units + * @param aScale the conversion factor + */ + void SetMilsToIUfactor( double aScale ) + { + m_milsToIu = aScale; + } + + /* Function SetPageSize + * Set the size of the page layout + * @param aPageSize size (in mils) of the page layout. + */ + void SetPageSize( const wxSize& aPageSize ) + { + m_pageSize = aPageSize; + } + + /* Function SetMargins + * Set the The left top margin and the right bottom margin + * of the page layout + * @param aLTmargin The left top margin of the page layout. + * @param aRBmargin The right bottom margin of the page layout. + */ + void SetMargins( const wxPoint& aLTmargin, const wxPoint& aRBmargin ) + { + m_LTmargin = aLTmargin; + m_RBmargin = aRBmargin; + } + + void Append( WS_DRAW_ITEM_BASE* aItem ) + { + m_graphicList.push_back( aItem ); + } + + WS_DRAW_ITEM_BASE* GetFirst() + { + m_idx = 0; + + if( m_graphicList.size() ) + return m_graphicList[0]; + else + return NULL; + } + + WS_DRAW_ITEM_BASE* GetNext() + { + m_idx++; + + if( m_graphicList.size() > m_idx ) + return m_graphicList[m_idx]; + else + return NULL; + } + + /** + * Function BuildWorkSheetGraphicList is a core function for + * drawing or plotting the page layout with + * the frame and the basic inscriptions. + * It fills the list of basic graphic items to draw or plot. + * currently lines, rect, polygons and texts + * + * @param aPaperFormat The paper size type, for basic inscriptions. + * @param aFileName The file name, for basic inscriptions. + * @param aTitleBlock The sheet title block, for basic inscriptions. + * @param aSheetCount The number of sheets (for basic inscriptions). + * @param aSheetNumber The sheet number (for basic inscriptions). + * @param aLineColor The color for drawing. + * @param aTextColor The color for inscriptions. + */ + void BuildWorkSheetGraphicList( const wxString& aPaperFormat, + const wxString& aFileName, + const wxString& aSheetPathHumanReadable, + const TITLE_BLOCK& aTitleBlock, + int aSheetCount, int aSheetNumber, + EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ); +}; + + +#endif // WORKSHEET_SHAPE_BUILDER_H diff --git a/eeschema/dialogs/dialog_eeschema_config.cpp b/eeschema/dialogs/dialog_eeschema_config.cpp index b8994c03a5..8eab18062d 100644 --- a/eeschema/dialogs/dialog_eeschema_config.cpp +++ b/eeschema/dialogs/dialog_eeschema_config.cpp @@ -1,8 +1,8 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2006 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 2006-2011 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr + * Copyright (C) 2006-2013 KiCad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -33,7 +33,7 @@ #include #include -#include +//#include #include #include #include diff --git a/eeschema/dialogs/dialog_eeschema_options.cpp b/eeschema/dialogs/dialog_eeschema_options.cpp index ae610214f2..8225e4a187 100644 --- a/eeschema/dialogs/dialog_eeschema_options.cpp +++ b/eeschema/dialogs/dialog_eeschema_options.cpp @@ -49,6 +49,16 @@ void DIALOG_EESCHEMA_OPTIONS::SetUnits( const wxArrayString& units, int select ) m_choiceUnits->SetSelection( select ); } +void DIALOG_EESCHEMA_OPTIONS::SetRefIdSeparator( wxChar aSep, wxChar aFirstId) +{ + if( aSep == 0 ) + m_textCtrlSeparatorRefId->SetValue( _("None") ); + else + m_textCtrlSeparatorRefId->SetValue( aSep ); + + m_textCtrlPartFirstId->SetValue( aFirstId ); + +} void DIALOG_EESCHEMA_OPTIONS::SetGridSizes( const GRIDS& grid_sizes, int grid_id ) { diff --git a/eeschema/dialogs/dialog_eeschema_options.h b/eeschema/dialogs/dialog_eeschema_options.h index f7f1354824..36976311e9 100644 --- a/eeschema/dialogs/dialog_eeschema_options.h +++ b/eeschema/dialogs/dialog_eeschema_options.h @@ -75,6 +75,8 @@ public: void SetAutoSaveInterval( int aInterval ) { m_spinAutoSaveInterval->SetValue( aInterval ); } int GetAutoSaveInterval() const { return m_spinAutoSaveInterval->GetValue(); } + void SetRefIdSeparator( wxChar aSep, wxChar aFirstId); + void SetShowGrid( bool show ) { m_checkShowGrid->SetValue( show ); } bool GetShowGrid( void ) { return m_checkShowGrid->GetValue(); } diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp index 7f5546c3bd..51187eb040 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.cpp +++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp @@ -1,318 +1,340 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_eeschema_options_base.h" - -/////////////////////////////////////////////////////////////////////////// - -BEGIN_EVENT_TABLE( DIALOG_EESCHEMA_OPTIONS_BASE, DIALOG_SHIM ) - EVT_CHOICE( wxID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnChooseUnits ) - EVT_CHECKBOX( xwID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnMiddleBtnPanEnbl ) -END_EVENT_TABLE() - -DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bOptionsSizer; - bOptionsSizer = new wxBoxSizer( wxVERTICAL ); - - m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_notebook1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); - - m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxBoxSizer* p1mainSizer; - p1mainSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 9, 3, 0, 0 ); - fgSizer1->AddGrowableCol( 0 ); - fgSizer1->AddGrowableCol( 1 ); - fgSizer1->AddGrowableCol( 2 ); - fgSizer1->SetFlexibleDirection( wxHORIZONTAL ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticText2 = new wxStaticText( m_panel1, wxID_ANY, _("Measurement &units:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText2->Wrap( -1 ); - fgSizer1->Add( m_staticText2, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - wxArrayString m_choiceUnitsChoices; - m_choiceUnits = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitsChoices, 0 ); - m_choiceUnits->SetSelection( 0 ); - fgSizer1->Add( m_choiceUnits, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - - fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); - - m_staticText3 = new wxStaticText( m_panel1, wxID_ANY, _("&Grid size:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText3->Wrap( -1 ); - fgSizer1->Add( m_staticText3, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - wxArrayString m_choiceGridSizeChoices; - m_choiceGridSize = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGridSizeChoices, 0 ); - m_choiceGridSize->SetSelection( 0 ); - fgSizer1->Add( m_choiceGridSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticGridUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticGridUnits->Wrap( -1 ); - fgSizer1->Add( m_staticGridUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_staticText51 = new wxStaticText( m_panel1, wxID_ANY, _("Default &bus width:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText51->Wrap( -1 ); - fgSizer1->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_spinBusWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 ); - fgSizer1->Add( m_spinBusWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticBusWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticBusWidthUnits->Wrap( -1 ); - fgSizer1->Add( m_staticBusWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_staticText5 = new wxStaticText( m_panel1, wxID_ANY, _("Default &line width:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText5->Wrap( -1 ); - fgSizer1->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_spinLineWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 ); - fgSizer1->Add( m_spinLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticLineWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticLineWidthUnits->Wrap( -1 ); - fgSizer1->Add( m_staticLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Default text &size:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText7->Wrap( -1 ); - fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_spinTextSize = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 1000, 0 ); - fgSizer1->Add( m_spinTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticTextSizeUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextSizeUnits->Wrap( -1 ); - fgSizer1->Add( m_staticTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_staticText9 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &horizontal displacement:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText9->Wrap( -1 ); - fgSizer1->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_spinRepeatHorizontal = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -5000, 5000, 0 ); - fgSizer1->Add( m_spinRepeatHorizontal, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticRepeatXUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticRepeatXUnits->Wrap( -1 ); - fgSizer1->Add( m_staticRepeatXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_staticText12 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &vertical displacement:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText12->Wrap( -1 ); - fgSizer1->Add( m_staticText12, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_spinRepeatVertical = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -5000, 5000, 100 ); - fgSizer1->Add( m_spinRepeatVertical, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticRepeatYUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticRepeatYUnits->Wrap( -1 ); - fgSizer1->Add( m_staticRepeatYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_staticText16 = new wxStaticText( m_panel1, wxID_ANY, _("&Repeat label increment:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText16->Wrap( -1 ); - fgSizer1->Add( m_staticText16, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_spinRepeatLabel = new wxSpinCtrl( m_panel1, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 10, 1 ); - fgSizer1->Add( m_spinRepeatLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - - fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); - - m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save &time interval:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText221->Wrap( -1 ); - fgSizer1->Add( m_staticText221, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_spinAutoSaveInterval = new wxSpinCtrl( m_panel1, ID_M_SPINAUTOSAVEINTERVAL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 10 ); - fgSizer1->Add( m_spinAutoSaveInterval, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText23 = new wxStaticText( m_panel1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText23->Wrap( -1 ); - fgSizer1->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer3->Add( fgSizer1, 0, wxALIGN_CENTER|wxEXPAND, 0 ); - - wxBoxSizer* bSizer2; - bSizer2 = new wxBoxSizer( wxVERTICAL ); - - m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show gr&id"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 ); - - m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 ); - - m_checkEnableZoomNoCenter = new wxCheckBox( m_panel1, wxID_ANY, _("Do not center and &warp cursor on zoom"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkEnableZoomNoCenter->SetToolTip( _("Keep the cursor at its current location when zooming") ); - - bSizer2->Add( m_checkEnableZoomNoCenter, 0, wxALL, 3 ); - - m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Use &middle mouse button to pan"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") ); - - bSizer2->Add( m_checkEnableMiddleButtonPan, 0, wxALL, 3 ); - - m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("&Limit panning to scroll size"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") ); - - bSizer2->Add( m_checkMiddleButtonPanLimited, 0, wxALL, 3 ); - - m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Pan while moving ob&ject"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 ); - - m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 ); - - m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age limits"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 ); - - - bSizer3->Add( bSizer2, 0, wxEXPAND, 0 ); - - - p1mainSizer->Add( bSizer3, 1, wxALL|wxEXPAND, 6 ); - - - m_panel1->SetSizer( p1mainSizer ); - m_panel1->Layout(); - p1mainSizer->Fit( m_panel1 ); - m_notebook1->AddPage( m_panel1, _("General Options"), true ); - m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_panel2->SetToolTip( _("User defined field names for schematic components. ") ); - - wxBoxSizer* bSizer6; - bSizer6 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer8; - bSizer8 = new wxBoxSizer( wxVERTICAL ); - - m_staticText211 = new wxStaticText( m_panel2, wxID_ANY, _("Please enter fieldnames which you want presented in the component fieldname (property) editors. Names may not include (, ), or \" characters."), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText211->Wrap( 400 ); - bSizer8->Add( m_staticText211, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - - - bSizer6->Add( bSizer8, 0, wxEXPAND, 5 ); - - wxBoxSizer* bSizer7; - bSizer7 = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 8, 2, 0, 0 ); - fgSizer2->AddGrowableCol( 1 ); - fgSizer2->SetFlexibleDirection( wxHORIZONTAL ); - fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticText15 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 1"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText15->Wrap( -1 ); - fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName1->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText161->Wrap( -1 ); - fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName2->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText17->Wrap( -1 ); - fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName3->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText18->Wrap( -1 ); - fgSizer2->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName4 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName4->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName4, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText19 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 5"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText19->Wrap( -1 ); - fgSizer2->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName5 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName5->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName5, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText20 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 6"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText20->Wrap( -1 ); - fgSizer2->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName6 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName6->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText21 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 7"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText21->Wrap( -1 ); - fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName7 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName7->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName7, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - m_staticText22 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 8"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText22->Wrap( -1 ); - fgSizer2->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); - - m_fieldName8 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_fieldName8->SetMaxLength( 0 ); - fgSizer2->Add( m_fieldName8, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - - - bSizer7->Add( fgSizer2, 1, wxALIGN_CENTER|wxEXPAND, 5 ); - - - bSizer6->Add( bSizer7, 1, wxALL|wxEXPAND, 12 ); - - - m_panel2->SetSizer( bSizer6 ); - m_panel2->Layout(); - bSizer6->Fit( m_panel2 ); - m_notebook1->AddPage( m_panel2, _("Template Field Names"), false ); - - bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - - bOptionsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 6 ); - - - mainSizer->Add( bOptionsSizer, 1, wxEXPAND, 12 ); - - - this->SetSizer( mainSizer ); - this->Layout(); - mainSizer->Fit( this ); - - this->Centre( wxBOTH ); -} - -DIALOG_EESCHEMA_OPTIONS_BASE::~DIALOG_EESCHEMA_OPTIONS_BASE() -{ -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 8 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_eeschema_options_base.h" + +/////////////////////////////////////////////////////////////////////////// + +BEGIN_EVENT_TABLE( DIALOG_EESCHEMA_OPTIONS_BASE, DIALOG_SHIM ) + EVT_CHOICE( wxID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnChooseUnits ) + EVT_CHECKBOX( xwID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnMiddleBtnPanEnbl ) +END_EVENT_TABLE() + +DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* mainSizer; + mainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bOptionsSizer; + bOptionsSizer = new wxBoxSizer( wxVERTICAL ); + + m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_notebook1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); + + m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* p1mainSizer; + p1mainSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bSizer3; + bSizer3 = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer* fgSizer1; + fgSizer1 = new wxFlexGridSizer( 11, 3, 0, 0 ); + fgSizer1->AddGrowableCol( 0 ); + fgSizer1->AddGrowableCol( 1 ); + fgSizer1->AddGrowableCol( 2 ); + fgSizer1->SetFlexibleDirection( wxHORIZONTAL ); + fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticText2 = new wxStaticText( m_panel1, wxID_ANY, _("Measurement &units:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2->Wrap( -1 ); + fgSizer1->Add( m_staticText2, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + wxArrayString m_choiceUnitsChoices; + m_choiceUnits = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitsChoices, 0 ); + m_choiceUnits->SetSelection( 0 ); + fgSizer1->Add( m_choiceUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + + fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); + + m_staticText3 = new wxStaticText( m_panel1, wxID_ANY, _("&Grid size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3->Wrap( -1 ); + fgSizer1->Add( m_staticText3, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + wxArrayString m_choiceGridSizeChoices; + m_choiceGridSize = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGridSizeChoices, 0 ); + m_choiceGridSize->SetSelection( 0 ); + fgSizer1->Add( m_choiceGridSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 3 ); + + m_staticGridUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticGridUnits->Wrap( -1 ); + fgSizer1->Add( m_staticGridUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_staticText51 = new wxStaticText( m_panel1, wxID_ANY, _("Default &bus width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText51->Wrap( -1 ); + fgSizer1->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_spinBusWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 ); + fgSizer1->Add( m_spinBusWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticBusWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticBusWidthUnits->Wrap( -1 ); + fgSizer1->Add( m_staticBusWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_staticText5 = new wxStaticText( m_panel1, wxID_ANY, _("Default &line width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText5->Wrap( -1 ); + fgSizer1->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_spinLineWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 ); + fgSizer1->Add( m_spinLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticLineWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticLineWidthUnits->Wrap( -1 ); + fgSizer1->Add( m_staticLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Default text &size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText7->Wrap( -1 ); + fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_spinTextSize = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 1000, 0 ); + fgSizer1->Add( m_spinTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticTextSizeUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSizeUnits->Wrap( -1 ); + fgSizer1->Add( m_staticTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_staticText9 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &horizontal displacement:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText9->Wrap( -1 ); + fgSizer1->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_spinRepeatHorizontal = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -5000, 5000, 0 ); + fgSizer1->Add( m_spinRepeatHorizontal, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticRepeatXUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticRepeatXUnits->Wrap( -1 ); + fgSizer1->Add( m_staticRepeatXUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_staticText12 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &vertical displacement:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText12->Wrap( -1 ); + fgSizer1->Add( m_staticText12, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_spinRepeatVertical = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -5000, 5000, 100 ); + fgSizer1->Add( m_spinRepeatVertical, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticRepeatYUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticRepeatYUnits->Wrap( -1 ); + fgSizer1->Add( m_staticRepeatYUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_staticText16 = new wxStaticText( m_panel1, wxID_ANY, _("&Repeat label increment:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText16->Wrap( -1 ); + fgSizer1->Add( m_staticText16, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_spinRepeatLabel = new wxSpinCtrl( m_panel1, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 10, 1 ); + fgSizer1->Add( m_spinRepeatLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + + fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); + + m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save &time interval:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText221->Wrap( -1 ); + fgSizer1->Add( m_staticText221, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_spinAutoSaveInterval = new wxSpinCtrl( m_panel1, ID_M_SPINAUTOSAVEINTERVAL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 10 ); + fgSizer1->Add( m_spinAutoSaveInterval, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText23 = new wxStaticText( m_panel1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText23->Wrap( -1 ); + fgSizer1->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); + + m_staticText26 = new wxStaticText( m_panel1, wxID_ANY, _("Separator ref/part id:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText26->Wrap( -1 ); + fgSizer1->Add( m_staticText26, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + + m_textCtrlSeparatorRefId = new wxTextCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + fgSizer1->Add( m_textCtrlSeparatorRefId, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 3 ); + + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_staticText27 = new wxStaticText( m_panel1, wxID_ANY, _("Part first Id:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText27->Wrap( -1 ); + fgSizer1->Add( m_staticText27, 0, wxALL, 5 ); + + m_textCtrlPartFirstId = new wxTextCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + fgSizer1->Add( m_textCtrlPartFirstId, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 3 ); + + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); + + + bSizer3->Add( fgSizer1, 0, wxALIGN_CENTER|wxEXPAND, 0 ); + + wxBoxSizer* bSizer2; + bSizer2 = new wxBoxSizer( wxVERTICAL ); + + m_staticline1 = new wxStaticLine( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bSizer2->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); + + m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show gr&id"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer2->Add( m_checkShowGrid, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 3 ); + + m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer2->Add( m_checkShowHiddenPins, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 3 ); + + m_checkEnableZoomNoCenter = new wxCheckBox( m_panel1, wxID_ANY, _("Do not center and &warp cursor on zoom"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkEnableZoomNoCenter->SetToolTip( _("Keep the cursor at its current location when zooming") ); + + bSizer2->Add( m_checkEnableZoomNoCenter, 0, wxTOP|wxRIGHT|wxLEFT, 3 ); + + m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Use &middle mouse button to pan"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") ); + + bSizer2->Add( m_checkEnableMiddleButtonPan, 0, wxTOP|wxRIGHT|wxLEFT, 3 ); + + m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("&Limit panning to scroll size"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") ); + + bSizer2->Add( m_checkMiddleButtonPanLimited, 0, wxTOP|wxRIGHT|wxLEFT, 3 ); + + m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Pan while moving ob&ject"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer2->Add( m_checkAutoPan, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 3 ); + + m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer2->Add( m_checkHVOrientation, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 3 ); + + m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age limits"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 ); + + + bSizer3->Add( bSizer2, 0, wxEXPAND, 0 ); + + + p1mainSizer->Add( bSizer3, 1, wxALL|wxEXPAND, 6 ); + + + m_panel1->SetSizer( p1mainSizer ); + m_panel1->Layout(); + p1mainSizer->Fit( m_panel1 ); + m_notebook1->AddPage( m_panel1, _("General Options"), true ); + m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panel2->SetToolTip( _("User defined field names for schematic components. ") ); + + wxBoxSizer* bSizer6; + bSizer6 = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizer8; + bSizer8 = new wxBoxSizer( wxVERTICAL ); + + m_staticText211 = new wxStaticText( m_panel2, wxID_ANY, _("Please enter fieldnames which you want presented in the component fieldname (property) editors. Names may not include (, ), or \" characters."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText211->Wrap( 400 ); + bSizer8->Add( m_staticText211, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); + + + bSizer6->Add( bSizer8, 0, wxEXPAND, 5 ); + + wxBoxSizer* bSizer7; + bSizer7 = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer* fgSizer2; + fgSizer2 = new wxFlexGridSizer( 8, 2, 0, 0 ); + fgSizer2->AddGrowableCol( 1 ); + fgSizer2->SetFlexibleDirection( wxHORIZONTAL ); + fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticText15 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 1"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText15->Wrap( -1 ); + fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName1->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText161->Wrap( -1 ); + fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName2->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText17->Wrap( -1 ); + fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName3->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText18->Wrap( -1 ); + fgSizer2->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName4 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName4->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName4, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText19 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 5"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText19->Wrap( -1 ); + fgSizer2->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName5 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName5->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName5, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText20 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 6"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText20->Wrap( -1 ); + fgSizer2->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName6 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName6->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText21 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 7"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText21->Wrap( -1 ); + fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName7 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName7->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName7, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + m_staticText22 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 8"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText22->Wrap( -1 ); + fgSizer2->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 ); + + m_fieldName8 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_fieldName8->SetMaxLength( 0 ); + fgSizer2->Add( m_fieldName8, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + + + bSizer7->Add( fgSizer2, 1, wxALIGN_CENTER|wxEXPAND, 5 ); + + + bSizer6->Add( bSizer7, 1, wxALL|wxEXPAND, 12 ); + + + m_panel2->SetSizer( bSizer6 ); + m_panel2->Layout(); + bSizer6->Fit( m_panel2 ); + m_notebook1->AddPage( m_panel2, _("Template Field Names"), false ); + + bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bOptionsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 6 ); + + + mainSizer->Add( bOptionsSizer, 1, wxEXPAND, 12 ); + + + this->SetSizer( mainSizer ); + this->Layout(); + + this->Centre( wxBOTH ); +} + +DIALOG_EESCHEMA_OPTIONS_BASE::~DIALOG_EESCHEMA_OPTIONS_BASE() +{ +} diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp index 2ab9c2b067..db5e0c203f 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.fbp +++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp @@ -1,4782 +1,5231 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - table - dialog_eeschema_options_base - 1000 - none - 1 - dialog_eeschema_options - - . - - 1 - 1 - 1 - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_EESCHEMA_OPTIONS_BASE - - - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Schematic Editor Options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mainSizer - wxVERTICAL - none - - 12 - wxEXPAND - 1 - - - bOptionsSizer - wxVERTICAL - none - - 0 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_BTNFACE - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_notebook1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - General Options - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panel1 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - p1mainSizer - wxHORIZONTAL - none - - 6 - wxALL|wxEXPAND - 1 - - - bSizer3 - wxVERTICAL - none - - 0 - wxALIGN_CENTER|wxEXPAND - 0 - - 3 - wxHORIZONTAL - 0,1,2 - - 0 - - fgSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 9 - 0 - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Measurement &units: - - 0 - - - 0 - - 1 - m_staticText2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceUnits - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnChooseUnits - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 - - 0 - protected - 0 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Grid size: - - 0 - - - 0 - - 1 - m_staticText3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceGridSize - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - - 0 - - - 0 - - 1 - m_staticGridUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Default &bus width: - - 0 - - - 0 - - 1 - m_staticText51 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 1 - 100 - - 0 - - 1 - - 0 - - 1 - m_spinBusWidth - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS|wxSP_WRAP - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - - 0 - - - 0 - - 1 - m_staticBusWidthUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Default &line width: - - 0 - - - 0 - - 1 - m_staticText5 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 1 - 100 - - 0 - - 1 - - 0 - - 1 - m_spinLineWidth - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS|wxSP_WRAP - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - - 0 - - - 0 - - 1 - m_staticLineWidthUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Default text &size: - - 0 - - - 0 - - 1 - m_staticText7 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - 1000 - - 0 - - 0 - - 0 - - 1 - m_spinTextSize - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS|wxSP_WRAP - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - - 0 - - - 0 - - 1 - m_staticTextSizeUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Repeat draw item &horizontal displacement: - - 0 - - - 0 - - 1 - m_staticText9 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - 5000 - - 0 - - -5000 - - 0 - - 1 - m_spinRepeatHorizontal - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS|wxSP_WRAP - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - - 0 - - - 0 - - 1 - m_staticRepeatXUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Repeat draw item &vertical displacement: - - 0 - - - 0 - - 1 - m_staticText12 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 100 - 5000 - - 0 - - -5000 - - 0 - - 1 - m_spinRepeatVertical - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS|wxSP_WRAP - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - - 0 - - - 0 - - 1 - m_staticRepeatYUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Repeat label increment: - - 0 - - - 0 - - 1 - m_staticText16 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 1 - 10 - - 0 - - 0 - - 0 - - 1 - m_spinRepeatLabel - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS|wxSP_WRAP - - 0 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 - - 0 - protected - 0 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Auto save &time interval: - - 0 - - - 0 - - 1 - m_staticText221 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_SPINAUTOSAVEINTERVAL - 10 - 1000 - - 0 - - 0 - - 0 - - 1 - m_spinAutoSaveInterval - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - minutes - - 0 - - - 0 - - 1 - m_staticText23 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - wxEXPAND - 0 - - - bSizer2 - wxVERTICAL - none - - 3 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show gr&id - - 0 - - - 0 - - 1 - m_checkShowGrid - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show hi&dden pins - - 0 - - - 0 - - 1 - m_checkShowHiddenPins - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Do not center and &warp cursor on zoom - - 0 - - - 0 - - 1 - m_checkEnableZoomNoCenter - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Keep the cursor at its current location when zooming - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - xwID_ANY - Use &middle mouse button to pan - - 0 - - - 0 - - 1 - m_checkEnableMiddleButtonPan - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Use middle mouse button dragging to pan - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnMiddleBtnPanEnbl - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Limit panning to scroll size - - 0 - - - 0 - - 1 - m_checkMiddleButtonPanLimited - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Middle mouse button panning limited by current scrollbar size - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Pan while moving ob&ject - - 0 - - - 0 - - 1 - m_checkAutoPan - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Allow buses and wires to be placed in H or V &orientation only - - 0 - - - 0 - - 1 - m_checkHVOrientation - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show p&age limits - - 0 - - - 0 - - 1 - m_checkPageLimits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template Field Names - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panel2 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - User defined field names for schematic components. - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer6 - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - - bSizer8 - wxVERTICAL - none - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Please enter fieldnames which you want presented in the component fieldname (property) editors. Names may not include (, ), or " characters. - - 0 - - - 0 - - 1 - m_staticText211 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12 - wxALL|wxEXPAND - 1 - - - bSizer7 - wxVERTICAL - none - - 5 - wxALIGN_CENTER|wxEXPAND - 1 - - 2 - wxHORIZONTAL - 1 - - 0 - - fgSizer2 - wxFLEX_GROWMODE_SPECIFIED - none - 8 - 0 - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 1 - - 0 - - - 0 - - 1 - m_staticText15 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 2 - - 0 - - - 0 - - 1 - m_staticText161 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 3 - - 0 - - - 0 - - 1 - m_staticText17 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 4 - - 0 - - - 0 - - 1 - m_staticText18 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 5 - - 0 - - - 0 - - 1 - m_staticText19 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName5 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 6 - - 0 - - - 0 - - 1 - m_staticText20 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 7 - - 0 - - - 0 - - 1 - m_staticText21 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName7 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Custom field 8 - - 0 - - - 0 - - 1 - m_staticText22 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_fieldName8 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + table + dialog_eeschema_options_base + 1000 + none + 1 + dialog_eeschema_options + + . + + 1 + 1 + 1 + 1 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_EESCHEMA_OPTIONS_BASE + + 432,560 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Schematic Editor Options + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mainSizer + wxVERTICAL + none + + 12 + wxEXPAND + 1 + + + bOptionsSizer + wxVERTICAL + none + + 0 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_BTNFACE + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_notebook1 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + General Options + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panel1 + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + p1mainSizer + wxHORIZONTAL + none + + 6 + wxALL|wxEXPAND + 1 + + + bSizer3 + wxVERTICAL + none + + 0 + wxALIGN_CENTER|wxEXPAND + 0 + + 3 + wxHORIZONTAL + 0,1,2 + + 0 + + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 11 + 0 + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Measurement &units: + + 0 + + + 0 + + 1 + m_staticText2 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceUnits + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnChooseUnits + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 1 + + 0 + protected + 0 + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Grid size: + + 0 + + + 0 + + 1 + m_staticText3 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceGridSize + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + + 0 + + + 0 + + 1 + m_staticGridUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Default &bus width: + + 0 + + + 0 + + 1 + m_staticText51 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 1 + 100 + + 0 + + 1 + + 0 + + 1 + m_spinBusWidth + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS|wxSP_WRAP + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + + 0 + + + 0 + + 1 + m_staticBusWidthUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Default &line width: + + 0 + + + 0 + + 1 + m_staticText5 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 1 + 100 + + 0 + + 1 + + 0 + + 1 + m_spinLineWidth + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS|wxSP_WRAP + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + + 0 + + + 0 + + 1 + m_staticLineWidthUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Default text &size: + + 0 + + + 0 + + 1 + m_staticText7 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 1000 + + 0 + + 0 + + 0 + + 1 + m_spinTextSize + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS|wxSP_WRAP + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + + 0 + + + 0 + + 1 + m_staticTextSizeUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Repeat draw item &horizontal displacement: + + 0 + + + 0 + + 1 + m_staticText9 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 5000 + + 0 + + -5000 + + 0 + + 1 + m_spinRepeatHorizontal + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS|wxSP_WRAP + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + + 0 + + + 0 + + 1 + m_staticRepeatXUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Repeat draw item &vertical displacement: + + 0 + + + 0 + + 1 + m_staticText12 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 100 + 5000 + + 0 + + -5000 + + 0 + + 1 + m_spinRepeatVertical + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS|wxSP_WRAP + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + + 0 + + + 0 + + 1 + m_staticRepeatYUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Repeat label increment: + + 0 + + + 0 + + 1 + m_staticText16 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 1 + 10 + + 0 + + 0 + + 0 + + 1 + m_spinRepeatLabel + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS|wxSP_WRAP + + 0 + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 1 + + 0 + protected + 0 + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Auto save &time interval: + + 0 + + + 0 + + 1 + m_staticText221 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_SPINAUTOSAVEINTERVAL + 10 + 1000 + + 0 + + 0 + + 0 + + 1 + m_spinAutoSaveInterval + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + minutes + + 0 + + + 0 + + 1 + m_staticText23 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Separator reference/part id: + + 0 + + + 0 + + 1 + m_staticText26 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textCtrlSeparatorRefId + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Part first Id: + + 0 + + + 0 + + 1 + m_staticText27 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textCtrlPartFirstId + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + + + 0 + wxEXPAND + 0 + + + bSizer2 + wxVERTICAL + none + + 5 + wxEXPAND | wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show gr&id + + 0 + + + 0 + + 1 + m_checkShowGrid + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show hi&dden pins + + 0 + + + 0 + + 1 + m_checkShowHiddenPins + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Do not center and &warp cursor on zoom + + 0 + + + 0 + + 1 + m_checkEnableZoomNoCenter + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Keep the cursor at its current location when zooming + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + xwID_ANY + Use &middle mouse button to pan + + 0 + + + 0 + + 1 + m_checkEnableMiddleButtonPan + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Use middle mouse button dragging to pan + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnMiddleBtnPanEnbl + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Limit panning to scroll size + + 0 + + + 0 + + 1 + m_checkMiddleButtonPanLimited + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Middle mouse button panning limited by current scrollbar size + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Pan while moving ob&ject + + 0 + + + 0 + + 1 + m_checkAutoPan + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Allow buses and wires to be placed in H or V &orientation only + + 0 + + + 0 + + 1 + m_checkHVOrientation + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show p&age limits + + 0 + + + 0 + + 1 + m_checkPageLimits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Template Field Names + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panel2 + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + User defined field names for schematic components. + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer6 + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + + bSizer8 + wxVERTICAL + none + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Please enter fieldnames which you want presented in the component fieldname (property) editors. Names may not include (, ), or " characters. + + 0 + + + 0 + + 1 + m_staticText211 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 400 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 + wxALL|wxEXPAND + 1 + + + bSizer7 + wxVERTICAL + none + + 5 + wxALIGN_CENTER|wxEXPAND + 1 + + 2 + wxHORIZONTAL + 1 + + 0 + + fgSizer2 + wxFLEX_GROWMODE_SPECIFIED + none + 8 + 0 + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 1 + + 0 + + + 0 + + 1 + m_staticText15 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName1 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 2 + + 0 + + + 0 + + 1 + m_staticText161 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName2 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 3 + + 0 + + + 0 + + 1 + m_staticText17 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName3 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 4 + + 0 + + + 0 + + 1 + m_staticText18 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName4 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 5 + + 0 + + + 0 + + 1 + m_staticText19 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName5 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 6 + + 0 + + + 0 + + 1 + m_staticText20 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName6 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 7 + + 0 + + + 0 + + 1 + m_staticText21 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName7 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Custom field 8 + + 0 + + + 0 + + 1 + m_staticText22 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_fieldName8 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + + + + + + + + + + + + + + + diff --git a/eeschema/dialogs/dialog_eeschema_options_base.h b/eeschema/dialogs/dialog_eeschema_options_base.h index a18a008001..af1db4df8d 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.h +++ b/eeschema/dialogs/dialog_eeschema_options_base.h @@ -1,127 +1,133 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __DIALOG_EESCHEMA_OPTIONS_BASE_H__ -#define __DIALOG_EESCHEMA_OPTIONS_BASE_H__ - -#include -#include -#include -class DIALOG_SHIM; - -#include "dialog_shim.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_EESCHEMA_OPTIONS_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM -{ - DECLARE_EVENT_TABLE() - private: - - // Private event handlers - void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); } - void _wxFB_OnMiddleBtnPanEnbl( wxCommandEvent& event ){ OnMiddleBtnPanEnbl( event ); } - - - protected: - enum - { - ID_M_SPINAUTOSAVEINTERVAL = 1000, - xwID_ANY - }; - - wxNotebook* m_notebook1; - wxPanel* m_panel1; - wxStaticText* m_staticText2; - wxChoice* m_choiceUnits; - wxStaticText* m_staticText3; - wxChoice* m_choiceGridSize; - wxStaticText* m_staticGridUnits; - wxStaticText* m_staticText51; - wxSpinCtrl* m_spinBusWidth; - wxStaticText* m_staticBusWidthUnits; - wxStaticText* m_staticText5; - wxSpinCtrl* m_spinLineWidth; - wxStaticText* m_staticLineWidthUnits; - wxStaticText* m_staticText7; - wxSpinCtrl* m_spinTextSize; - wxStaticText* m_staticTextSizeUnits; - wxStaticText* m_staticText9; - wxSpinCtrl* m_spinRepeatHorizontal; - wxStaticText* m_staticRepeatXUnits; - wxStaticText* m_staticText12; - wxSpinCtrl* m_spinRepeatVertical; - wxStaticText* m_staticRepeatYUnits; - wxStaticText* m_staticText16; - wxSpinCtrl* m_spinRepeatLabel; - wxStaticText* m_staticText221; - wxSpinCtrl* m_spinAutoSaveInterval; - wxStaticText* m_staticText23; - wxCheckBox* m_checkShowGrid; - wxCheckBox* m_checkShowHiddenPins; - wxCheckBox* m_checkEnableZoomNoCenter; - wxCheckBox* m_checkEnableMiddleButtonPan; - wxCheckBox* m_checkMiddleButtonPanLimited; - wxCheckBox* m_checkAutoPan; - wxCheckBox* m_checkHVOrientation; - wxCheckBox* m_checkPageLimits; - wxPanel* m_panel2; - wxStaticText* m_staticText211; - wxStaticText* m_staticText15; - wxTextCtrl* m_fieldName1; - wxStaticText* m_staticText161; - wxTextCtrl* m_fieldName2; - wxStaticText* m_staticText17; - wxTextCtrl* m_fieldName3; - wxStaticText* m_staticText18; - wxTextCtrl* m_fieldName4; - wxStaticText* m_staticText19; - wxTextCtrl* m_fieldName5; - wxStaticText* m_staticText20; - wxTextCtrl* m_fieldName6; - wxStaticText* m_staticText21; - wxTextCtrl* m_fieldName7; - wxStaticText* m_staticText22; - wxTextCtrl* m_fieldName8; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); } - virtual void OnMiddleBtnPanEnbl( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_EESCHEMA_OPTIONS_BASE(); - -}; - -#endif //__DIALOG_EESCHEMA_OPTIONS_BASE_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 8 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_EESCHEMA_OPTIONS_BASE_H__ +#define __DIALOG_EESCHEMA_OPTIONS_BASE_H__ + +#include +#include +#include +class DIALOG_SHIM; + +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_EESCHEMA_OPTIONS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM +{ + DECLARE_EVENT_TABLE() + private: + + // Private event handlers + void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); } + void _wxFB_OnMiddleBtnPanEnbl( wxCommandEvent& event ){ OnMiddleBtnPanEnbl( event ); } + + + protected: + enum + { + ID_M_SPINAUTOSAVEINTERVAL = 1000, + xwID_ANY + }; + + wxNotebook* m_notebook1; + wxPanel* m_panel1; + wxStaticText* m_staticText2; + wxChoice* m_choiceUnits; + wxStaticText* m_staticText3; + wxChoice* m_choiceGridSize; + wxStaticText* m_staticGridUnits; + wxStaticText* m_staticText51; + wxSpinCtrl* m_spinBusWidth; + wxStaticText* m_staticBusWidthUnits; + wxStaticText* m_staticText5; + wxSpinCtrl* m_spinLineWidth; + wxStaticText* m_staticLineWidthUnits; + wxStaticText* m_staticText7; + wxSpinCtrl* m_spinTextSize; + wxStaticText* m_staticTextSizeUnits; + wxStaticText* m_staticText9; + wxSpinCtrl* m_spinRepeatHorizontal; + wxStaticText* m_staticRepeatXUnits; + wxStaticText* m_staticText12; + wxSpinCtrl* m_spinRepeatVertical; + wxStaticText* m_staticRepeatYUnits; + wxStaticText* m_staticText16; + wxSpinCtrl* m_spinRepeatLabel; + wxStaticText* m_staticText221; + wxSpinCtrl* m_spinAutoSaveInterval; + wxStaticText* m_staticText23; + wxStaticText* m_staticText26; + wxTextCtrl* m_textCtrlSeparatorRefId; + wxStaticText* m_staticText27; + wxTextCtrl* m_textCtrlPartFirstId; + wxStaticLine* m_staticline1; + wxCheckBox* m_checkShowGrid; + wxCheckBox* m_checkShowHiddenPins; + wxCheckBox* m_checkEnableZoomNoCenter; + wxCheckBox* m_checkEnableMiddleButtonPan; + wxCheckBox* m_checkMiddleButtonPanLimited; + wxCheckBox* m_checkAutoPan; + wxCheckBox* m_checkHVOrientation; + wxCheckBox* m_checkPageLimits; + wxPanel* m_panel2; + wxStaticText* m_staticText211; + wxStaticText* m_staticText15; + wxTextCtrl* m_fieldName1; + wxStaticText* m_staticText161; + wxTextCtrl* m_fieldName2; + wxStaticText* m_staticText17; + wxTextCtrl* m_fieldName3; + wxStaticText* m_staticText18; + wxTextCtrl* m_fieldName4; + wxStaticText* m_staticText19; + wxTextCtrl* m_fieldName5; + wxStaticText* m_staticText20; + wxTextCtrl* m_fieldName6; + wxStaticText* m_staticText21; + wxTextCtrl* m_fieldName7; + wxStaticText* m_staticText22; + wxTextCtrl* m_fieldName8; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); } + virtual void OnMiddleBtnPanEnbl( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 432,560 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_EESCHEMA_OPTIONS_BASE(); + +}; + +#endif //__DIALOG_EESCHEMA_OPTIONS_BASE_H__ diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp index 4eb91c8c37..de0c635218 100644 --- a/eeschema/dialogs/dialog_print_using_printer.cpp +++ b/eeschema/dialogs/dialog_print_using_printer.cpp @@ -402,7 +402,7 @@ void SCH_PRINTOUT::DrawPage( SCH_SCREEN* aScreen ) aScreen->Draw( panel, dc, GR_DEFAULT_DRAWMODE ); if( printReference ) - parent->TraceWorkSheet( dc, aScreen, GetDefaultLineThickness(), + parent->DrawWorkSheet( dc, aScreen, GetDefaultLineThickness(), IU_PER_MILS, parent->GetScreenDesc() ); g_DrawBgColor = bg_color; diff --git a/eeschema/eeredraw.cpp b/eeschema/eeredraw.cpp index 30b928c99f..88c6329a23 100644 --- a/eeschema/eeredraw.cpp +++ b/eeschema/eeredraw.cpp @@ -60,7 +60,7 @@ void SCH_EDIT_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg ) GetScreen()->Draw( m_canvas, DC, GR_DEFAULT_DRAWMODE ); - TraceWorkSheet( DC, GetScreen(), GetDefaultLineThickness(), IU_PER_MILS, + DrawWorkSheet( DC, GetScreen(), GetDefaultLineThickness(), IU_PER_MILS, GetScreen()->GetFileName() ); #ifdef USE_WX_OVERLAY diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 103b4a0ffa..3d0e730419 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -271,6 +272,9 @@ void SCH_EDIT_FRAME::OnSetOptions( wxCommandEvent& event ) dlg.SetRepeatVertical( g_RepeatStep.y ); dlg.SetRepeatLabel( g_RepeatDeltaLabel ); dlg.SetAutoSaveInterval( GetAutoSaveInterval() / 60 ); + dlg.SetRefIdSeparator( LIB_COMPONENT::GetSubpartIdSeparator( ), + LIB_COMPONENT::GetSubpartFirstId() ); + dlg.SetShowGrid( IsGridVisible() ); dlg.SetShowHiddenPins( m_showAllPins ); dlg.SetEnableMiddleButtonPan( m_canvas->GetEnableMiddleButtonPan() ); diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 9dbbee5395..dced52becf 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -862,8 +862,8 @@ void SCH_EDIT_FRAME::PrintPage( wxDC* aDC, LAYER_MSK aPrintMask, bool aPrintMirr void* aData ) { GetScreen()->Draw( m_canvas, aDC, GR_DEFAULT_DRAWMODE ); - TraceWorkSheet( aDC, GetScreen(), GetDefaultLineThickness(), IU_PER_MILS, - GetScreen()->GetFileName() ); + DrawWorkSheet( aDC, GetScreen(), GetDefaultLineThickness(), IU_PER_MILS, + GetScreen()->GetFileName() ); } diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp index 83a8a6ca97..a05940b672 100644 --- a/gerbview/draw_gerber_screen.cpp +++ b/gerbview/draw_gerber_screen.cpp @@ -106,7 +106,7 @@ void GERBVIEW_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg ) if( IsElementVisible( DCODES_VISIBLE ) ) DrawItemsDCodeID( DC, GR_COPY ); - TraceWorkSheet( DC, screen, 0, IU_PER_MILS, wxEmptyString ); + DrawWorkSheet( DC, screen, 0, IU_PER_MILS, wxEmptyString ); if( m_canvas->IsMouseCaptured() ) m_canvas->CallMouseCapture( DC, wxDefaultPosition, false ); @@ -160,7 +160,7 @@ void GBR_LAYOUT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode, if( (aDrawMode == GR_COPY) || ( aDrawMode == GR_OR ) ) useBufferBitmap = true; #endif - + // these parameters are saved here, because they are modified // and restored later EDA_RECT drawBox = *aPanel->GetClipBox(); diff --git a/include/worksheet.h b/include/worksheet.h index 806c5c7800..450444f060 100644 --- a/include/worksheet.h +++ b/include/worksheet.h @@ -2,11 +2,17 @@ /* worksheet.h */ /***************/ -// Values are in 1/1000 inch +// For page and paper size, values are in 1/1000 inch #ifndef WORKSHEET_H_ #define WORKSHEET_H_ +// Forwadr declarations: +class EDA_DRAW_PANEL; +class TITLE_BLOCK; +class PAGE_INFO; + + struct Ki_WorkSheetData { public: @@ -18,4 +24,37 @@ public: const wxChar* m_Text; }; +/** + * Function DrawPageLayout is a core function to draw the page layout with + * the frame and the basic inscriptions. + * @param aDC The device context. + * @param aCanvas The EDA_DRAW_PANEL to draw into, or NULL if the page + * layout is not drawn into the main panel. + * @param aPageInfo for margins and page siez (in mils). + * @param aPaperFormat The paper size type, for basic inscriptions. + * @param aFullSheetName The sheetpath (full sheet name), for basic inscriptions. + * @param aFileName The file name, for basic inscriptions. + * @param aTitleBlock The sheet title block, for basic inscriptions. + * @param aSheetCount The number of sheets (for basic inscriptions). + * @param aSheetNumber The sheet number (for basic inscriptions). + * @param aPenWidth the pen size The line width for drawing. + * @param aScalar the scale factor to convert from mils to internal units. + * @param aLineColor The color for drawing. + * @param aTextColor The color for inscriptions. + * + * Parameters used in aPageInfo + * - the size of the page layout. + * - the LTmargin The left top margin of the page layout. + * - the RBmargin The right bottom margin of the page layout. + */ +void DrawPageLayout( wxDC* aDC, EDA_DRAW_PANEL * aCanvas, + const PAGE_INFO& aPageInfo, + const wxString& aPaperFormat, + const wxString &aFullSheetName, + const wxString& aFileName, + TITLE_BLOCK& aTitleBlock, + int aSheetCount, int aSheetNumber, + int aPenWidth, double aScalar, + EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ); + #endif // WORKSHEET_H_ diff --git a/include/wxstruct.h b/include/wxstruct.h index f47320cd48..5d4c3a82d7 100644 --- a/include/wxstruct.h +++ b/include/wxstruct.h @@ -696,33 +696,17 @@ public: */ double GetZoom(); - void TraceWorkSheet( wxDC* aDC, BASE_SCREEN* aScreen, int aLineWidth, - double aScale, const wxString &aFilename ); - /** - * Function TraceWorkSheet is a core function for drawing of the page layout with - * the frame and the basic inscriptions. + * Function DrawWorkSheet + * Draws on screen the page layout with the frame and the basic inscriptions. * @param aDC The device context. - * @param aPageSize The size of the page layout. - * @param aLTmargin The left top margin of the page layout. - * @param aRBmargin The right bottom margin of the page layout. - * @param aPaperFormat The paper size type, for basic inscriptions. - * @param aFileName The file name, for basic inscriptions. - * @param aTitleBlock The sheet title block, for basic inscriptions. - * @param aSheetCount The number of sheets (for basic inscriptions). - * @param aSheetNumber The sheet number (for basic inscriptions). - * @param aPenWidth The line width for drawing. - * @param aScalar Scalar to convert from mils to internal units. - * @param aLineColor The color for drawing. - * @param aTextColor The color for inscriptions. + * @param aScreen screen to draw + * @param aLineWidth The pen width to use to draw the layout. + * @param aScale The mils to Iu conversion factor. + * @param aFilename The filename to display in basic inscriptions. */ - void TraceWorkSheet( wxDC* aDC, wxSize& aPageSize, - wxPoint& aLTmargin, wxPoint& aRBmargin, - wxString& aPaperFormat, wxString& aFileName, - TITLE_BLOCK& aTitleBlock, - int aSheetCount, int aSheetNumber, - int aPenWidth, double aScalar, - EDA_COLOR_T aLineColor = RED, EDA_COLOR_T aTextColor = RED ); + void DrawWorkSheet( wxDC* aDC, BASE_SCREEN* aScreen, int aLineWidth, + double aScale, const wxString &aFilename ); /** * Function GetXYSheetReferences diff --git a/pcbnew/printout_controler.cpp b/pcbnew/printout_controler.cpp index 928acd3b98..2a3d4d6f5d 100644 --- a/pcbnew/printout_controler.cpp +++ b/pcbnew/printout_controler.cpp @@ -358,7 +358,7 @@ void BOARD_PRINTOUT_CONTROLLER::DrawPage() } if( m_PrintParams.PrintBorderAndTitleBlock() ) - m_Parent->TraceWorkSheet( dc, screen, m_PrintParams.m_PenDefaultSize, + m_Parent->DrawWorkSheet( dc, screen, m_PrintParams.m_PenDefaultSize, IU_PER_MILS, m_Parent->GetScreenDesc() ); m_Parent->PrintPage( dc, m_PrintParams.m_PrintMaskLayer, printMirror, &m_PrintParams ); diff --git a/pcbnew/tracepcb.cpp b/pcbnew/tracepcb.cpp index 82ad49f011..de5f1d4c05 100644 --- a/pcbnew/tracepcb.cpp +++ b/pcbnew/tracepcb.cpp @@ -68,7 +68,7 @@ void FOOTPRINT_EDIT_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg ) GRSetDrawMode( DC, GR_COPY ); m_canvas->DrawBackGround( DC ); - TraceWorkSheet( DC, screen, 0, IU_PER_MILS, wxEmptyString ); + DrawWorkSheet( DC, screen, 0, IU_PER_MILS, wxEmptyString ); // Redraw the footprints for( MODULE* module = GetBoard()->m_Modules; module; module = module->Next() ) @@ -108,7 +108,7 @@ void PCB_EDIT_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg ) m_canvas->DrawBackGround( DC ); - TraceWorkSheet( DC, GetScreen(), g_DrawDefaultLineThickness, + DrawWorkSheet( DC, GetScreen(), g_DrawDefaultLineThickness, IU_PER_MILS, GetBoard()->GetFileName() ); GetBoard()->Draw( m_canvas, DC, GR_OR | GR_ALLOW_HIGHCONTRAST );