minor fixes (Coverity warnings and compil warning)
This commit is contained in:
parent
dc5ae574e2
commit
3b97961ccb
|
@ -50,7 +50,7 @@ enum SEARCH_PATH_GRID_COLUMNS
|
|||
|
||||
DIALOG_CONFIGURE_PATHS::DIALOG_CONFIGURE_PATHS( wxWindow* aParent, FILENAME_RESOLVER* aResolver ) :
|
||||
DIALOG_CONFIGURE_PATHS_BASE( aParent ),
|
||||
m_errorGrid( nullptr ),
|
||||
m_errorGrid( nullptr ), m_errorRow( -1 ), m_errorCol( -1 ),
|
||||
m_resolver( aResolver ),
|
||||
m_gridWidthsDirty( true )
|
||||
{
|
||||
|
|
|
@ -52,6 +52,9 @@ class NET_SELECTOR_COMBOPOPUP : public wxPanel, public wxComboPopup
|
|||
{
|
||||
public:
|
||||
NET_SELECTOR_COMBOPOPUP() :
|
||||
m_filterValidator( nullptr ),
|
||||
m_filterCtrl( nullptr ),
|
||||
m_listBox( nullptr ),
|
||||
m_minPopupWidth( -1 ),
|
||||
m_maxPopupHeight( 1000 ),
|
||||
m_netinfoList( nullptr ),
|
||||
|
|
|
@ -80,12 +80,11 @@ public:
|
|||
virtual void ViewDraw( int aLayer, KIGFX::VIEW* aView ) const override
|
||||
{
|
||||
auto gal = aView->GetGAL();
|
||||
int i;
|
||||
gal->SetTarget( KIGFX::TARGET_NONCACHED );
|
||||
gal->SetIsStroke( true );
|
||||
gal->SetStrokeColor( COLOR4D::WHITE );
|
||||
|
||||
/* for(i=0;i < 100; i++)
|
||||
/* for( int i=0;i < 100; i++ )
|
||||
{
|
||||
gal->SetLineWidth( 10000 );
|
||||
gal->DrawLine( VECTOR2I(0, i * 30000), VECTOR2I(1000000, i * 30000) );
|
||||
|
@ -107,53 +106,52 @@ public:
|
|||
//gal->Rotate( 1.0 / 3.0 * M_PI );
|
||||
for(int step = 10; step < 80; step += 11, k+=100)
|
||||
{
|
||||
for (int i = 0; i < 100; i++)
|
||||
{
|
||||
/*auto p0 = VECTOR2D( k + 100, 100 + i * step );
|
||||
auto p1 = VECTOR2D( k + 100 + step/2, 100 + i * step );
|
||||
auto p2 = VECTOR2D( k + 100 + step/2, 100 + i * step + step/2 );
|
||||
auto p3 = VECTOR2D( k + 100, 100 + i * step + step/2 );
|
||||
auto p4 = VECTOR2D( k + 100, 100 + i * step + step );*/
|
||||
|
||||
for (int i = 0; i < 100; i++)
|
||||
{
|
||||
/*auto p0 = VECTOR2D( k + 100, 100 + i * step );
|
||||
auto p1 = VECTOR2D( k + 100 + step/2, 100 + i * step );
|
||||
auto p2 = VECTOR2D( k + 100 + step/2, 100 + i * step + step/2 );
|
||||
auto p3 = VECTOR2D( k + 100, 100 + i * step + step/2 );
|
||||
auto p4 = VECTOR2D( k + 100, 100 + i * step + step );*/
|
||||
|
||||
auto p0 = VECTOR2D( k + 100, 100 + i * step );
|
||||
auto p1 = VECTOR2D( k + 100 + step/2, 100 + i * step );
|
||||
auto p2 = VECTOR2D( k + 100 + step/2, 100 + i * step + step/2 );
|
||||
auto p3 = VECTOR2D( k + 100, 100 + i * step + step/2 );
|
||||
auto p4 = VECTOR2D( k + 100, 100 + i * step + step );
|
||||
auto p0 = VECTOR2D( k + 100, 100 + i * step );
|
||||
auto p1 = VECTOR2D( k + 100 + step/2, 100 + i * step );
|
||||
auto p2 = VECTOR2D( k + 100 + step/2, 100 + i * step + step/2 );
|
||||
auto p3 = VECTOR2D( k + 100, 100 + i * step + step/2 );
|
||||
auto p4 = VECTOR2D( k + 100, 100 + i * step + step );
|
||||
|
||||
|
||||
screenSpaceLine( gal, p0, p1 , w);
|
||||
screenSpaceLine( gal, p3, p2 , w);
|
||||
screenSpaceLine( gal, p0, p1 , w);
|
||||
screenSpaceLine( gal, p3, p2 , w);
|
||||
|
||||
p0 += VECTOR2D(50, 0);
|
||||
p1 += VECTOR2D(50, 0);
|
||||
p2 += VECTOR2D(50, 0);
|
||||
p3 += VECTOR2D(50, 0);
|
||||
p0 += VECTOR2D(50, 0);
|
||||
p1 += VECTOR2D(50, 0);
|
||||
p2 += VECTOR2D(50, 0);
|
||||
p3 += VECTOR2D(50, 0);
|
||||
|
||||
screenSpaceLine( gal, p0, p3 , w);
|
||||
screenSpaceLine( gal, p1, p2 , w);
|
||||
screenSpaceLine( gal, p0, p3 , w);
|
||||
screenSpaceLine( gal, p1, p2 , w);
|
||||
|
||||
|
||||
/* screenSpaceLine( gal, p1, p2 , w);
|
||||
screenSpaceLine( gal, p2, p3 , w);
|
||||
screenSpaceLine( gal, p3, p4 , w);
|
||||
/* screenSpaceLine( gal, p1, p2 , w);
|
||||
screenSpaceLine( gal, p2, p3 , w);
|
||||
screenSpaceLine( gal, p3, p4 , w);
|
||||
|
||||
std::swap(p0.x, p0.y );
|
||||
std::swap(p1.x, p1.y );
|
||||
std::swap(p2.x, p2.y );
|
||||
std::swap(p3.x, p3.y );
|
||||
std::swap(p4.x, p4.y );
|
||||
std::swap(p0.x, p0.y );
|
||||
std::swap(p1.x, p1.y );
|
||||
std::swap(p2.x, p2.y );
|
||||
std::swap(p3.x, p3.y );
|
||||
std::swap(p4.x, p4.y );
|
||||
|
||||
screenSpaceLine( gal, p0, p1 , w);
|
||||
screenSpaceLine( gal, p1, p2 , w);
|
||||
screenSpaceLine( gal, p2, p3 , w);
|
||||
screenSpaceLine( gal, p3, p4 , w);*/
|
||||
}
|
||||
screenSpaceLine( gal, p0, p1 , w);
|
||||
screenSpaceLine( gal, p1, p2 , w);
|
||||
screenSpaceLine( gal, p2, p3 , w);
|
||||
screenSpaceLine( gal, p3, p4 , w);*/
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
for(i=0;i < 1000; i++)
|
||||
for(int i=0;i < 1000; i++)
|
||||
{
|
||||
int k = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue