More comprehensive dialog in netlist plugin interface. Some cleanup (cbb714f9) · Commits · Elphel / kicad-source-mirror

change_log.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,13 @@ Started 2007-June-11
	Please add newer entries at the top, list the date and your name with		Please add newer entries at the top, list the date and your name with
	email address.		email address.

			2007-Nov-10 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
			================================================================================
			+eeschema:
			More comprehensive dialog in netlist plugin interface.
			Eeschema configuration now shows the plugin netlist list


	2007-Nov-09 UPDATE Geoff Harland <gharlandau@yahoo.com.au>		2007-Nov-09 UPDATE Geoff Harland <gharlandau@yahoo.com.au>
	================================================================================		================================================================================
	+ 3d-viewer		+ 3d-viewer

eeschema/dialog_eeschema_config.cpp

+58 −68

Original line number	Original line	Diff line number	Diff line
	@@ -71,9 +71,9 @@ BEGIN_EVENT_TABLE( KiConfigEeschemaFrame, wxDialog )

	EVT_BUTTON( SAVE_CFG, KiConfigEeschemaFrame::OnSaveCfgClick )		EVT_BUTTON( SAVE_CFG, KiConfigEeschemaFrame::OnSaveCfgClick )

	EVT_RADIOBOX( FORMAT_NETLIST, KiConfigEeschemaFrame::OnFormatNetlistSelected )		EVT_LISTBOX( FORMAT_NETLIST, KiConfigEeschemaFrame::OnFormatNetlistSelected )

	EVT_BUTTON( DEL_LIB, KiConfigEeschemaFrame::OnDelLibClick )		EVT_BUTTON( REMOVE_LIB, KiConfigEeschemaFrame::OnRemoveLibClick )

	EVT_BUTTON( ADD_LIB, KiConfigEeschemaFrame::OnAddLibClick )		EVT_BUTTON( ADD_LIB, KiConfigEeschemaFrame::OnAddLibClick )

	@@ -123,7 +123,7 @@ bool KiConfigEeschemaFrame::Create( wxWindow* parent, wxWindowID id, const wxStr
	////@end KiConfigEeschemaFrame member initialisation		////@end KiConfigEeschemaFrame member initialisation

	////@begin KiConfigEeschemaFrame creation		////@begin KiConfigEeschemaFrame creation
	SetExtraStyle(GetExtraStyle()\|wxWS_EX_BLOCK_EVENTS);		SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
	wxDialog::Create( parent, id, caption, pos, size, style );		wxDialog::Create( parent, id, caption, pos, size, style );

	CreateControls();		CreateControls();
	@@ -145,7 +145,7 @@ void KiConfigEeschemaFrame::CreateControls()
	SetFont(*g_DialogFont);		SetFont(*g_DialogFont);

	////@begin KiConfigEeschemaFrame content construction		////@begin KiConfigEeschemaFrame content construction
	// Generated by DialogBlocks, 28/02/2007 15:16:31 (unregistered)		// Generated by DialogBlocks, 10/11/2007 15:23:03 (unregistered)

	KiConfigEeschemaFrame* itemDialog1 = this;		KiConfigEeschemaFrame* itemDialog1 = this;

	@@ -153,76 +153,80 @@ void KiConfigEeschemaFrame::CreateControls()
	itemDialog1->SetSizer(itemBoxSizer2);		itemDialog1->SetSizer(itemBoxSizer2);

	wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);		wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
	itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW\|wxALL, 5);		itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW\|wxALL, 5);

	wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);		wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);
	itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW\|wxALL, 5);		itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW\|wxALL, 5);

	wxButton* itemButton5 = new wxButton( itemDialog1, SAVE_CFG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton5 = new wxButton( itemDialog1, SAVE_CFG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
			if (KiConfigEeschemaFrame::ShowToolTips())
			itemButton5->SetToolTip(_("save current configuration setting in the local .pro file"));
	itemButton5->SetForegroundColour(wxColour(204, 0, 0));		itemButton5->SetForegroundColour(wxColour(204, 0, 0));
	itemBoxSizer4->Add(itemButton5, 0, wxGROW\|wxALL, 5);		itemBoxSizer4->Add(itemButton5, 0, wxGROW\|wxALL, 5);

	itemBoxSizer4->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);		itemBoxSizer4->Add(5, 5, 0, wxGROW\|wxALL, 5);

	wxString m_NetFormatBoxStrings[] = {		wxStaticText* itemStaticText7 = new wxStaticText( itemDialog1, wxID_STATIC, _("NetList Formats:"), wxDefaultPosition, wxDefaultSize, 0 );
	_("PcbNew"),		itemBoxSizer4->Add(itemStaticText7, 0, wxALIGN_LEFT\|wxLEFT\|wxRIGHT\|wxTOP, 5);
	_("&OrcadPcb2"),
	_("&CadStar"),
	_("&Spice"),
	_("Other")
	};
	m_NetFormatBox = new wxRadioBox( itemDialog1, FORMAT_NETLIST, _("NetList Formats:"), wxDefaultPosition, wxDefaultSize, 5, m_NetFormatBoxStrings, 1, wxRA_SPECIFY_COLS );
	m_NetFormatBox->SetSelection(0);
	itemBoxSizer4->Add(m_NetFormatBox, 0, wxGROW\|wxALL, 5);

	itemBoxSizer4->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);		wxArrayString m_NetFormatBoxStrings;
			m_NetFormatBox = new wxListBox( itemDialog1, FORMAT_NETLIST, wxDefaultPosition, wxDefaultSize, m_NetFormatBoxStrings, wxLB_SINGLE );
			itemBoxSizer4->Add(m_NetFormatBox, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);

	wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Files ext:"));		itemBoxSizer4->Add(5, 5, 0, wxGROW\|wxALL, 5);
	m_FileExtList = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxVERTICAL);
	itemBoxSizer4->Add(m_FileExtList, 0, wxGROW\|wxALL, 5);

	wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL);		wxStaticBox* itemStaticBoxSizer10Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Files ext:"));
	itemBoxSizer3->Add(itemBoxSizer10, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);		m_FileExtList = new wxStaticBoxSizer(itemStaticBoxSizer10Static, wxVERTICAL);
			itemBoxSizer4->Add(m_FileExtList, 0, wxGROW\|wxALL, 5);

	wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxHORIZONTAL);		wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
	itemBoxSizer10->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);		itemBoxSizer3->Add(itemBoxSizer11, 1, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);

	wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL);		wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL);
	itemBoxSizer11->Add(itemBoxSizer12, 0, wxALIGN_CENTER_VERTICAL, 5);		itemBoxSizer11->Add(itemBoxSizer12, 1, wxGROW, 5);

	wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);		wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);
	itemBoxSizer12->Add(itemBoxSizer13, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);		itemBoxSizer12->Add(itemBoxSizer13, 0, wxGROW\|wxALL, 5);

	wxButton* itemButton14 = new wxButton( itemDialog1, DEL_LIB, _("Del"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton14 = new wxButton( itemDialog1, REMOVE_LIB, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
			if (KiConfigEeschemaFrame::ShowToolTips())
			itemButton14->SetToolTip(_("Unload the selected library"));
	itemButton14->SetForegroundColour(wxColour(204, 0, 0));		itemButton14->SetForegroundColour(wxColour(204, 0, 0));
	itemBoxSizer13->Add(itemButton14, 0, wxGROW\|wxALL, 5);		itemBoxSizer13->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);

	wxButton* itemButton15 = new wxButton( itemDialog1, ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton15 = new wxButton( itemDialog1, ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
			if (KiConfigEeschemaFrame::ShowToolTips())
			itemButton15->SetToolTip(_("Add a new library after the selected library, add load it"));
	itemButton15->SetForegroundColour(wxColour(0, 128, 0));		itemButton15->SetForegroundColour(wxColour(0, 128, 0));
	itemBoxSizer13->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);		itemBoxSizer13->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);

	wxButton* itemButton16 = new wxButton( itemDialog1, INSERT_LIB, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton16 = new wxButton( itemDialog1, INSERT_LIB, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );
			itemButton16->SetHelpText(_("Add a new library beforer the selected library, add load it"));
			if (KiConfigEeschemaFrame::ShowToolTips())
			itemButton16->SetToolTip(_("Add a new library beforer the selected library, add load it"));
	itemButton16->SetForegroundColour(wxColour(0, 0, 255));		itemButton16->SetForegroundColour(wxColour(0, 0, 255));
	itemBoxSizer13->Add(itemButton16, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);		itemBoxSizer13->Add(itemButton16, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);

	wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);		wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
	itemBoxSizer12->Add(itemBoxSizer17, 0, wxGROW\|wxALL, 5);		itemBoxSizer12->Add(itemBoxSizer17, 1, wxGROW\|wxALL, 5);

	wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Libraries"), wxDefaultPosition, wxDefaultSize, 0 );		wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Libraries"), wxDefaultPosition, wxDefaultSize, 0 );
	itemStaticText18->SetForegroundColour(wxColour(204, 0, 0));		itemStaticText18->SetForegroundColour(wxColour(204, 0, 0));
	itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT\|wxLEFT\|wxRIGHT\|wxADJUST_MINSIZE, 5);		itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT\|wxLEFT\|wxRIGHT\|wxADJUST_MINSIZE, 5);

	wxString* m_ListLibrStrings = NULL;		wxArrayString m_ListLibrStrings;
	m_ListLibr = new wxListBox( itemDialog1, ID_LIST_LIBS, wxDefaultPosition, wxSize(-1, 300), 0, m_ListLibrStrings, wxLB_SINGLE );		m_ListLibr = new wxListBox( itemDialog1, ID_LISTBOX, wxDefaultPosition, wxDefaultSize, m_ListLibrStrings, wxLB_SINGLE );
	itemBoxSizer17->Add(m_ListLibr, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);		itemBoxSizer17->Add(m_ListLibr, 1, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM\|wxADJUST_MINSIZE, 5);

	wxStaticBox* itemStaticBoxSizer20Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Library files path:"));		wxStaticBox* itemStaticBoxSizer20Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Default library file path:"));
	wxStaticBoxSizer* itemStaticBoxSizer20 = new wxStaticBoxSizer(itemStaticBoxSizer20Static, wxHORIZONTAL);		wxStaticBoxSizer* itemStaticBoxSizer20 = new wxStaticBoxSizer(itemStaticBoxSizer20Static, wxHORIZONTAL);
	itemStaticBoxSizer20Static->SetForegroundColour(wxColour(206, 0, 0));		itemStaticBoxSizer20Static->SetForegroundColour(wxColour(206, 0, 0));
	itemBoxSizer2->Add(itemStaticBoxSizer20, 0, wxGROW\|wxALL, 5);		itemBoxSizer2->Add(itemStaticBoxSizer20, 0, wxGROW\|wxALL, 5);

	m_LibDirCtrl = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(350, -1), 0 );		m_LibDirCtrl = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
	itemStaticBoxSizer20->Add(m_LibDirCtrl, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);		if (KiConfigEeschemaFrame::ShowToolTips())
			m_LibDirCtrl->SetToolTip(_("Default path to search libraries which have no absolute path in name,\nor a name which does not start by ./ or ../\nIf void, the default path is kicad/library\n"));
			itemStaticBoxSizer20->Add(m_LibDirCtrl, 1, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);

	wxButton* itemButton22 = new wxButton( itemDialog1, ID_LIB_PATH_SEL, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton22 = new wxButton( itemDialog1, ID_LIB_PATH_SEL, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
	itemStaticBoxSizer20->Add(itemButton22, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);		itemStaticBoxSizer20->Add(itemButton22, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);
	@@ -248,6 +252,19 @@ wxString msg = _("Cmp file Ext: ") + g_NetCmpExtBuffer;
	msg = _("Schematic file Ext: ") + g_SchExtBuffer;		msg = _("Schematic file Ext: ") + g_SchExtBuffer;
	text = new wxStaticText( itemDialog1, -1, msg, wxDefaultPosition, wxDefaultSize, 0 );		text = new wxStaticText( itemDialog1, -1, msg, wxDefaultPosition, wxDefaultSize, 0 );
	m_FileExtList->Add(text, 0, wxALIGN_LEFT\|wxLEFT\|wxRIGHT\|wxADJUST_MINSIZE, 5);		m_FileExtList->Add(text, 0, wxALIGN_LEFT\|wxLEFT\|wxRIGHT\|wxADJUST_MINSIZE, 5);

			wxArrayString NetlistNameItems;
			NetlistNameItems.Add(wxT("Pcbnew"));
			NetlistNameItems.Add(wxT("OrcadPcb2"));
			NetlistNameItems.Add(wxT("CadStar"));
			NetlistNameItems.Add(wxT("Spice"));
			msg = ReturnUserNetlistTypeName( true );
			while ( ! msg.IsEmpty() )
			{
			NetlistNameItems.Add(msg);
			msg = ReturnUserNetlistTypeName( false );
			}
			m_NetFormatBox->InsertItems(NetlistNameItems, 0);
	}		}

	/*!		/*!
	@@ -382,52 +399,25 @@ void KiConfigEeschemaFrame::SetFormatsNetListes()
	/* Adjust the m_NetFormatBox current selection, according to the current netlist format*/		/* Adjust the m_NetFormatBox current selection, according to the current netlist format*/

	{		{
	switch( g_NetFormat )		if ( g_NetFormat > (int)m_NetFormatBox->GetCount() )
	{		g_NetFormat = NET_TYPE_PCBNEW;
	case NET_TYPE_NOT_INIT:		m_NetFormatBox->SetSelection(g_NetFormat - NET_TYPE_PCBNEW);
	case NET_TYPE_PCBNEW:
	m_NetFormatBox->SetSelection(0);
	break;

	case NET_TYPE_ORCADPCB2:
	m_NetFormatBox->SetSelection(1);
	break;

	case NET_TYPE_CADSTAR:
	m_NetFormatBox->SetSelection(2);
	break;

	case NET_TYPE_SPICE:
	m_NetFormatBox->SetSelection(3);
	break;

	default:
	m_NetFormatBox->SetSelection(4);
	break;
	}
	}		}

	/*!		/*!
	* wxEVT_COMMAND_RADIOBOX_SELECTED event handler for FORMAT_NETLIST		* wxEVT_COMMAND_NETLIST_SELECTED event handler for FORMAT_NETLIST
	*/		*/

	void KiConfigEeschemaFrame::OnFormatNetlistSelected( wxCommandEvent& event )		void KiConfigEeschemaFrame::OnFormatNetlistSelected( wxCommandEvent& event )
	{		{
	int ii;		g_NetFormat = m_NetFormatBox->GetSelection() + NET_TYPE_PCBNEW;

	ii = m_NetFormatBox->GetSelection();
	if ( ii == 0 ) g_NetFormat = NET_TYPE_PCBNEW;
	if ( ii == 1 ) g_NetFormat = NET_TYPE_ORCADPCB2;
	else if ( ii == 2 ) g_NetFormat = NET_TYPE_CADSTAR;
	else if ( ii == 3 ) g_NetFormat = NET_TYPE_SPICE;
	else if ( g_NetFormat < NET_TYPE_CUSTOM1 ) g_NetFormat = NET_TYPE_CUSTOM1;
	}		}

	/*!		/*!
	* wxEVT_COMMAND_BUTTON_CLICKED event handler for DEL_LIB		* wxEVT_COMMAND_BUTTON_CLICKED event handler for DEL_LIB
	*/		*/

	void KiConfigEeschemaFrame::OnDelLibClick( wxCommandEvent& event )		void KiConfigEeschemaFrame::OnRemoveLibClick( wxCommandEvent& event )
	{		{
	LibDelFct(event);		LibDelFct(event);
	}		}

