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

CADSTAR: Remove wxPoint + improve formatting

This commit is contained in:
Roberto Fernandez Bautista 2023-03-05 15:54:36 +01:00
parent 738b36cf7d
commit c34207b726
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/plugins/cadstar/cadstar_archive_parser.h
View File

@ -27,7 +27,7 @@
#define CADSTAR_ARCHIVE_PARSER_H_ #define CADSTAR_ARCHIVE_PARSER_H_
#include <richio.h> #include <richio.h>
#include <wx/gdicmn.h> #include <wx/string.h>
#include <functional> #include <functional>
#include <map> #include <map>
#include <set> #include <set>
@ -422,7 +422,7 @@ public:
struct TRANSFORM struct TRANSFORM
{ {
virtual wxPoint Apply( POINT aCadstarPoint ) = 0; virtual VECTOR2I Apply( POINT aCadstarPoint ) = 0;
}; };

2
eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2020-2021 Roberto Fernandez Bautista <roberto.fer.bau@gmail.com> * Copyright (C) 2020-2021 Roberto Fernandez Bautista <roberto.fer.bau@gmail.com>
* Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2020-2023 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License as published by the

37
eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h
View File

@ -31,14 +31,18 @@
#include <layer_ids.h> // SCH_LAYER_ID #include <layer_ids.h> // SCH_LAYER_ID
#include <plotters/plotter.h> // PLOT_DASH_TYPE #include <plotters/plotter.h> // PLOT_DASH_TYPE
#include <pin_type.h> // ELECTRICAL_PINTYPE #include <pin_type.h> // ELECTRICAL_PINTYPE
#include <sch_io_mgr.h>
#include <map>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/string.h>
class BUS_ALIAS; class BUS_ALIAS;
class EDA_TEXT; class EDA_TEXT;
class TEXT_SPIN_STYLE; class TEXT_SPIN_STYLE;
class LIB_FIELD; class LIB_FIELD;
class LIB_SYMBOL; class LIB_SYMBOL;
class REPORTER;
class SCH_SYMBOL; class SCH_SYMBOL;
class SCH_ITEM; class SCH_ITEM;
class SCH_FIELD; class SCH_FIELD;
@ -96,23 +100,26 @@ private:
REPORTER* m_reporter; REPORTER* m_reporter;
SCHEMATIC* m_schematic; SCHEMATIC* m_schematic;
SCH_SHEET* m_rootSheet; SCH_SHEET* m_rootSheet;
wxPoint m_designCenter; ///< Used for calculating the required
///< offset to apply to the Cadstar design /**
///< so that it fits in KiCad canvas * Required for calculating the offset to apply to the Cadstar design so that it fits
std::map<LAYER_ID, SCH_SHEET*> m_sheetMap; ///< Map between Cadstar and KiCad Sheets * in the KiCad canvas
std::map<BLOCK_PIN_ID, SCH_HIERLABEL*> */
m_sheetPinMap; ///< Map between Cadstar and KiCad Sheets Pins VECTOR2I m_designCenter;
std::map<PART_ID, LIB_SYMBOL*> m_partMap; ///< Map between Cadstar and KiCad Parts
std::map<LAYER_ID, SCH_SHEET*> m_sheetMap; ///< Cadstar->KiCad Sheets
std::map<BLOCK_PIN_ID, SCH_HIERLABEL*> m_sheetPinMap; ///< Cadstar->KiCad Sheet Pins
std::map<PART_ID, LIB_SYMBOL*> m_partMap; ///< Cadstar->KiCad Parts
std::map<SYMDEF_ID, LIB_SYMBOL*> m_symDefMap; ///< Cadstar->KiCad Loaded Lib Symbols
std::map<SYMBOL_ID, SCH_SYMBOL*> m_powerSymMap; ///< Cadstar->KiCad Loaded Power Symbols
std::map<wxString, LIB_SYMBOL*> m_powerSymLibMap; ///< NetName->KiCad Power Lib Symbol
std::map<SYMBOL_ID, SCH_GLOBALLABEL*> m_globalLabelsMap; ///< Cadstar->KiCad Global Labels
std::map<BUS_ID, std::shared_ptr<BUS_ALIAS>> m_busesMap; ///< Cadstar->KiCad Buses
std::map<PART_ID, TERMINAL_TO_PINNUM_MAP> m_pinNumsMap; ///< Cadstar Part->KiCad Pin number map
std::vector<LIB_SYMBOL*> m_loadedSymbols; ///< Loaded symbols so far std::vector<LIB_SYMBOL*> m_loadedSymbols; ///< Loaded symbols so far
std::map<PART_GATE_ID, SYMDEF_ID> m_partSymbolsMap; ///< Map holding the symbols loaded so far std::map<PART_GATE_ID, SYMDEF_ID> m_partSymbolsMap; ///< Map holding the symbols loaded so far
/// for a particular PART_ID and GATE_ID /// for a particular PART_ID and GATE_ID
std::map<PART_ID, TERMINAL_TO_PINNUM_MAP> m_pinNumsMap; ///< Map of pin numbers in CADSTAR parts
std::map<wxString, LIB_SYMBOL*> m_powerSymLibMap; ///< Map of KiCad Power Symbol Library items
std::map<SYMBOL_ID, SCH_SYMBOL*>
m_powerSymMap; ///< Map between Cadstar and KiCad Power Symbols
std::map<SYMBOL_ID, SCH_GLOBALLABEL*>
m_globalLabelsMap; ///< Map between Cadstar and KiCad Global Labels
std::map<BUS_ID, std::shared_ptr<BUS_ALIAS>> m_busesMap; ///< Map of Cadstar and KiCad Buses
void loadSheets(); void loadSheets();
void loadHierarchicalSheetPins(); void loadHierarchicalSheetPins();