Commit c9a917ee authored by jean-pierre charras's avatar jean-pierre charras
Browse files

3d viewer: fix a few warning coverity (and a potential bug). fp libs wizard:... 

3d viewer: fix a few warning coverity (and a potential bug). fp libs wizard: make it internationalized, and replace an untranslatable string created by grouping 3 strings by one translatable string.
parent 9a6deaeb

3d-viewer/3d_canvas.cpp

+12 −9
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas ) 
    EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END, EDA_3D_CANVAS::OnPopUpMenu )

END_EVENT_TABLE()



// Define an invalid value for some unsigned int indexes

#define INVALID_INDEX GL_INVALID_VALUE



EDA_3D_CANVAS::EDA_3D_CANVAS( EDA_3D_FRAME* parent, int* attribList ) :

    wxGLCanvas( parent, wxID_ANY, attribList, wxDefaultPosition, wxDefaultSize,
@@ -83,11 +85,10 @@ EDA_3D_CANVAS::EDA_3D_CANVAS( EDA_3D_FRAME* parent, int* attribList ) : 
    m_shadow_init = false;

    // set an invalide value to not yet initialized indexes managing

    // textures created to enhance 3D rendering

    // (they are dummy values but we do not want uninitialized values)

    m_text_pcb = m_text_silk = -1;

    m_text_fake_shadow_front = -1;

    m_text_fake_shadow_back = -1;

    m_text_fake_shadow_board = -1;

    m_text_pcb = m_text_silk = INVALID_INDEX;

    m_text_fake_shadow_front = INVALID_INDEX;

    m_text_fake_shadow_back = INVALID_INDEX;

    m_text_fake_shadow_board = INVALID_INDEX;



    // position of the front and back layers

    // (will be initialized to a better value later)
@@ -141,13 +142,15 @@ void EDA_3D_CANVAS::ClearLists( int aGlList ) 
        m_glLists[ii] = 0;

    }



    if( m_text_fake_shadow_front >= 0 )

    // When m_text_fake_shadow_??? is set to INVALID_INDEX, textures are no yet

    // created.

    if( m_text_fake_shadow_front != INVALID_INDEX )

        glDeleteTextures( 1, &m_text_fake_shadow_front );



    if( m_text_fake_shadow_back >= 0 )

    if( m_text_fake_shadow_back != INVALID_INDEX )

        glDeleteTextures( 1, &m_text_fake_shadow_back );



    if( m_text_fake_shadow_board >= 0 )

    if( m_text_fake_shadow_board != INVALID_INDEX )

        glDeleteTextures( 1, &m_text_fake_shadow_board );



    m_shadow_init = false;

3d-viewer/vrml_aux.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ int ParseVertex( FILE* File, glm::vec3 &dst_vertex ); 
 * parse a float value

 * @param File file to read from

 * @param dst_float destination float

 * @return int - Return the number of floats readed

 * @return int - Return the number of floats readed (0 or 1)

 */

int ParseFloat( FILE* File, float *dst_float );

3d-viewer/vrml_v2_modelparser.cpp

+14 −13
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ VRML2_MODEL_PARSER::VRML2_MODEL_PARSER( S3D_MODEL_PARSER* aModelParser ) 
    m_debugSpacer = "";

    m_counter_DEF_GROUP = 0;

    m_counter_USE_GROUP = 0;

    m_discardLastGeometry = false;

}

pcbnew/dialogs/wizard_add_fplib_base.cpp

+30 −46
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Mar  9 2015)

// C++ code generated with wxFormBuilder (version Jun  5 2014)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -12,7 +12,7 @@ 
WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxBitmap& bitmap, const wxPoint& pos, long style ) 

{

	this->Create( parent, id, title, bitmap, pos, style );

	this->SetSizeHints( wxSize( 720,480 ), wxDefaultSize );

	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );

	

	wxWizardPageSimple* m_wizPage1 = new wxWizardPageSimple( this, NULL, NULL, wxArtProvider::GetBitmap( wxART_HELP_BOOK, wxART_FRAME_ICON ) );

	m_pages.Add( m_wizPage1 );
