Solved: B.O.M. generation minor problem or multiple parts per package...

Solved: B.O.M. generation minor problem or multiple parts per package components in complex hierarchies.

change_log.txt

@@ -10,7 +10,6 @@ email address.
 +eeschema:
     Solved netlist problems for multiple parts per package components
     in complex hierarchies.
-    B.O.M. generation still have a minor problem wih this.
 
 
 

eeschema/CMakeLists.txt

@@ -11,6 +11,7 @@ set(EESCHEMA_SRCS
     backanno.cpp
     block.cpp
     block_libedit.cpp
+    build_BOM.cpp
     busentry.cpp
     bus-wire-junction.cpp
     class_drawsheet.cpp

eeschema/dialog_build_BOM.h

@@ -119,8 +119,6 @@ public:
 
 ////@end WinEDA_Build_BOM_Frame event handler declarations
 
-    void GenList();
-
 ////@begin WinEDA_Build_BOM_Frame member function declarations
 
     /// Retrieves bitmap resources
@@ -129,10 +127,17 @@ public:
     /// Retrieves icon resources
     wxIcon GetIconResource( const wxString& name );
 ////@end WinEDA_Build_BOM_Frame member function declarations
-    void GenereListeOfItems(const wxString & FullFileName);
-    void CreateExportList(const wxString & FullFileName);
-    int PrintListeCmpByRef( FILE * f, ListComponent * List, int NbItems, bool CompactForm = FALSE );
-    int PrintListeCmpByVal( FILE *f, ListComponent * List, int NbItems);
+
+    void Create_BOM_Lists(bool aTypeFileIsExport,
+                          bool aIncludeSubComponents,
+                          char aExportSeparatorSymbol,
+                          bool aRunBrowser);
+    void GenereListeOfItems(const wxString & FullFileName, bool aIncludeSubComponents );
+    void CreateExportList(const wxString & FullFileName, bool aIncludeSubComponents);
+    int PrintListeCmpByRef( FILE * f, ListComponent * List, int NbItems,
+                            bool CompactForm, bool aIncludeSubComponents );
+    int PrintListeCmpByVal( FILE *f, ListComponent * List, int NbItems,
+                            bool aIncludeSubComponents);
     void PrintFieldData(FILE * f, SCH_COMPONENT * DrawLibItem, bool CompactForm = FALSE);
     void SavePreferences();
 

eeschema/makefile.include

@@ -71,7 +71,9 @@ OBJECTS = eeschema.o\
 		plot.o libalias.o \
 		plotps.o netform.o \
 		delsheet.o \
-		delete.o dialog_build_BOM.o \
+		delete.o\
+        build_BOM.o \
+        dialog_build_BOM.o \
 		erc.o\
 		dialog_erc.o\
 		selpart.o \

eeschema/netlist.h

@@ -95,19 +95,20 @@ typedef struct ListLabel
 {
     int   m_LabelType;
     void* m_Label;
-    char  m_SheetPath[64];
+    char  m_SheetPath[256];
 } ListLabel;
 
+// Used to create lists of components BOM, netlist generation)
 typedef struct ListComponent
 {
-    SCH_COMPONENT* m_Comp;
-    char           m_Ref[32];
-
+    SCH_COMPONENT* m_Comp;      // pointer on the component in schematic
+    char           m_Ref[32];   // component reference
+    int            m_Unit;      // Unit value, for multiple parts per package
     //have to store it here since the object references will be duplicated.
     DrawSheetPath m_SheetList; //composed of UIDs
 } ListComponent;
 
-/* Structure decrivant 1 composant de la schematique (pour *annotation* ) */
+/* Structure decrivant 1 composant de la schematique (for annotation ) */
 struct CmpListStruct
 {
 public:
@@ -123,7 +124,7 @@ public:
     int            m_NumRef;                            /* Numero de reference */
     int            m_Flag;                              /* flag pour calculs internes */
     wxPoint        m_Pos;                               /* position components */
-    char           m_Path[128];                         // the 'path' of the object in the sheet hierarchy.
+    char           m_Path[256];                         // the 'path' of the object in the sheet hierarchy.
 };