diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp index e9f6f3f651..0475ec3c0b 100644 --- a/eeschema/dialogs/dialog_print_using_printer.cpp +++ b/eeschema/dialogs/dialog_print_using_printer.cpp @@ -371,6 +371,7 @@ bool SCH_PRINTOUT::OnPrintPage( int page ) m_parent->SetCurrentSheet( sheetList[ page - 1 ] ); m_parent->GetCurrentSheet().UpdateAllScreenReferences(); m_parent->SetSheetNumberAndCount(); + m_parent->RecomputeIntersheetRefs(); screen = m_parent->GetCurrentSheet().LastScreen(); PrintPage( screen ); m_parent->SetCurrentSheet( oldsheetpath ); @@ -430,7 +431,7 @@ void SCH_PRINTOUT::PrintPage( SCH_SCREEN* aScreen ) COLOR_SETTINGS* theme = mgr.GetColorSettings( cfg->m_Printing.color_theme ); // Change scale factor and offset to print the whole page. - bool printReference = cfg->m_Printing.title_block; + bool printDrawingSheet = cfg->m_Printing.title_block; pageSizeIU = aScreen->GetPageSettings().GetSizeIU( schIUScale.IU_PER_MILS ); FitThisSizeToPaper( pageSizeIU ); @@ -519,7 +520,7 @@ void SCH_PRINTOUT::PrintPage( SCH_SCREEN* aScreen ) renderSettings.SetDefaultFont( cfg->m_Appearance.default_font ); - if( printReference ) + if( printDrawingSheet ) { m_parent->PrintDrawingSheet( &renderSettings, aScreen, aScreen->Schematic()->GetProperties(), schIUScale.IU_PER_MILS, aScreen->GetFileName(), wxEmptyString ); diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index 49b3ab3b7c..9f2e808467 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -376,6 +376,12 @@ void SCH_FIELD::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset */ textpos = GetBoundingBox().Centre() + aOffset; + if( GetParent() && GetParent()->Type() == SCH_GLOBAL_LABEL_T ) + { + SCH_GLOBALLABEL* label = static_cast( GetParent() ); + textpos += label->GetSchematicTextOffset( aSettings ); + } + GRPrintText( DC, textpos, color, GetShownText( true ), orient, GetTextSize(), GR_TEXT_H_ALIGN_CENTER, GR_TEXT_V_ALIGN_CENTER, penWidth, IsItalic(), IsBold(), font );