Eeschema: Fixes and enhancements in BOM list generation and BOM code:

 * remove useless spaces in csv bom file format.
 * remove KICAD_GOST conditionnal compilation and merge KICAD_GOST code with the "normal" code.
 * Csv file format created by KICAD_GOST code is now available for everybody through the BOM dialog options (as it should).
 * fix coding style issues.

eeschema/BOM_lister.h

+/**
+ * @file BOM_lister.h
+ */
+
+/* This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras  jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef _BOM_LISTER_H_
+#define _BOM_LISTER_H_
+
+#include <netlist.h>
+
+
+// A helper class to build item lists for BOM,
+// and write lists on files
+class BOM_LISTER
+{
+private:
+    BOM_LABEL_LIST      m_labelList;            // a list of global and hierarchical labels
+    SCH_REFERENCE_LIST  m_cmplist;              // a flat list of components in the full hierarchy
+    FILE*               m_outFile;              // the output file for BOM generation
+    char                m_separatorSymbol;      // the separator used for csv files ( usually \t ; or , )
+    bool                m_outputFmtCsv;         // true to create Csv files, false to create text lists
+    bool                m_includeSubComponents; // true to list each part
+                                                // of a multiple part per package component
+                                                // false to list only once this kind of component
+    bool                m_csvForm;              // true to print less verbose component list
+                                                // false to print more verbose component list
+    bool                m_groupReferences;      // true to group  in list by reference (when possible,
+                                                // i.e. when other fields have the same value
+                                                // false to list one reference per line
+    bool                m_printLocation;        // true to print component location in list by reference
+    std::vector <int>   m_fieldIDactive;        // list of field IDs to print
+
+public:
+    BOM_LISTER()
+    {
+        m_outFile = NULL;
+        m_separatorSymbol   = '\t';
+        m_outputFmtCsv      = false;
+        m_includeSubComponents = false;
+        m_csvForm = true;
+        m_printLocation     = false;
+        m_groupReferences   = false;
+    }
+
+    // Accessors:
+    void SetGroupReferences( bool aGroupRef )
+    {
+        m_groupReferences = aGroupRef;
+    }
+
+    void SetPrintLocation( bool aPrintLoc )
+    {
+        m_printLocation = aPrintLoc;
+    }
+
+    void SetIncludeSubCmp( bool aIncludeSubCmp )
+    {
+        m_includeSubComponents = aIncludeSubCmp;
+    }
+
+    /**
+     * Function SetCvsFormOn
+     * prepare parameters to create a BOM list in comma separated value (cvs)
+     * @param aSeparator = the character used as "csv" separator
+     * @param aFile = the file to write to (will be closed)
+     */
+    void SetCvsFormOn( char aSeparator )
+    {
+        m_csvForm = true;
+        m_separatorSymbol = aSeparator;
+    }
+
+    /**
+     * Function SetCvsFormOff
+     * prepare parameters to create a BOM list in full text readable mode
+     * (not csv format)
+     */
+    void SetCvsFormOff()
+    {
+        m_csvForm = false;
+    }
+
+    void            AddFieldIdToPrintList( int aFieldId );
+
+    void ClearFieldIdPrintList() { m_fieldIDactive.clear(); }
+
+    /**
+     * Function CreateCsvBOMListByValues
+     * print the list of components, grouped by values:
+     * One line by value. The format is something like:
+     *   value;quantity;references;other fields
+     *   18pF;2;"C404 C405";SM0402
+     *   22nF/25V;4;"C128 C168 C228 C268";SM0402
+     * @param aFile = the file to write to (will be closed)
+     */
+    void            CreateCsvBOMListByValues( FILE* aFile );
+
+    /**
+     * Function PrintGlobalAndHierarchicalLabelsList
+     * print the list of global and hierarchical labels by sheet or by name
+     * @param aSortBySheet = true to print by sheet name order
+     *          false to print by label name order
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    void            PrintGlobalAndHierarchicalLabelsList( FILE* aFile, bool aSortBySheet );
+
+    /**
+     * Function PrintComponentsListByReferenceHumanReadable
+     * print a BOM list in human readable form
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    bool            PrintComponentsListByReferenceHumanReadable( FILE* aFile );
+
+    /**
+     * Function PrintComponentsListByReferenceCsvForm
+     * print the list of components ordered by references. Generate 2 formats:
+     * - full component list in csv form
+     * - "short" component list in csv form, grouped by common fields values
+     *          (mainly component value)
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    bool            PrintComponentsListByReferenceCsvForm( FILE* aFile );
+
+    /**
+     * Function PrintComponentsListByValue
+     * print the list of components, sorted by value, one line per component
+     * not useable for csv format (use CreateCsvBOMListByValues instead)
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    int             PrintComponentsListByValue( FILE* aFile );
+
+private:
+
+    /**
+     * Helper function isFieldPrintable
+     * @return true if the field aFieldId should be printed.
+     * @param aFieldId = the field Id (FOOTPRIN, FIELD4 ...)
+     */
+    bool            isFieldPrintable( int aFieldId );
+
+    /**
+     * Helper function buildGlobalAndHierarchicalLabelsList
+     * Populate m_labelList with global and hierarchical labels
+     * and sheet pins labels
+     */
+    void            buildGlobalAndHierarchicalLabelsList();
+
+    /**
+     * Helper function returnFieldsString
+     * @return a string containing all selected fields texts,
+     * @param aComponent = the schematic component
+     * separated by the csv separator symbol
+     */
+    const wxString  returnFieldsString( SCH_COMPONENT* aComponent );
+
+    /**
+     * Helper function returnURLItemLocation
+     * @param aPathName = the full sheet name of item
+     * @param aPosition = a position (in internal units) to print
+     * @return a formated string to print the full location:
+     * /sheet name/( X Y position)
+     */
+    const wxString  returnURLItemLocation( const wxString&  aPathName,
+                                           wxPoint          aPosition );
+};
+
+#endif    // _BOM_LISTER_H_

