Fix some minor compil and Coverity warnings.
This commit is contained in:
parent
7ed239e740
commit
9f38fa43cd
|
@ -428,7 +428,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_pt
|
||||||
int barThickness = underscoreBBox.GetHeight();
|
int barThickness = underscoreBBox.GetHeight();
|
||||||
|
|
||||||
// Shorten the bar a little so its rounded ends don't make it over-long
|
// Shorten the bar a little so its rounded ends don't make it over-long
|
||||||
double barTrim = barThickness / 2;
|
double barTrim = barThickness / 2.0;
|
||||||
|
|
||||||
VECTOR2I topLeft( aPosition );
|
VECTOR2I topLeft( aPosition );
|
||||||
VECTOR2I topRight( aPosition );
|
VECTOR2I topRight( aPosition );
|
||||||
|
|
|
@ -437,7 +437,6 @@ void SCH_REFERENCE_LIST::Annotate( bool aUseSheetNum, int aSheetIntervalId, int
|
||||||
}
|
}
|
||||||
|
|
||||||
int LastReferenceNumber = 0;
|
int LastReferenceNumber = 0;
|
||||||
int NumberOfUnits, Unit;
|
|
||||||
|
|
||||||
/* calculate index of the first symbol with the same reference prefix
|
/* calculate index of the first symbol with the same reference prefix
|
||||||
* than the current symbol. All symbols having the same reference
|
* than the current symbol. All symbols having the same reference
|
||||||
|
@ -518,9 +517,6 @@ void SCH_REFERENCE_LIST::Annotate( bool aUseSheetNum, int aSheetIntervalId, int
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Annotation of multi-unit parts ( n units per part ) (complex case)
|
|
||||||
NumberOfUnits = ref_unit.GetLibPart()->GetUnitCount();
|
|
||||||
|
|
||||||
// If this symbol is in aLockedUnitMap, copy the annotation to all
|
// If this symbol is in aLockedUnitMap, copy the annotation to all
|
||||||
// symbols that are not it
|
// symbols that are not it
|
||||||
if( lockedList != nullptr )
|
if( lockedList != nullptr )
|
||||||
|
|
|
@ -48,7 +48,8 @@ class NGSPICE_CIRCUIT_MODEL : public NETLIST_EXPORTER_PSPICE, public SIMULATION_
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NGSPICE_CIRCUIT_MODEL( SCHEMATIC_IFACE* aSchematic ) :
|
NGSPICE_CIRCUIT_MODEL( SCHEMATIC_IFACE* aSchematic ) :
|
||||||
NETLIST_EXPORTER_PSPICE( aSchematic )
|
NETLIST_EXPORTER_PSPICE( aSchematic ),
|
||||||
|
m_options( 0 )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
virtual ~NGSPICE_CIRCUIT_MODEL() {}
|
virtual ~NGSPICE_CIRCUIT_MODEL() {}
|
||||||
|
|
|
@ -165,16 +165,17 @@ int SCH_DRAWING_TOOLS::PlaceSymbol( const TOOL_EVENT& aEvent )
|
||||||
auto annotate =
|
auto annotate =
|
||||||
[&] ()
|
[&] ()
|
||||||
{
|
{
|
||||||
EESCHEMA_SETTINGS::PANEL_ANNOTATE& annotate = m_frame->eeconfig()->m_AnnotatePanel;
|
EESCHEMA_SETTINGS::PANEL_ANNOTATE& annotate_panel = m_frame->eeconfig()->m_AnnotatePanel;
|
||||||
SCHEMATIC_SETTINGS& projSettings = m_frame->Schematic().Settings();
|
SCHEMATIC_SETTINGS& projSettings = m_frame->Schematic().Settings();
|
||||||
int annotateStartNum = projSettings.m_AnnotateStartNum;
|
int annotateStartNum = projSettings.m_AnnotateStartNum;
|
||||||
|
|
||||||
if( annotate.automatic )
|
if( annotate_panel.automatic )
|
||||||
{
|
{
|
||||||
NULL_REPORTER reporter;
|
NULL_REPORTER reporter;
|
||||||
m_frame->AnnotateSymbols( ANNOTATE_SELECTION,
|
m_frame->AnnotateSymbols( ANNOTATE_SELECTION,
|
||||||
(ANNOTATE_ORDER_T) annotate.sort_order,
|
(ANNOTATE_ORDER_T) annotate_panel.sort_order,
|
||||||
(ANNOTATE_ALGO_T) annotate.method, annotate.recursive,
|
(ANNOTATE_ALGO_T) annotate_panel.method,
|
||||||
|
annotate_panel.recursive,
|
||||||
annotateStartNum, false, false, reporter, true );
|
annotateStartNum, false, false, reporter, true );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -462,6 +462,8 @@ bool ROUTER::Move( const VECTOR2I& aP, ITEM* endItem )
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue