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

Minor fixup to intersheet reference files

This commit is contained in:
Ian McInerney 2020-10-01 22:21:10 +01:00
parent 44b23dd3d1
commit 454c4f1783
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/sch_iref.h
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -31,8 +31,8 @@
#include <macros.h> #include <macros.h>
#include <sch_text.h>
class SCH_TEXT;
class SCH_GLOBALLABEL; class SCH_GLOBALLABEL;
class SCH_IREF : public SCH_TEXT class SCH_IREF : public SCH_TEXT
@ -77,6 +77,10 @@ public:
private: private:
void SetIrefOrientation( LABEL_SPIN_STYLE aSpinStyle ); void SetIrefOrientation( LABEL_SPIN_STYLE aSpinStyle );
// We create a different set parent function for this class, so we hide
// the inherited one.
using EDA_ITEM::SetParent;
std::vector<int> m_refTable; std::vector<int> m_refTable;
SCH_GLOBALLABEL* m_parent; SCH_GLOBALLABEL* m_parent;
int m_ownPageNumber; int m_ownPageNumber;

12
eeschema/schematic_settings.cpp
View File

@ -41,10 +41,10 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
m_TextOffsetRatio( 0.08 ), m_TextOffsetRatio( 0.08 ),
m_PinSymbolSize( DEFAULT_TEXT_SIZE * IU_PER_MILS / 2 ), m_PinSymbolSize( DEFAULT_TEXT_SIZE * IU_PER_MILS / 2 ),
m_JunctionSize( DEFAULT_JUNCTION_DIAM * IU_PER_MILS ), m_JunctionSize( DEFAULT_JUNCTION_DIAM * IU_PER_MILS ),
m_IntersheetsRefShow ( false ), m_IntersheetsRefShow( false ),
m_IntersheetsRefFormatShort (false ), m_IntersheetsRefFormatShort( false ),
m_IntersheetsRefPrefix ( DEFAULT_IREF_PREFIX ), m_IntersheetsRefPrefix( DEFAULT_IREF_PREFIX ),
m_IntersheetsRefSuffix ( DEFAULT_IREF_SUFFIX ), m_IntersheetsRefSuffix( DEFAULT_IREF_SUFFIX ),
m_SpiceAdjustPassiveValues( false ) m_SpiceAdjustPassiveValues( false )
{ {
EESCHEMA_SETTINGS* appSettings = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() ); EESCHEMA_SETTINGS* appSettings = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
@ -71,10 +71,10 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
appSettings ? appSettings->m_Drawing.intersheets_ref_suffix : DEFAULT_IREF_SUFFIX; appSettings ? appSettings->m_Drawing.intersheets_ref_suffix : DEFAULT_IREF_SUFFIX;
m_params.emplace_back( new PARAM<bool>( "drawing.intersheets_ref_show", m_params.emplace_back( new PARAM<bool>( "drawing.intersheets_ref_show",
&m_IntersheetsRefShow, false ) ); &m_IntersheetsRefShow, defaultIntersheetsRefShow ) );
m_params.emplace_back( new PARAM<bool>( "drawing.intersheets_ref_short", m_params.emplace_back( new PARAM<bool>( "drawing.intersheets_ref_short",
&m_IntersheetsRefFormatShort, false ) ); &m_IntersheetsRefFormatShort, defaultIntersheetsRefFormatShort ) );
m_params.emplace_back( new PARAM<wxString>( "drawing.intersheets_ref_prefix", m_params.emplace_back( new PARAM<wxString>( "drawing.intersheets_ref_prefix",
&m_IntersheetsRefPrefix, "[" ) ); &m_IntersheetsRefPrefix, "[" ) );