Fiw a few compil and Coverity warnings.
This commit is contained in:
parent
b6c0a3f60c
commit
a568e4f4d3
|
@ -39,6 +39,7 @@
|
||||||
BITMAP_BASE::BITMAP_BASE( const VECTOR2I& pos )
|
BITMAP_BASE::BITMAP_BASE( const VECTOR2I& pos )
|
||||||
{
|
{
|
||||||
m_scale = 1.0; // 1.0 = original bitmap size
|
m_scale = 1.0; // 1.0 = original bitmap size
|
||||||
|
m_imageType = wxBITMAP_TYPE_INVALID;
|
||||||
m_bitmap = nullptr;
|
m_bitmap = nullptr;
|
||||||
m_image = nullptr;
|
m_image = nullptr;
|
||||||
m_originalImage = nullptr;
|
m_originalImage = nullptr;
|
||||||
|
|
|
@ -42,6 +42,7 @@ enum TEXT_VAR_GRID_COLUMNS
|
||||||
PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject ) :
|
PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject ) :
|
||||||
PANEL_TEXT_VARIABLES_BASE( aParent ),
|
PANEL_TEXT_VARIABLES_BASE( aParent ),
|
||||||
m_project( aProject ),
|
m_project( aProject ),
|
||||||
|
m_lastCheckedTicker( 0 ),
|
||||||
m_errorRow( -1 ), m_errorCol( -1 ),
|
m_errorRow( -1 ), m_errorCol( -1 ),
|
||||||
m_gridWidthsDirty( true )
|
m_gridWidthsDirty( true )
|
||||||
{
|
{
|
||||||
|
|
|
@ -718,7 +718,7 @@ void FIELDS_GRID_TABLE<T>::SetValue( int aRow, int aCol, const wxString &aValue
|
||||||
|
|
||||||
case FDC_H_ALIGN:
|
case FDC_H_ALIGN:
|
||||||
{
|
{
|
||||||
GR_TEXT_H_ALIGN_T horizontalJustification;
|
GR_TEXT_H_ALIGN_T horizontalJustification = GR_TEXT_H_ALIGN_CENTER;
|
||||||
|
|
||||||
if( value == _( "Left" ) )
|
if( value == _( "Left" ) )
|
||||||
horizontalJustification = GR_TEXT_H_ALIGN_LEFT;
|
horizontalJustification = GR_TEXT_H_ALIGN_LEFT;
|
||||||
|
@ -742,7 +742,7 @@ void FIELDS_GRID_TABLE<T>::SetValue( int aRow, int aCol, const wxString &aValue
|
||||||
|
|
||||||
case FDC_V_ALIGN:
|
case FDC_V_ALIGN:
|
||||||
{
|
{
|
||||||
GR_TEXT_V_ALIGN_T verticalJustification;
|
GR_TEXT_V_ALIGN_T verticalJustification = GR_TEXT_V_ALIGN_BOTTOM;
|
||||||
|
|
||||||
if( value == _( "Top" ) )
|
if( value == _( "Top" ) )
|
||||||
verticalJustification = GR_TEXT_V_ALIGN_TOP;
|
verticalJustification = GR_TEXT_V_ALIGN_TOP;
|
||||||
|
|
|
@ -275,6 +275,7 @@ ASCH_LABEL::ASCH_LABEL( const std::map<wxString, wxString>& aProps ) :
|
||||||
|
|
||||||
text = ALTIUM_PARSER::ReadString( aProps, "TEXT", "" );
|
text = ALTIUM_PARSER::ReadString( aProps, "TEXT", "" );
|
||||||
|
|
||||||
|
textColor = 0;
|
||||||
fontId = ALTIUM_PARSER::ReadInt( aProps, "FONTID", 0 );
|
fontId = ALTIUM_PARSER::ReadInt( aProps, "FONTID", 0 );
|
||||||
isMirrored = ALTIUM_PARSER::ReadBool( aProps, "ISMIRRORED", false );
|
isMirrored = ALTIUM_PARSER::ReadBool( aProps, "ISMIRRORED", false );
|
||||||
|
|
||||||
|
|
|
@ -466,8 +466,6 @@ struct ASCH_ROUND_RECTANGLE : ASCH_OWNER_INTERFACE, ASCH_FILL_INTERFACE, ASCH_BO
|
||||||
|
|
||||||
VECTOR2I CornerRadius;
|
VECTOR2I CornerRadius;
|
||||||
|
|
||||||
bool IsTransparent;
|
|
||||||
|
|
||||||
explicit ASCH_ROUND_RECTANGLE( const std::map<wxString, wxString>& aProps );
|
explicit ASCH_ROUND_RECTANGLE( const std::map<wxString, wxString>& aProps );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -516,7 +514,6 @@ struct ASCH_SIGNAL_HARNESS : ASCH_OWNER_INTERFACE
|
||||||
std::vector<VECTOR2I> Points;
|
std::vector<VECTOR2I> Points;
|
||||||
|
|
||||||
int Color;
|
int Color;
|
||||||
int indexinsheet;
|
|
||||||
int LineWidth;
|
int LineWidth;
|
||||||
|
|
||||||
explicit ASCH_SIGNAL_HARNESS( const std::map<wxString, wxString>& aProps );
|
explicit ASCH_SIGNAL_HARNESS( const std::map<wxString, wxString>& aProps );
|
||||||
|
@ -546,7 +543,6 @@ struct ASCH_HARNESS_ENTRY : ASCH_OWNER_INTERFACE
|
||||||
int AreaColor;
|
int AreaColor;
|
||||||
int Color;
|
int Color;
|
||||||
int DistanceFromTop;
|
int DistanceFromTop;
|
||||||
int indexinsheet;
|
|
||||||
int TextColor;
|
int TextColor;
|
||||||
int TextFontID;
|
int TextFontID;
|
||||||
int TextStyle;
|
int TextStyle;
|
||||||
|
@ -563,7 +559,6 @@ struct ASCH_HARNESS_ENTRY : ASCH_OWNER_INTERFACE
|
||||||
struct ASCH_HARNESS_TYPE : ASCH_OWNER_INTERFACE
|
struct ASCH_HARNESS_TYPE : ASCH_OWNER_INTERFACE
|
||||||
{
|
{
|
||||||
int Color;
|
int Color;
|
||||||
int indexinsheet;
|
|
||||||
int FontID;
|
int FontID;
|
||||||
|
|
||||||
bool IsHidden;
|
bool IsHidden;
|
||||||
|
@ -582,8 +577,6 @@ struct ASCH_RECTANGLE : ASCH_OWNER_INTERFACE, ASCH_FILL_INTERFACE, ASCH_BORDER_I
|
||||||
VECTOR2I BottomLeft;
|
VECTOR2I BottomLeft;
|
||||||
VECTOR2I TopRight;
|
VECTOR2I TopRight;
|
||||||
|
|
||||||
bool IsTransparent;
|
|
||||||
|
|
||||||
explicit ASCH_RECTANGLE( const std::map<wxString, wxString>& aProps );
|
explicit ASCH_RECTANGLE( const std::map<wxString, wxString>& aProps );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue