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

Eeschema: fix sheet minimum size bug. 

Convert minimum sheet width and height definitions from mils to internal
units.

Add comment to sheet minimum width and height definitions to indicate
sizes are in mils.
This commit is contained in:
Wayne Stambaugh 2020-01-22 09:48:34 -05:00
parent 41725e6b07
commit cd768d83c3
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
demos/complex_hierarchy/complex_hierarchy.pro
View File

@ -1,4 +1,4 @@
update=01/01/2020 17:37:30 update=Tue 21 Jan 2020 12:19:00 PM EST
version=1 version=1
last_client=kicad last_client=kicad
[cvpcb] [cvpcb]
@ -254,3 +254,19 @@ uViaDrill=0.2032
dPairWidth=0.4 dPairWidth=0.4
dPairGap=0.35 dPairGap=0.35
dPairViaGap=0.25 dPairViaGap=0.25
[schematic_editor]
version=1
PageLayoutDescrFile=
PlotDirectoryName=
SubpartIdSeparator=0
SubpartFirstId=65
NetFmtName=Pcbnew
SpiceAjustPassiveValues=0
LabSize=50
ERC_WriteFile=0
ERC_TestSimilarLabels=1
ERC_CheckUniqueGlobalLabels=1
ERC_CheckBusDriverConflicts=1
ERC_CheckBusEntryConflicts=1
ERC_CheckBusToBusConflicts=1
ERC_CheckBusToNetConflicts=1

6
eeschema/sch_sheet.cpp
View File

@ -50,7 +50,7 @@ SCH_SHEET::SCH_SHEET( const wxPoint& pos ) :
{ {
m_Layer = LAYER_SHEET; m_Layer = LAYER_SHEET;
m_pos = pos; m_pos = pos;
m_size = wxSize( MIN_SHEET_WIDTH, MIN_SHEET_HEIGHT ); m_size = wxSize( Mils2iu( MIN_SHEET_WIDTH ), Mils2iu( MIN_SHEET_HEIGHT ) );
SetTimeStamp( GetNewTimeStamp() ); SetTimeStamp( GetNewTimeStamp() );
m_sheetNameSize = GetDefaultTextSize(); m_sheetNameSize = GetDefaultTextSize();
m_fileNameSize = GetDefaultTextSize(); m_fileNameSize = GetDefaultTextSize();
@ -264,7 +264,7 @@ bool SCH_SHEET::HasUndefinedPins()
int SCH_SHEET::GetMinWidth() const int SCH_SHEET::GetMinWidth() const
{ {
int width = MIN_SHEET_WIDTH; int width = Mils2iu( MIN_SHEET_WIDTH );
for( size_t i = 0; i < m_pins.size(); i++ ) for( size_t i = 0; i < m_pins.size(); i++ )
{ {
@ -304,7 +304,7 @@ int SCH_SHEET::GetMinWidth() const
int SCH_SHEET::GetMinHeight() const int SCH_SHEET::GetMinHeight() const
{ {
int height = MIN_SHEET_HEIGHT; int height = Mils2iu( MIN_SHEET_HEIGHT );
for( size_t i = 0; i < m_pins.size(); i++ ) for( size_t i = 0; i < m_pins.size(); i++ )
{ {

4
eeschema/sch_sheet.h
View File

@ -39,8 +39,8 @@ class SCH_EDIT_FRAME;
class NETLIST_OBJECT_LIST; class NETLIST_OBJECT_LIST;
#define MIN_SHEET_WIDTH 500 #define MIN_SHEET_WIDTH 500 // Units are mils.
#define MIN_SHEET_HEIGHT 150 #define MIN_SHEET_HEIGHT 150 // Units are mils.
/** /**