eeschema/dialogs/dialog_build_BOM.h

-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog_build_BOM.h
-// Copyright:   GNU license
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file dialog_build_BOM.h
+ */
+
+/* This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 
 #ifndef _DIALOG_BUILD_BOM_H_
 #define _DIALOG_BUILD_BOM_H_
@@ -14,13 +35,12 @@ class EDA_DRAW_FRAME;
 class SCH_COMPONENT;
 class wxConfig;
 
-
 class DIALOG_BUILD_BOM : public DIALOG_BUILD_BOM_BASE
 {
 private:
-    EDA_DRAW_FRAME* m_Parent;
-    wxConfig*       m_Config;
-    wxString        m_ListFileName;     // The full filename of the file report.
+    EDA_DRAW_FRAME* m_parent;
+    wxConfig*       m_config;
+    wxString        m_listFileName;     // The full filename of the file report.
 
 private:
     void    OnRadioboxSelectFormatSelected( wxCommandEvent& event );
@@ -34,19 +54,26 @@ private:
                               char  aExportSeparatorSymbol,
                               bool  aRunBrowser );
 
-    void    GenereListeOfItems( bool aIncludeSubComponents );
+    void    CreatePartsAndLabelsFullList( bool aIncludeSubComponents );
 
     /**
-     * Function CreateExportList
+     * Function CreateSpreadSheetPartsFullList
      * prints a list of components, in a form which can be imported by a
      * spreadsheet.  Form is:
      *  reference; cmp value; \<footprint\>; \<field1\>; ...;
      * Components are sorted by reference
+     * @param aIncludeSubComponents = true to print sub components
+     * @param aPrintLocation = true to print components location
+     *        (only possible when aIncludeSubComponents == true)
+     * @param aGroupRefs = true to group components references, when other fieds
+     *          have the same value
      */
