More comprehensive dialog in netlist plugin interface. Some cleanup

change_log.txt

@@ -4,6 +4,13 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 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>
 ================================================================================
 + 3d-viewer

eeschema/dialog_eeschema_config.h

@@ -40,10 +40,10 @@
 #define ID_DIALOG 10000
 #define SAVE_CFG 10001
 #define FORMAT_NETLIST 10006
-#define DEL_LIB 10002
-#define ADD_LIB 10003
-#define INSERT_LIB 10004
-#define ID_LIST_LIBS 10005
+#define REMOVE_LIB 10009
+#define ADD_LIB 10010
+#define INSERT_LIB 10011
+#define ID_LISTBOX 10012
 #define ID_TEXTCTRL 10007
 #define ID_LIB_PATH_SEL 10008
 #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
     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 );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for DEL_LIB
-    void OnDelLibClick( wxCommandEvent& event );
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for REMOVE_LIB
+    void OnRemoveLibClick( wxCommandEvent& event );
 
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ADD_LIB
     void OnAddLibClick( wxCommandEvent& event );
@@ -124,7 +124,7 @@ public:
 	void ChangeSetup();
 	
 ////@begin KiConfigEeschemaFrame member variables
-    wxRadioBox* m_NetFormatBox;
+    wxListBox* m_NetFormatBox;
     wxStaticBoxSizer* m_FileExtList;
     wxListBox* m_ListLibr;
     wxTextCtrl* m_LibDirCtrl;

eeschema/dialog_set_status.rc

-#include "wx/msw/wx.rc"

eeschema/netform.cpp

@@ -82,21 +82,10 @@ void WriteNetList( WinEDA_SchematicFrame* frame, const wxString& FileNameNL,
         fclose( f );
         break;
 
-    case NET_TYPE_CUSTOM1:
-    case NET_TYPE_CUSTOM2:
-    case NET_TYPE_CUSTOM3:
-    case NET_TYPE_CUSTOM4:
-    case NET_TYPE_CUSTOM5:
-    case NET_TYPE_CUSTOM6:
-    case NET_TYPE_CUSTOM7:
-    case NET_TYPE_CUSTOM8:
-        Write_GENERIC_NetList( frame, FileNameNL );
+     default:
+       Write_GENERIC_NetList( frame, FileNameNL );
         break;
-
-    default:
-        DisplayError( frame, wxT( "WriteNetList() err: Unknown Netlist Format" ) );
-        break;
-    }
+   }
 }
 
 

eeschema/netlist.h

@@ -14,23 +14,15 @@
 #define ISBUS 1
 
 
-/* Indicateurs de type de netliste generee */
+/* Id to select netlist type */
 typedef enum {
-    NET_TYPE_NOT_INIT = 0,
+    NET_TYPE_UNINIT = 0,
     NET_TYPE_PCBNEW,
     NET_TYPE_ORCADPCB2,
     NET_TYPE_CADSTAR,
     NET_TYPE_SPICE,
-    NET_TYPE_CUSTOM1,
-    NET_TYPE_CUSTOM2,
-    NET_TYPE_CUSTOM3,
-    NET_TYPE_CUSTOM4,
-    NET_TYPE_CUSTOM5,
-    NET_TYPE_CUSTOM6,
-    NET_TYPE_CUSTOM7,
-    NET_TYPE_CUSTOM8,
-    NET_TYPE_MAX
-} TypeNetForm;
+    NET_TYPE_CUSTOM1	// NET_TYPE_CUSTOM1 is the first id for user netlist format
+ } TypeNetForm;
 
 
 /* Max pin number per component and footprint */
@@ -119,5 +111,15 @@ eda_global ObjetNetListStruct* g_TabObjNet;
 void    WriteNetList( WinEDA_SchematicFrame* frame, const wxString& FileNameNL, bool use_netnames );
 void    FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );
 
+/** Function ReturnUserNetlistTypeName
+ * to retrieve user netlist type names
+ * @param first = true: return first name of the list, false = return next
+ * @return a wxString : name of the type netlist or empty string
+ * this function must be called first with "first_item" = true
+ * and after with "first_item" = false to get all the other existing netlist names
+ */
+#define CUSTOMPANEL_COUNTMAX 8	// Max number of netlist plugins
+wxString ReturnUserNetlistTypeName( bool first_item );
+
 
 #endif