@@ -28,37 +28,25 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	fgSizer112->SetFlexibleDirection( wxBOTH );

	fgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	

	m_staticText1 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("Welcome to the Add Footprint Libraries Wizard!\n\nPlease select the source for the libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText1 = new wxStaticText( m_wizPage1, wxID_ANY, _("Welcome to the Add Footprint Libraries Wizard!\n\nPlease select the source for the libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText1->Wrap( -1 );

	fgSizer112->Add( m_staticText1, 1, wxALL|wxEXPAND, 5 );

	

	wxBoxSizer* bSizer19;

	bSizer19 = new wxBoxSizer( wxVERTICAL );

	

	m_radioAddLocal = new wxRadioButton( m_wizPage1, wxID_ANY, wxT("Files on my computer"), wxDefaultPosition, wxDefaultSize, 0 );

	m_radioAddLocal = new wxRadioButton( m_wizPage1, wxID_ANY, _("Files on my computer"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer19->Add( m_radioAddLocal, 0, wxALL|wxEXPAND, 5 );

	

	wxBoxSizer* m_sizerGithub;

	m_sizerGithub = new wxBoxSizer( wxHORIZONTAL );

	

	

	bSizer19->Add( m_sizerGithub, 0, wxEXPAND, 5 );

	

	wxGridSizer* gSizer1;

	gSizer1 = new wxGridSizer( 2, 2, 0, 0 );

	

	

	bSizer19->Add( gSizer1, 0, wxEXPAND, 5 );

	

	wxFlexGridSizer* m_githubSizer;

	m_githubSizer = new wxFlexGridSizer( 0, 2, 0, 0 );

	m_githubSizer->SetFlexibleDirection( wxBOTH );

	m_githubSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	

	m_radioAddGithub = new wxRadioButton( m_wizPage1, wxID_ANY, wxT("Github repository"), wxDefaultPosition, wxDefaultSize, 0 );

	m_radioAddGithub = new wxRadioButton( m_wizPage1, wxID_ANY, _("Github repository"), wxDefaultPosition, wxDefaultSize, 0 );

	m_githubSizer->Add( m_radioAddGithub, 0, wxALL|wxEXPAND, 5 );

	

	m_textCtrlGithubURL = new wxTextCtrl( m_wizPage1, wxID_ANY, wxT("http://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, 0 );

	m_textCtrlGithubURL = new wxTextCtrl( m_wizPage1, wxID_ANY, _("http://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, 0 );

	m_textCtrlGithubURL->SetMinSize( wxSize( 300,-1 ) );

	

	m_githubSizer->Add( m_textCtrlGithubURL, 1, wxALL|wxEXPAND, 5 );
@@ -66,7 +54,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	

	m_githubSizer->Add( 0, 0, 1, wxEXPAND, 5 );

	

	m_downloadGithub = new wxCheckBox( m_wizPage1, wxID_ANY, wxT("Save a local copy to:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_downloadGithub = new wxCheckBox( m_wizPage1, wxID_ANY, _("Save a local copy to:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_downloadGithub->SetValue(true); 

	m_githubSizer->Add( m_downloadGithub, 0, wxALL, 5 );
@@ -82,7 +70,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	

	bSizer9->Add( m_downloadDir, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

	

	m_btnBrowse = new wxButton( m_wizPage1, wxID_ANY, wxT("Browse"), wxDefaultPosition, wxDefaultSize, 0 );

	m_btnBrowse = new wxButton( m_wizPage1, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer9->Add( m_btnBrowse, 0, wxALL, 5 );
@@ -91,7 +79,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	

	m_githubSizer->Add( 0, 0, 1, wxEXPAND, 5 );

	

	m_invalidDir = new wxStaticText( m_wizPage1, wxID_ANY, wxT("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, 0 );

	m_invalidDir = new wxStaticText( m_wizPage1, wxID_ANY, _("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, 0 );

	m_invalidDir->Wrap( -1 );

	m_invalidDir->SetForegroundColour( wxColour( 255, 0, 0 ) );
@@ -103,27 +91,23 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	

	fgSizer112->Add( bSizer19, 1, wxEXPAND, 5 );

	

	wxFlexGridSizer* fgSizer12;

	fgSizer12 = new wxFlexGridSizer( 0, 3, 0, 0 );

	fgSizer12->SetFlexibleDirection( wxBOTH );

	fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	

	m_staticText8 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("Visit the official"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText8->Wrap( -1 );

	fgSizer12->Add( m_staticText8, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );

	bSizer1->Add( fgSizer112, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bSizerOfficialRepo;

	bSizerOfficialRepo = new wxBoxSizer( wxHORIZONTAL );

	

	m_hyperlink1 = new wxHyperlinkCtrl( m_wizPage1, wxID_ANY, wxT("Kicad repository on Github"), wxT("https://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );

	fgSizer12->Add( m_hyperlink1, 0, wxTOP|wxBOTTOM, 5 );

	m_bitmapRepo = new wxStaticBitmap( m_wizPage1, wxID_ANY, wxArtProvider::GetBitmap( wxART_INFORMATION, wxART_OTHER ), wxDefaultPosition, wxDefaultSize, 0 );

	bSizerOfficialRepo->Add( m_bitmapRepo, 0, wxALL, 5 );

	

	m_staticText9 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("to find numerous footprint libraries!"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText9->Wrap( -1 );

	fgSizer12->Add( m_staticText9, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5 );

	

	bSizerOfficialRepo->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );

	

	fgSizer112->Add( fgSizer12, 1, wxEXPAND, 5 );

	m_hyperlinkGithubKicad = new wxHyperlinkCtrl( m_wizPage1, wxID_ANY, _("Visit our official Kicad repository on Github and get more libraries"), wxT("https://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );

	bSizerOfficialRepo->Add( m_hyperlinkGithubKicad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

	

	

	bSizer1->Add( fgSizer112, 1, wxEXPAND, 5 );

	bSizer1->Add( bSizerOfficialRepo, 0, wxEXPAND, 5 );

	

	

	m_wizPage1->SetSizer( bSizer1 );
@@ -134,7 +118,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	wxBoxSizer* bSizer8;

	bSizer8 = new wxBoxSizer( wxVERTICAL );

	

	m_staticText7 = new wxStaticText( m_wizPage2_Local, wxID_ANY, wxT("Select files or folders to add:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText7 = new wxStaticText( m_wizPage2_Local, wxID_ANY, _("Select files or folders to add:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText7->Wrap( -1 );

	bSizer8->Add( m_staticText7, 0, wxALL, 5 );
@@ -153,7 +137,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	wxBoxSizer* bSizer111;

	bSizer111 = new wxBoxSizer( wxVERTICAL );

	

	m_staticText112 = new wxStaticText( m_wizPage2_Github, wxID_ANY, wxT("Select Github libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText112 = new wxStaticText( m_wizPage2_Github, wxID_ANY, _("Select Github libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText112->Wrap( -1 );

	bSizer111->Add( m_staticText112, 0, wxALL|wxEXPAND, 5 );
@@ -164,10 +148,10 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	wxBoxSizer* bSizer7;

	bSizer7 = new wxBoxSizer( wxHORIZONTAL );

	

	m_btnSelectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, wxT("Select all"), wxDefaultPosition, wxDefaultSize, 0 );

	m_btnSelectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, _("Select all"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer7->Add( m_btnSelectAllGH, 1, wxALL, 5 );

	

	m_btnUnselectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, wxT("Unselect all"), wxDefaultPosition, wxDefaultSize, 0 );

	m_btnUnselectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, _("Unselect all"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer7->Add( m_btnUnselectAllGH, 1, wxALL, 5 );
@@ -193,14 +177,14 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	wxBoxSizer* bSizer1111;

	bSizer1111 = new wxBoxSizer( wxVERTICAL );

	

	m_staticText1121 = new wxStaticText( m_wizPage3_Review, wxID_ANY, wxT("Review and confirm the changes to the libraries:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText1121 = new wxStaticText( m_wizPage3_Review, wxID_ANY, _("Review and confirm the changes to the libraries:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText1121->Wrap( -1 );

	bSizer1111->Add( m_staticText1121, 0, wxALL|wxEXPAND, 5 );

	

	m_listCtrlReview = new wxDataViewListCtrl( m_wizPage3_Review, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_HORIZ_RULES|wxDV_ROW_LINES|wxDV_VERT_RULES );

	m_dvLibName = m_listCtrlReview->AppendTextColumn( wxT("Library") ); 

	m_dvLibStatus = m_listCtrlReview->AppendTextColumn( wxT("Status") ); 

	m_dvLibFormat = m_listCtrlReview->AppendTextColumn( wxT("Format") ); 

	m_dvLibName = m_listCtrlReview->AppendTextColumn( _("Library") ); 

	m_dvLibStatus = m_listCtrlReview->AppendTextColumn( _("Status") ); 

	m_dvLibFormat = m_listCtrlReview->AppendTextColumn( _("Format") ); 

	bSizer1111->Add( m_listCtrlReview, 1, wxALL|wxEXPAND, 5 );
@@ -213,14 +197,14 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i 
	wxBoxSizer* bSizer12;

	bSizer12 = new wxBoxSizer( wxVERTICAL );

	

	m_staticText12 = new wxStaticText( m_wizPage4_SelectTarget, wxID_ANY, wxT("Where do you wish the new libraries to be added:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12 = new wxStaticText( m_wizPage4_SelectTarget, wxID_ANY, _("Where do you wish the new libraries to be added:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12->Wrap( -1 );

	bSizer12->Add( m_staticText12, 0, wxALL|wxEXPAND, 5 );

	

	m_radioGlobal = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, wxT("To global library configuration (visible by all projects)"), wxDefaultPosition, wxDefaultSize, 0 );

	m_radioGlobal = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, _("To global library configuration (visible by all projects)"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer12->Add( m_radioGlobal, 0, wxALL|wxEXPAND, 5 );

	

	m_radioProject = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, wxT("To the current project only"), wxDefaultPosition, wxDefaultSize, 0 );

	m_radioProject = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, _("To the current project only"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer12->Add( m_radioProject, 0, wxALL|wxEXPAND, 5 );

pcbnew/dialogs/wizard_add_fplib_base.fbp

+197 −304

File changed.

Preview size limit exceeded, changes collapsed.