-    void    CreateExportList( bool aIncludeSubComponents );
+    void    CreateSpreadSheetPartsFullList( bool aIncludeSubComponents,
+                                            bool aPrintLocation,
+                                            bool aGroupRefs );
 
     /**
-     * Function CreatePartsList
+     * Function CreateSpreadSheetPartsShortList
      * prints a list of components, in a form which can be imported by a spreadsheet.
      * components having the same value and the same footprint
      * are grouped on the same line
@@ -54,18 +81,7 @@ private:
      *  value; number of components; list of references; \<footprint\>; \<field1\>; ...;
      * list is sorted by values
      */
-    void    CreatePartsList();
-
-    int     PrintComponentsListByRef( FILE* f, SCH_REFERENCE_LIST& aList,
-                                      bool CompactForm, bool aIncludeSubComponents );
-
-    int     PrintComponentsListByVal( FILE* f, SCH_REFERENCE_LIST& aList,
-                                      bool aIncludeSubComponents );
-
-    int     PrintComponentsListByPart( FILE* f, SCH_REFERENCE_LIST& aList,
-                                       bool aIncludeSubComponents );
-
-    wxString PrintFieldData( SCH_COMPONENT* DrawLibItem, bool CompactForm = false );
+    void    CreateSpreadSheetPartsShortList();
 
     bool    IsFieldChecked( int aFieldId );
 

eeschema/dialogs/dialog_build_BOM_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 21 2008)
+// C++ code generated with wxFormBuilder (version Apr 10 2012)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __dialog_build_BOM_base__
-#define __dialog_build_BOM_base__
+#ifndef __DIALOG_BUILD_BOM_BASE_H__
+#define __DIALOG_BUILD_BOM_BASE_H__
 
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-
+#include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/checkbox.h>
 #include <wx/gdicmn.h>
@@ -19,6 +21,7 @@
 #include <wx/sizer.h>
 #include <wx/statbox.h>
 #include <wx/radiobox.h>
+#include <wx/statline.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
 
@@ -27,14 +30,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DIALOG_BUILD_BOM_BASE
 ///////////////////////////////////////////////////////////////////////////////
-class DIALOG_BUILD_BOM_BASE : public wxDialog 
+class DIALOG_BUILD_BOM_BASE : public DIALOG_SHIM
 {
 	private:
 	
 	protected:
 		enum
 		{
-			ID_RADIOBOX_SELECT_FORMAT = 1000,
+			ID_RADIOBOX_SELECT_FORMAT = 1000
 		};
 		
 		wxCheckBox* m_ListCmpbyRefItems;
@@ -45,6 +48,8 @@ class DIALOG_BUILD_BOM_BASE : public wxDialog
 		wxRadioBox* m_OutputFormCtrl;
 		wxRadioBox* m_OutputSeparatorCtrl;
 		wxCheckBox* m_GetListBrowser;
+		wxCheckBox* m_AddLocationField;
+		wxCheckBox* m_AddDatasheetField;
 		wxCheckBox* m_AddFootprintField;
 		wxCheckBox* m_AddField1;
 		wxCheckBox* m_AddField2;
@@ -55,20 +60,22 @@ class DIALOG_BUILD_BOM_BASE : public wxDialog
 		wxCheckBox* m_AddField7;
 		wxCheckBox* m_AddField8;
 		wxCheckBox* m_AddAllFields;
-		
-		wxButton* m_buttonOK;
-		wxButton* m_buttonCANCEL;
+		wxStaticLine* m_staticline1;
+		wxStdDialogButtonSizer* m_sdbSizer;
+		wxButton* m_sdbSizerOK;
+		wxButton* m_sdbSizerCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void OnRadioboxSelectFormatSelected( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnRadioboxSelectFormatSelected( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
-		DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 415,382 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		
+		DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,388 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~DIALOG_BUILD_BOM_BASE();
 	
 };
 
-#endif //__dialog_build_BOM_base__
+#endif //__DIALOG_BUILD_BOM_BASE_H__