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

Move the PARAM_LIST<> specializations for BOM to bom_settings

This commit is contained in:
Marek Roszko 2024-04-13 07:59:25 -04:00
parent eb38932d26
commit 89dd8e1166
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/settings/bom_settings.cpp
View File

@ -244,3 +244,8 @@ std::vector<BOM_FMT_PRESET> BOM_FMT_PRESET::BuiltInPresets()
{ {
return { BOM_FMT_PRESET::CSV(), BOM_FMT_PRESET::TSV(), BOM_FMT_PRESET::Semicolons() }; return { BOM_FMT_PRESET::CSV(), BOM_FMT_PRESET::TSV(), BOM_FMT_PRESET::Semicolons() };
} }
#if !defined( __MINGW32__ )
template class KICOMMON_API PARAM_LIST<struct BOM_PRESET>;
template class KICOMMON_API PARAM_LIST<struct BOM_FMT_PRESET>;
#endif

2
common/settings/parameters.cpp
View File

@ -128,8 +128,6 @@ template class KICOMMON_API PARAM_LIST<double>;
template class KICOMMON_API PARAM_LIST<wxString>; template class KICOMMON_API PARAM_LIST<wxString>;
template class KICOMMON_API PARAM_LIST<KIGFX::COLOR4D>; template class KICOMMON_API PARAM_LIST<KIGFX::COLOR4D>;
//template KICOMMON_API class PARAM_LIST<FILE_INFO_PAIR>; //template KICOMMON_API class PARAM_LIST<FILE_INFO_PAIR>;
template class KICOMMON_API PARAM_LIST<struct BOM_PRESET>;
template class KICOMMON_API PARAM_LIST<struct BOM_FMT_PRESET>;
template class KICOMMON_API PARAM_LIST<GRID>; template class KICOMMON_API PARAM_LIST<GRID>;
template class KICOMMON_API PARAM_SET<wxString>; template class KICOMMON_API PARAM_SET<wxString>;

14
include/settings/bom_settings.h
View File

@ -38,10 +38,10 @@ struct KICOMMON_API BOM_FIELD
}; };
KICOMMON_API bool operator!=( const BOM_FIELD& lhs, const BOM_FIELD& rhs ); KICOMMON_API bool operator!=( const BOM_FIELD& lhs, const BOM_FIELD& rhs );
KICOMMON_API bool operator<( const BOM_FIELD& lhs, const BOM_FIELD& rhs ); KICOMMON_API bool operator<( const BOM_FIELD& lhs, const BOM_FIELD& rhs );
KICOMMON_API void to_json( nlohmann::json& j, const BOM_FIELD& f ); KICOMMON_API void to_json( nlohmann::json& j, const BOM_FIELD& f );
KICOMMON_API void from_json( const nlohmann::json& j, BOM_FIELD& f ); KICOMMON_API void from_json( const nlohmann::json& j, BOM_FIELD& f );
// A complete preset defining a BOM "View" with a list of all the fields to show, // A complete preset defining a BOM "View" with a list of all the fields to show,
@ -67,10 +67,10 @@ struct KICOMMON_API BOM_PRESET
}; };
KICOMMON_API bool operator!=( const BOM_PRESET& lhs, const BOM_PRESET& rhs ); KICOMMON_API bool operator!=( const BOM_PRESET& lhs, const BOM_PRESET& rhs );
KICOMMON_API bool operator<( const BOM_PRESET& lhs, const BOM_PRESET& rhs ); KICOMMON_API bool operator<( const BOM_PRESET& lhs, const BOM_PRESET& rhs );
KICOMMON_API void to_json( nlohmann::json& j, const BOM_PRESET& f ); KICOMMON_API void to_json( nlohmann::json& j, const BOM_PRESET& f );
KICOMMON_API void from_json( const nlohmann::json& j, BOM_PRESET& f ); KICOMMON_API void from_json( const nlohmann::json& j, BOM_PRESET& f );
// A formatting preset, like CSV (Comma Separated Values) // A formatting preset, like CSV (Comma Separated Values)
@ -95,10 +95,12 @@ struct KICOMMON_API BOM_FMT_PRESET
}; };
KICOMMON_API bool operator!=( const BOM_FMT_PRESET& lhs, const BOM_FMT_PRESET& rhs ); KICOMMON_API bool operator!=( const BOM_FMT_PRESET& lhs, const BOM_FMT_PRESET& rhs );
KICOMMON_API bool operator<( const BOM_FMT_PRESET& lhs, const BOM_FMT_PRESET& rhs ); KICOMMON_API bool operator<( const BOM_FMT_PRESET& lhs, const BOM_FMT_PRESET& rhs );
KICOMMON_API void to_json( nlohmann::json& j, const BOM_FMT_PRESET& f ); KICOMMON_API void to_json( nlohmann::json& j, const BOM_FMT_PRESET& f );
KICOMMON_API void from_json( const nlohmann::json& j, BOM_FMT_PRESET& f ); KICOMMON_API void from_json( const nlohmann::json& j, BOM_FMT_PRESET& f );
extern template class APIVISIBLE PARAM_LIST<struct BOM_PRESET>;
extern template class APIVISIBLE PARAM_LIST<struct BOM_FMT_PRESET>;
#endif #endif

5
include/settings/parameters.h
View File

@ -29,7 +29,6 @@
#include <optional> #include <optional>
#include <gal/color4d.h> #include <gal/color4d.h>
#include <settings/json_settings.h> #include <settings/json_settings.h>
#include <settings/bom_settings.h>
#include <settings/grid_settings.h> #include <settings/grid_settings.h>
#include <kicommon.h> #include <kicommon.h>
@ -562,8 +561,6 @@ template class KICOMMON_API PARAM_LIST<bool>;
template class KICOMMON_API PARAM_LIST<int>; template class KICOMMON_API PARAM_LIST<int>;
template class KICOMMON_API PARAM_LIST<double>; template class KICOMMON_API PARAM_LIST<double>;
template class KICOMMON_API PARAM_LIST<KIGFX::COLOR4D>; template class KICOMMON_API PARAM_LIST<KIGFX::COLOR4D>;
template class KICOMMON_API PARAM_LIST<struct BOM_PRESET>;
template class KICOMMON_API PARAM_LIST<struct BOM_FMT_PRESET>;
template class KICOMMON_API PARAM_LIST<GRID>; template class KICOMMON_API PARAM_LIST<GRID>;
template class KICOMMON_API PARAM_LIST<wxString>; template class KICOMMON_API PARAM_LIST<wxString>;
#else #else
@ -571,8 +568,6 @@ extern template class APIVISIBLE PARAM_LIST<bool>;
extern template class APIVISIBLE PARAM_LIST<int>; extern template class APIVISIBLE PARAM_LIST<int>;
extern template class APIVISIBLE PARAM_LIST<double>; extern template class APIVISIBLE PARAM_LIST<double>;
extern template class APIVISIBLE PARAM_LIST<KIGFX::COLOR4D>; extern template class APIVISIBLE PARAM_LIST<KIGFX::COLOR4D>;
extern template class APIVISIBLE PARAM_LIST<struct BOM_PRESET>;
extern template class APIVISIBLE PARAM_LIST<struct BOM_FMT_PRESET>;
extern template class APIVISIBLE PARAM_LIST<GRID>; extern template class APIVISIBLE PARAM_LIST<GRID>;
extern template class APIVISIBLE PARAM_LIST<wxString>; extern template class APIVISIBLE PARAM_LIST<wxString>;
#endif #endif