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

Cvpcb: rename files: fix names in files and remove a old file not used.

This commit is contained in:
jean-pierre charras 2018-01-28 09:51:28 +01:00
parent 56d970b90f
commit 19e3815c85
17 changed files with 48 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cvpcb/CMakeLists.txt
View File

@ -38,14 +38,14 @@ set( CVPCB_SRCS
../pcbnew/board_items_to_polygon_shape_transform.cpp ../pcbnew/board_items_to_polygon_shape_transform.cpp
../pcbnew/pcb_general_settings.cpp ../pcbnew/pcb_general_settings.cpp
../pcbnew/class_drc_item.cpp ../pcbnew/class_drc_item.cpp
autosel.cpp auto_associate.cpp
cfg.cpp cfg.cpp
class_components_listbox.cpp components_listbox.cpp
class_DisplayFootprintsFrame.cpp display_footprints_frame.cpp
class_footprints_listbox.cpp footprints_listbox.cpp
class_library_listbox.cpp library_listbox.cpp
cvpcb_mainframe.cpp cvpcb_mainframe.cpp
listboxes.cpp listbox_base.cpp
menubar.cpp menubar.cpp
readwrite_dlgs.cpp readwrite_dlgs.cpp
tool_cvpcb.cpp tool_cvpcb.cpp

8
cvpcb/auto_associate.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -22,7 +22,7 @@
*/ */
/** /**
* @file autosel.cpp * @file auto_associate.cpp
*/ */
// This file handle automatic selection of footprints, from .equ files which give // This file handle automatic selection of footprints, from .equ files which give
@ -42,8 +42,8 @@
#include <cvpcb.h> #include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <listview_classes.h> #include <listboxes.h>
#include <autosel.h> #include <auto_associate.h>
#define QUOTE '\'' #define QUOTE '\''

8
cvpcb/auto_associate.h
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -21,8 +21,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef AUTOSEL_H #ifndef AUTO_ASSOCIATE_H
#define AUTOSEL_H #define AUTO_ASSOCIATE_H
// A helper class to handle info read in .equ files, which gives a footprint LIB_ID // A helper class to handle info read in .equ files, which gives a footprint LIB_ID
// corresponding to a component value. // corresponding to a component value.
@ -42,4 +42,4 @@ public:
typedef boost::ptr_vector< FOOTPRINT_EQUIVALENCE > FOOTPRINT_EQUIVALENCE_LIST; typedef boost::ptr_vector< FOOTPRINT_EQUIVALENCE > FOOTPRINT_EQUIVALENCE_LIST;
#endif // ifndef AUTOSEL_H #endif // ifndef AUTO_ASSOCIATE_H

2
cvpcb/cfg.cpp
View File

@ -39,7 +39,7 @@
#include <cvpcb.h> #include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <class_DisplayFootprintsFrame.h> #include <display_footprints_frame.h>
PARAM_CFG_ARRAY& CVPCB_MAINFRAME::GetProjectFileParameters() PARAM_CFG_ARRAY& CVPCB_MAINFRAME::GetProjectFileParameters()

4
cvpcb/components_listbox.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -30,7 +30,7 @@
#include <cvpcb.h> #include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <listview_classes.h> #include <listboxes.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>

10
cvpcb/cvpcb.h
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2007 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -25,10 +25,8 @@
#ifndef __CVPCB_H__ #ifndef __CVPCB_H__
#define __CVPCB_H__ #define __CVPCB_H__
// config for footprints doc file access // Define print format to display a schematic component line. format:
#define DEFAULT_FOOTPRINTS_LIST_FILENAME wxT( "footprints_doc/footprints.pdf" ) // idx reference - value : footprint_id
// Define print format to display a schematic component line
#define CMP_FORMAT wxT( "%3d %8s - %16s : %s" ) #define CMP_FORMAT wxT( "%3d %8s - %16s : %s" )
extern const wxString EquFileExtension; extern const wxString EquFileExtension;

20
cvpcb/cvpcb_mainframe.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2011-2016 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011-2016 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
@ -45,9 +45,9 @@
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <cvpcb.h> #include <cvpcb.h>
#include <listview_classes.h> #include <listboxes.h>
#include <invoke_pcb_dialog.h> #include <invoke_pcb_dialog.h>
#include <class_DisplayFootprintsFrame.h> #include <display_footprints_frame.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>
@ -57,11 +57,9 @@ wxSize const FRAME_DEFAULT_SIZE_DU( 500, 250 );
///@{ ///@{
/// \ingroup config /// \ingroup config
/// Nonzero iff cvpcb should be kept open after saving files /// Nonzero if cvpcb should be kept open after saving association in schematic
static const wxString KeepCvpcbOpenEntry = "KeepCvpcbOpen"; static const wxString KeepCvpcbOpenEntry = "KeepCvpcbOpen";
static const wxString FootprintDocFileEntry = "footprints_doc_file";
static const wxString FilterFootprintEntry = "FilterFootprint"; static const wxString FilterFootprintEntry = "FilterFootprint";
///@} ///@}
@ -128,13 +126,6 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_tcFilterString = NULL; m_tcFilterString = NULL;
m_FootprintsList = FOOTPRINT_LIST::GetInstance( Kiway() ); m_FootprintsList = FOOTPRINT_LIST::GetInstance( Kiway() );
/* Name of the document footprint list
* usually located in share/modules/footprints_doc
* this is of the responsibility to users to create this file
* if they want to have a list of footprints
*/
m_DocModulesFileName = DEFAULT_FOOTPRINTS_LIST_FILENAME;
// Give an icon // Give an icon
wxIcon icon; wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_cvpcb_xpm ) ); icon.CopyFromBitmap( KiBitmap( icon_cvpcb_xpm ) );
@ -211,8 +202,6 @@ void CVPCB_MAINFRAME::LoadSettings( wxConfigBase* aCfg )
EDA_BASE_FRAME::LoadSettings( aCfg ); EDA_BASE_FRAME::LoadSettings( aCfg );
aCfg->Read( KeepCvpcbOpenEntry, &m_keepCvpcbOpen, true ); aCfg->Read( KeepCvpcbOpenEntry, &m_keepCvpcbOpen, true );
aCfg->Read( FootprintDocFileEntry, &m_DocModulesFileName,
DEFAULT_FOOTPRINTS_LIST_FILENAME );
aCfg->Read( FilterFootprintEntry, &m_filteringOptions, FOOTPRINTS_LISTBOX::UNFILTERED_FP_LIST ); aCfg->Read( FilterFootprintEntry, &m_filteringOptions, FOOTPRINTS_LISTBOX::UNFILTERED_FP_LIST );
} }
@ -222,7 +211,6 @@ void CVPCB_MAINFRAME::SaveSettings( wxConfigBase* aCfg )
EDA_BASE_FRAME::SaveSettings( aCfg ); EDA_BASE_FRAME::SaveSettings( aCfg );
aCfg->Write( KeepCvpcbOpenEntry, m_keepCvpcbOpen ); aCfg->Write( KeepCvpcbOpenEntry, m_keepCvpcbOpen );
aCfg->Write( FootprintDocFileEntry, m_DocModulesFileName );
aCfg->Write( FilterFootprintEntry, m_filteringOptions ); aCfg->Write( FilterFootprintEntry, m_filteringOptions );
} }