eeschema/dialog_eeschema_config.h

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -40,10 +40,10 @@
	#define ID_DIALOG 10000		#define ID_DIALOG 10000
	#define SAVE_CFG 10001		#define SAVE_CFG 10001
	#define FORMAT_NETLIST 10006		#define FORMAT_NETLIST 10006
	#define DEL_LIB 10002		#define REMOVE_LIB 10009
	#define ADD_LIB 10003		#define ADD_LIB 10010
	#define INSERT_LIB 10004		#define INSERT_LIB 10011
	#define ID_LIST_LIBS 10005		#define ID_LISTBOX 10012
	#define ID_TEXTCTRL 10007		#define ID_TEXTCTRL 10007
	#define ID_LIB_PATH_SEL 10008		#define ID_LIB_PATH_SEL 10008
	#define SYMBOL_KICONFIGEESCHEMAFRAME_STYLE wxCAPTION\|wxSYSTEM_MENU\|wxCLOSE_BOX\|MAYBE_RESIZE_BORDER		#define SYMBOL_KICONFIGEESCHEMAFRAME_STYLE wxCAPTION\|wxSYSTEM_MENU\|wxCLOSE_BOX\|MAYBE_RESIZE_BORDER
	@@ -89,11 +89,11 @@ public:
	/// wxEVT_COMMAND_BUTTON_CLICKED event handler for SAVE_CFG		/// wxEVT_COMMAND_BUTTON_CLICKED event handler for SAVE_CFG
	void OnSaveCfgClick( wxCommandEvent& event );		void OnSaveCfgClick( wxCommandEvent& event );

	/// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for FORMAT_NETLIST		/// wxEVT_COMMAND_LISTBOX_SELECTED event handler for FORMAT_NETLIST
	void OnFormatNetlistSelected( wxCommandEvent& event );		void OnFormatNetlistSelected( wxCommandEvent& event );

	/// wxEVT_COMMAND_BUTTON_CLICKED event handler for DEL_LIB		/// wxEVT_COMMAND_BUTTON_CLICKED event handler for REMOVE_LIB
	void OnDelLibClick( wxCommandEvent& event );		void OnRemoveLibClick( wxCommandEvent& event );

	/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ADD_LIB		/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ADD_LIB
	void OnAddLibClick( wxCommandEvent& event );		void OnAddLibClick( wxCommandEvent& event );
	@@ -124,7 +124,7 @@ public:
	void ChangeSetup();		void ChangeSetup();

	////@begin KiConfigEeschemaFrame member variables		////@begin KiConfigEeschemaFrame member variables
	wxRadioBox* m_NetFormatBox;		wxListBox* m_NetFormatBox;
	wxStaticBoxSizer* m_FileExtList;		wxStaticBoxSizer* m_FileExtList;
	wxListBox* m_ListLibr;		wxListBox* m_ListLibr;
	wxTextCtrl* m_LibDirCtrl;		wxTextCtrl* m_LibDirCtrl;

eeschema/dialog_eeschema_config.pjd

+530 −345

File changed.

Preview size limit exceeded, changes collapsed.

eeschema/dialog_set_status.pjd

deleted100644 → 0

+0 −1175

File deleted.

Preview size limit exceeded, changes collapsed.

Admin message