7
cvpcb/cvpcb_mainframe.h
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -36,7 +36,7 @@
#include <wxBasePcbFrame.h> #include <wxBasePcbFrame.h>
#include <config_params.h> #include <config_params.h>
#include <autosel.h> #include <auto_associate.h>
#include <memory> #include <memory>
@ -72,7 +72,6 @@ class CVPCB_MAINFRAME : public KIWAY_PLAYER
public: public:
wxArrayString m_ModuleLibNames; wxArrayString m_ModuleLibNames;
wxArrayString m_EquFilesNames; wxArrayString m_EquFilesNames;
wxString m_DocModulesFileName;
std::unique_ptr<FOOTPRINT_LIST> m_FootprintsList; std::unique_ptr<FOOTPRINT_LIST> m_FootprintsList;
protected: protected:

100
cvpcb/dialogs/dialog_cvpcb_config_fbp.h
View File

@ -1,100 +0,0 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 10 2012)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_CVPCB_CONFIG_FBP_H__
#define __DIALOG_CVPCB_CONFIG_FBP_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/listbox.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/textctrl.h>
#include <wx/statline.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_CVPCB_CONFIG_FBP
///////////////////////////////////////////////////////////////////////////////
class DIALOG_CVPCB_CONFIG_FBP : public DIALOG_SHIM
{
private:
protected:
enum
{
ID_ADD_LIB = 1000,
ID_INSERT_LIB,
ID_REMOVE_LIB,
ID_LIB_UP,
ID_LIB_DOWN,
ID_ADD_EQU,
ID_INSERT_EQU,
ID_REMOVE_EQU,
ID_EQU_UP,
ID_EQU_DOWN,
ID_BROWSE_MOD_DOC,
ID_LIB_PATH_SEL,
ID_INSERT_PATH,
ID_REMOVE_PATH
};
wxListBox* m_ListLibr;
wxButton* m_buttonAddLib;
wxButton* m_buttonInsLib;
wxButton* m_buttonRemoveLib;
wxButton* m_buttonLibUp;
wxButton* m_buttonLibDown;
wxListBox* m_ListEquiv;
wxButton* m_buttonAddEqu;
wxButton* m_buttonInsEqu;
wxButton* m_buttonRemoveEqu;
wxButton* m_buttonEquUp;
wxButton* m_buttonEquDown;
wxTextCtrl* m_TextHelpModulesFileName;
wxButton* m_buttonModDoc;
wxListBox* m_listUserPaths;
wxButton* m_buttonAddPath;
wxButton* m_buttonInsPath;
wxButton* m_buttonRemovePath;
wxListBox* m_DefaultLibraryPathslistBox;
wxStaticLine* m_staticline2;
wxStdDialogButtonSizer* m_sdbSizer2;
wxButton* m_sdbSizer2OK;
wxButton* m_sdbSizer2Cancel;
// Virtual event handlers, overide them in your derived class
virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
virtual void OnAddOrInsertLibClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnRemoveLibClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonUpClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonDownClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnBrowseModDocFile( wxCommandEvent& event ) { event.Skip(); }
virtual void OnAddOrInsertPath( wxCommandEvent& event ) { event.Skip(); }
virtual void OnRemoveUserPath( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
public:
DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 570,625 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_CVPCB_CONFIG_FBP();
};
#endif //__DIALOG_CVPCB_CONFIG_FBP_H__

6
cvpcb/dialogs/dialog_display_options.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -31,8 +31,8 @@
#include <common.h> #include <common.h>
#include <cvpcb.h> #include <cvpcb.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <listview_classes.h> #include <listboxes.h>
#include <class_DisplayFootprintsFrame.h> #include <display_footprints_frame.h>
#include <dialog_display_options.h> #include <dialog_display_options.h>

6
cvpcb/display_footprints_frame.cpp
View File

@ -24,7 +24,7 @@
*/ */
/** /**
* @file class_DisplayFootprintsFrame.cpp * @file display_footprints_frame.cpp
*/ */
#include <fctsys.h> #include <fctsys.h>
@ -44,9 +44,9 @@
#include <class_board.h> #include <class_board.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <class_DisplayFootprintsFrame.h> #include <display_footprints_frame.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>
#include <listview_classes.h> #include <listboxes.h>
#include <3d_viewer/eda_3d_viewer.h> #include <3d_viewer/eda_3d_viewer.h>

2
cvpcb/display_footprints_frame.h
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file class_DisplayFootprintsFrame.h * @file display_footprints_frame.h
*/ */

4
cvpcb/footprints_listbox.cpp
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file class_footprints_listbox.cpp * @file footprints_listbox.cpp
* class to display the list of available footprints * class to display the list of available footprints
*/ */
@ -33,7 +33,7 @@
#include <cvpcb.h> #include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <listview_classes.h> #include <listboxes.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>
#include <eda_pattern_match.h> #include <eda_pattern_match.h>
#include <footprint_filter.h> #include <footprint_filter.h>

4
cvpcb/library_listbox.cpp
View File

@ -22,7 +22,7 @@
*/ */
/** /**
* @file class_library_listbox.cpp * @file library_listbox.cpp
* class to display used library and selecting it * class to display used library and selecting it
*/ */
@ -32,7 +32,7 @@
#include <cvpcb.h> #include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <listview_classes.h> #include <listboxes.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>

2
cvpcb/listbox_base.cpp
View File

@ -32,7 +32,7 @@
#include <cvpcb.h> #include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <listview_classes.h> #include <listboxes.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>

10
cvpcb/listboxes.h
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -22,11 +22,11 @@
*/ */
/** /**
* @file listview_classes.h * @file listboxes.h
*/ */
#ifndef CVSTRUCT_H #ifndef LISTBOXES_H
#define CVSTRUCT_H #define LISTBOXES_H
#include <wx/listctrl.h> #include <wx/listctrl.h>
#include <footprint_filter.h> #include <footprint_filter.h>
@ -244,4 +244,4 @@ public:
}; };
#endif //#ifndef CVSTRUCT_H #endif //#ifndef LISTBOXES_H

6
cvpcb/readwrite_dlgs.cpp
View File

@ -5,9 +5,9 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2015 Jean-Pierre Charras, jean-pierre.charras * Copyright (C) 2018 Jean-Pierre Charras, jean-pierre.charras
* Copyright (C) 2011-2016 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011-2016 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -39,7 +39,7 @@
#include <cvpcb.h> #include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <listview_classes.h> #include <listboxes.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <fp_conflict_assignment_selector.h> #include <fp_conflict_assignment_selector.h>