haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp

3455 lines
120 KiB
C++
Raw Normal View History

Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
/*
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017 CERN
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
* Copyright (C) 2017-2023 Kicad Developers, see AUTHORS.txt for contributors.
Eeschema: fix sheet Eagle plugin sheet placement bug. Convert sheet position units from mils to internal units.
2020-01-22 17:26:27 +00:00
*
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
* @author Alejandro García Montoro <alejandro.garciamontoro@gmail.com>
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
* @author Maciej Suminski <maciej.suminski@cern.ch>
* @author Russell Oliver <roliver8143@gmail.com>
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Change the Eagle schematic import plugin license to GPLv3+
2017-09-20 15:06:01 +00:00
* as published by the Free Software Foundation; either version 3
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
* 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, see <http://www.gnu.org/licenses/>.
*/
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
Cleanup: Move Eagle files into plugins folder
2020-10-03 20:48:58 +00:00
#include <sch_plugins/eagle/sch_eagle_plugin.h>
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
Move LOCALE_IO out of common.h
2020-10-24 01:38:50 +00:00
#include <locale_io.h>
Rename PROPERTIES to STRING_UTF8_MAP for clarity This class has nothing to do with the properties system
2022-11-06 16:51:52 +00:00
#include <string_utf8_map.h>
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
#include <algorithm>
#include <memory>
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
#include <wx/filename.h>
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
#include <wx/tokenzr.h>
Use wxFFileInputStream explicitly when loading xml documents wxFFile (FILE, buffered) is better than wxFile (syscalls)
2021-05-03 23:39:56 +00:00
#include <wx/wfstream.h>
Remove wx/xml/xml.h from sch_eagle_plugin.h
2021-06-06 13:34:57 +00:00
#include <wx/xml/xml.h>
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
Rename class_library.[h|cpp] to symbol_library.[h|cpp].
2021-06-15 13:24:55 +00:00
#include <symbol_library.h>
Cleanup: Move Eagle files into plugins folder
2020-10-03 20:48:58 +00:00
#include <plugins/eagle/eagle_parser.h>
Fix kicad_string.h / string.cpp mismatch. They don't define a KiCad string class, so the header file name was somewhat misleading. But the fact that they didn't match definitely made coding more difficult.
2021-07-29 09:56:22 +00:00
#include <string_utils.h>
Shapes for schematic. ADDED arc, circle and rectangle shapes for schematic. Shapes support line styles and fill colors. CHANGED sheet background color in Edit Text & Graphics Properties to fill color (and it now affects shapes). Pushed STROKE_PARAMS down into common and moved all shapes to using it for stroke descriptions.
2021-07-17 19:56:18 +00:00
#include <gr_text.h>
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
#include <lib_shape.h>
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
#include <lib_id.h>
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
#include <lib_pin.h>
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
#include <lib_text.h>
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
#include <project.h>
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
#include <sch_bus_entry.h>
Eeschema: use symbol nomenclature for object file naming.
2021-02-24 13:48:02 +00:00
#include <sch_symbol.h>
Integration of netclasses into Eeschema. This is mostly architecture, with the hookup of the Schematic Setup dialog's Net Classes page. Things like assigning to a net on the canvas to follow. Fixes https://gitlab.com/kicad/code/kicad/issues/2132 Fixes https://gitlab.com/kicad/code/kicad/issues/4581
2020-07-06 10:51:04 +00:00
#include <project/net_settings.h>
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
#include <sch_edit_frame.h>
#include <sch_junction.h>
Cleanup: Move KiCad files into plugins folder
2020-10-05 18:38:40 +00:00
#include <sch_plugins/legacy/sch_legacy_plugin.h>
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
#include <sch_marker.h>
#include <sch_screen.h>
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
#include <sch_shape.h>
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
#include <sch_sheet.h>
#include <sch_sheet_path.h>
Break sch_text.h/.cpp into sch_text and sch_label. Also moves SCH_NETCLASS_FLAG to SCH_DIRECTIVE_LABEL, and remaps Altium harnesses from SCH_TEXT to SCH_DIRECTIVE_LABEL.
2022-01-24 13:40:39 +00:00
#include <sch_label.h>
Move Eeschema globals to new SCHEMATIC object Set up a new lineage for SCH_ITEMS to get back to the SCHEMATIC they live on: Items will all be parented to the SCH_SCREEN that they are added to, and each SCH_SCREEN will point back to the SCHEMATIC that it is part of. Note that this hierarchy is not the same as the actual schematic hierarchy, which continues to be managed through SCH_SHEETs and SCH_SHEET_PATHS.
2020-05-13 02:00:37 +00:00
#include <schematic.h>
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
#include <symbol_lib_table.h>
#include <wildcards_and_files_ext.h>
Decouple PROGRESS_REPORTER interface from implementations.
2021-08-14 20:05:21 +00:00
#include <progress_reporter.h>
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
// Eagle schematic axes are aligned with x increasing left to right and Y increasing bottom to top
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
// KiCad schematic axes are aligned with x increasing left to right and Y increasing top to bottom.
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
Starts the loading layout
2017-03-09 12:49:24 +00:00
using namespace std;
Convert enums inside eeschema and the symbol editor to be scoped Scope: NETLIST_ITEM, CONNECTION_TYPE, ELECTRICAL_PINTYPE, NET_CONNECTION, NETLIST_ITEM, GRAPHIC_PINSHAPE Note, the pin type enum had PT_ added to the front to prevent shadowing of the INPUT symbol on msys2 (see discussion at https://gitlab.com/kicad/code/kicad/commit/c17c9960d83141bd42153dad07dd1025b03c31cb)
2020-01-18 20:51:28 +00:00
/**
* Map of EAGLE pin type values to KiCad pin type values
*/
static const std::map<wxString, ELECTRICAL_PINTYPE> pinDirectionsMap = {
wxT
2022-06-08 17:16:11 +00:00
{ wxT( "sup" ), ELECTRICAL_PINTYPE::PT_POWER_IN },
{ wxT( "pas" ), ELECTRICAL_PINTYPE::PT_PASSIVE },
{ wxT( "out" ), ELECTRICAL_PINTYPE::PT_OUTPUT },
{ wxT( "in" ), ELECTRICAL_PINTYPE::PT_INPUT },
{ wxT( "nc" ), ELECTRICAL_PINTYPE::PT_NC },
{ wxT( "io" ), ELECTRICAL_PINTYPE::PT_BIDI },
{ wxT( "oc" ), ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR },
{ wxT( "hiz" ), ELECTRICAL_PINTYPE::PT_TRISTATE },
{ wxT( "pwr" ), ELECTRICAL_PINTYPE::PT_POWER_IN },
Convert enums inside eeschema and the symbol editor to be scoped Scope: NETLIST_ITEM, CONNECTION_TYPE, ELECTRICAL_PINTYPE, NET_CONNECTION, NETLIST_ITEM, GRAPHIC_PINSHAPE Note, the pin type enum had PT_ added to the front to prevent shadowing of the INPUT symbol on msys2 (see discussion at https://gitlab.com/kicad/code/kicad/commit/c17c9960d83141bd42153dad07dd1025b03c31cb)
2020-01-18 20:51:28 +00:00
};
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
/**
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
* Provide an easy access to the children of an XML node via their names.
*
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
* @param aCurrentNode is a pointer to a wxXmlNode, whose children will be mapped.
* @param aName the name of the specific child names to be counted.
* @return number of children with the give node name.
*/
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
static int countChildren( wxXmlNode* aCurrentNode, const wxString& aName )
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
{
// Map node_name -> node_pointer
int count = 0;
// Loop through all children counting them if they match the given name
aCurrentNode = aCurrentNode->GetChildren();
while( aCurrentNode )
{
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
if( aCurrentNode->GetName() == aName )
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
count++;
// Get next child
aCurrentNode = aCurrentNode->GetNext();
}
return count;
}
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
///< Compute a bounding box for all items in a schematic sheet
Move EDA_ITEM bounding boxes to BOX2I.
2022-08-31 09:15:42 +00:00
static BOX2I getSheetBbox( SCH_SHEET* aSheet )
Eagle SCH import: moved sheet bbox calculation to a function
2018-04-06 11:23:24 +00:00
{
Move EDA_ITEM bounding boxes to BOX2I.
2022-08-31 09:15:42 +00:00
BOX2I bbox;
Eagle SCH import: do not crash if nothing was imported
2018-05-29 07:27:11 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
for( SCH_ITEM* item : aSheet->GetScreen()->Items() )
Eagle SCH import: moved sheet bbox calculation to a function
2018-04-06 11:23:24 +00:00
bbox.Merge( item->GetBoundingBox() );
return bbox;
}
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
///< Extract the net name part from a pin name (e.g. return 'GND' for pin named 'GND@2')
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
static inline wxString extractNetName( const wxString& aPinName )
{
return aPinName.BeforeFirst( '@' );
}
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_SHEET* SCH_EAGLE_PLUGIN::getCurrentSheet()
{
return m_sheetPath.Last();
}
SCH_SCREEN* SCH_EAGLE_PLUGIN::getCurrentScreen()
{
SCH_SHEET* currentSheet = m_sheetPath.Last();
wxCHECK( currentSheet, nullptr );
return currentSheet->GetScreen();
}
Eagle Schematic Import: try harder to generate a meaningful library name The previous implementation relied only on the project name. When it is set, the imported library was named '-eagle-import'. Now it tries the project name and then the file name, using 'noname-eagle-import' as fallback. The library name is stored in the plugin to avoid changing the library name after the project name has been set.
2017-12-12 14:25:49 +00:00
wxString SCH_EAGLE_PLUGIN::getLibName()
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
{
Eagle Schematic Import: try harder to generate a meaningful library name The previous implementation relied only on the project name. When it is set, the imported library was named '-eagle-import'. Now it tries the project name and then the file name, using 'noname-eagle-import' as fallback. The library name is stored in the plugin to avoid changing the library name after the project name has been set.
2017-12-12 14:25:49 +00:00
if( m_libName.IsEmpty() )
{
// Try to come up with a meaningful name
Fix project references in eagle importer after SCHEMATIC object Fixes https://gitlab.com/kicad/code/kicad/-/issues/4672
2020-06-17 21:30:24 +00:00
m_libName = m_schematic->Prj().GetProjectName();
Eagle Schematic Import: try harder to generate a meaningful library name The previous implementation relied only on the project name. When it is set, the imported library was named '-eagle-import'. Now it tries the project name and then the file name, using 'noname-eagle-import' as fallback. The library name is stored in the plugin to avoid changing the library name after the project name has been set.
2017-12-12 14:25:49 +00:00
if( m_libName.IsEmpty() )
{
wxFileName fn( m_rootSheet->GetFileName() );
m_libName = fn.GetName();
}
if( m_libName.IsEmpty() )
wxT
2022-06-08 17:16:11 +00:00
m_libName = wxT( "noname" );
Eagle Schematic Import: try harder to generate a meaningful library name The previous implementation relied only on the project name. When it is set, the imported library was named '-eagle-import'. Now it tries the project name and then the file name, using 'noname-eagle-import' as fallback. The library name is stored in the plugin to avoid changing the library name after the project name has been set.
2017-12-12 14:25:49 +00:00
wxT
2022-06-08 17:16:11 +00:00
m_libName += wxT( "-eagle-import" );
Unify LIB_IDs now that both are stored in sexpr files. Fixes https://gitlab.com/kicad/code/kicad/issues/6764
2020-12-17 23:32:23 +00:00
m_libName = LIB_ID::FixIllegalChars( m_libName, true );
Eagle Schematic Import: try harder to generate a meaningful library name The previous implementation relied only on the project name. When it is set, the imported library was named '-eagle-import'. Now it tries the project name and then the file name, using 'noname-eagle-import' as fallback. The library name is stored in the plugin to avoid changing the library name after the project name has been set.
2017-12-12 14:25:49 +00:00
}
return m_libName;
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
}
Eagle Schematic Import: try harder to generate a meaningful library name The previous implementation relied only on the project name. When it is set, the imported library was named '-eagle-import'. Now it tries the project name and then the file name, using 'noname-eagle-import' as fallback. The library name is stored in the plugin to avoid changing the library name after the project name has been set.
2017-12-12 14:25:49 +00:00
wxFileName SCH_EAGLE_PLUGIN::getLibFileName()
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
{
Fix project references in eagle importer after SCHEMATIC object Fixes https://gitlab.com/kicad/code/kicad/-/issues/4672
2020-06-17 21:30:24 +00:00
wxFileName fn( m_schematic->Prj().GetProjectPath(), getLibName(), KiCadSymbolLibFileExtension );
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
return fn;
}
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
void SCH_EAGLE_PLUGIN::loadLayerDefs( wxXmlNode* aLayers )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
std::vector<ELAYER> eagleLayers;
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
// Get the first layer and iterate
wxXmlNode* layerNode = aLayers->GetChildren();
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
while( layerNode )
{
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
ELAYER elayer( layerNode );
eagleLayers.push_back( elayer );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
layerNode = layerNode->GetNext();
}
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// match layers based on their names
Formatting.
2021-09-20 14:35:45 +00:00
for( const ELAYER& elayer : eagleLayers )
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
{
/**
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
* Layers in KiCad schematics are not actually layers, but abstract groups mainly used to
* decide item colors.
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
*
* <layers>
* <layer number="90" name="Modules" color="5" fill="1" visible="yes" active="yes"/>
* <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
* <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
* <layer number="93" name="Pins" color="2" fill="1" visible="no" active="yes"/>
* <layer number="94" name="Symbols" color="4" fill="1" visible="yes" active="yes"/>
* <layer number="95" name="Names" color="7" fill="1" visible="yes" active="yes"/>
* <layer number="96" name="Values" color="7" fill="1" visible="yes" active="yes"/>
* <layer number="97" name="Info" color="7" fill="1" visible="yes" active="yes"/>
* <layer number="98" name="Guide" color="6" fill="1" visible="yes" active="yes"/>
* </layers>
*/
wxT
2022-06-08 17:16:11 +00:00
if( elayer.name == wxT( "Nets" ) )
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
m_layerMap[elayer.number] = LAYER_WIRE;
wxT
2022-06-08 17:16:11 +00:00
else if( elayer.name == wxT( "Info" ) || elayer.name == wxT( "Guide" ) )
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
m_layerMap[elayer.number] = LAYER_NOTES;
wxT
2022-06-08 17:16:11 +00:00
else if( elayer.name == wxT( "Busses" ) )
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
m_layerMap[elayer.number] = LAYER_BUS;
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
}
}
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
SCH_LAYER_ID SCH_EAGLE_PLUGIN::kiCadLayer( int aEagleLayer )
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
auto it = m_layerMap.find( aEagleLayer );
return it == m_layerMap.end() ? LAYER_NOTES : it->second;
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
// Return the KiCad symbol orientation based on eagle rotation degrees.
static SYMBOL_ORIENTATION_T kiCadComponentRotation( float eagleDegrees )
Eeschema Eagle Plugin: Set Component Orientation
2017-07-06 11:55:41 +00:00
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
int roti = int( eagleDegrees );
Eeschema Eagle Plugin: Set Component Orientation
2017-07-06 11:55:41 +00:00
switch( roti )
{
Share Eagle var substitution between board and schematic importers. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-15 22:26:36 +00:00
case 0: return SYM_ORIENT_0;
case 90: return SYM_ORIENT_90;
case 180: return SYM_ORIENT_180;
case 270: return SYM_ORIENT_270;
Eeschema Eagle Plugin: Set Component Orientation
2017-07-06 11:55:41 +00:00
default:
wxT
2022-06-08 17:16:11 +00:00
wxASSERT_MSG( false, wxString::Format( wxT( "Unhandled orientation (%d degrees)" ), roti ) );
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
return SYM_ORIENT_0;
Eeschema Eagle Plugin: Set Component Orientation
2017-07-06 11:55:41 +00:00
}
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Calculate text alignment based on the given Eagle text alignment parameters.
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
static void eagleToKicadAlignment( EDA_TEXT* aText, int aEagleAlignment, int aRelDegress,
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
bool aMirror, bool aSpin, int aAbsDegress )
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
{
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
int align = aEagleAlignment;
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( aRelDegress == 90 )
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
{
More EDA_ANGLE changes.
2022-01-13 23:30:52 +00:00
aText->SetTextAngle( ANGLE_VERTICAL );
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
}
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
else if( aRelDegress == 180 )
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
align = -align;
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
else if( aRelDegress == 270 )
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
{
More EDA_ANGLE changes.
2022-01-13 23:30:52 +00:00
aText->SetTextAngle( ANGLE_VERTICAL );
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
align = -align;
}
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( aMirror == true )
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( aAbsDegress == 90 || aAbsDegress == 270 )
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
{
if( align == ETEXT::BOTTOM_RIGHT )
align = ETEXT::TOP_RIGHT;
else if( align == ETEXT::BOTTOM_LEFT )
align = ETEXT::TOP_LEFT;
else if( align == ETEXT::TOP_LEFT )
align = ETEXT::BOTTOM_LEFT;
else if( align == ETEXT::TOP_RIGHT )
align = ETEXT::BOTTOM_RIGHT;
}
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
else if( aAbsDegress == 0 || aAbsDegress == 180 )
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
{
if( align == ETEXT::BOTTOM_RIGHT )
align = ETEXT::BOTTOM_LEFT;
else if( align == ETEXT::BOTTOM_LEFT )
align = ETEXT::BOTTOM_RIGHT;
else if( align == ETEXT::TOP_LEFT )
align = ETEXT::TOP_RIGHT;
else if( align == ETEXT::TOP_RIGHT )
align = ETEXT::TOP_LEFT;
else if( align == ETEXT::CENTER_LEFT )
align = ETEXT::CENTER_RIGHT;
else if( align == ETEXT::CENTER_RIGHT )
align = ETEXT::CENTER_LEFT;
}
}
switch( align )
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
{
case ETEXT::CENTER:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_CENTER );
aText->SetVertJustify( GR_TEXT_V_ALIGN_CENTER );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::CENTER_LEFT:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
aText->SetVertJustify( GR_TEXT_V_ALIGN_CENTER );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::CENTER_RIGHT:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
aText->SetVertJustify( GR_TEXT_V_ALIGN_CENTER );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::TOP_CENTER:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_CENTER );
aText->SetVertJustify( GR_TEXT_V_ALIGN_TOP );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::TOP_LEFT:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
aText->SetVertJustify( GR_TEXT_V_ALIGN_TOP );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::TOP_RIGHT:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
aText->SetVertJustify( GR_TEXT_V_ALIGN_TOP );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::BOTTOM_CENTER:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_CENTER );
aText->SetVertJustify( GR_TEXT_V_ALIGN_BOTTOM );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::BOTTOM_LEFT:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
aText->SetVertJustify( GR_TEXT_V_ALIGN_BOTTOM );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
case ETEXT::BOTTOM_RIGHT:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
aText->SetVertJustify( GR_TEXT_V_ALIGN_BOTTOM );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
break;
default:
Cherry-pick TEXT_ATTRIBUTES and EDA_ANGLE from rockola/kicad-strokefont
2021-12-28 22:13:54 +00:00
aText->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
aText->SetVertJustify( GR_TEXT_V_ALIGN_BOTTOM );
Repair Coverity scan defects.
2020-01-10 23:14:37 +00:00
break;
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
}
}
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
SCH_EAGLE_PLUGIN::SCH_EAGLE_PLUGIN() :
m_progressReporter( nullptr ),
m_doneCount( 0 ),
m_lastProgressCount( 0 ),
m_totalCount( 0 )
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
m_rootSheet = nullptr;
Coverity fixes
2020-05-19 02:58:28 +00:00
m_schematic = nullptr;
Move importers from wxLog to REPORTER. Fixes https://gitlab.com/kicad/code/kicad/issues/6389
2021-03-31 21:33:30 +00:00
m_reporter = &WXLOG_REPORTER::GetInstance();
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
SCH_EAGLE_PLUGIN::~SCH_EAGLE_PLUGIN()
{
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
const wxString SCH_EAGLE_PLUGIN::GetName() const
{
wxT
2022-06-08 17:16:11 +00:00
return wxT( "EAGLE" );
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
}
const wxString SCH_EAGLE_PLUGIN::GetFileExtension() const
{
wxT
2022-06-08 17:16:11 +00:00
return wxT( "sch" );
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
}
Implement symbol library s-expression parser. This implements all existing symbol library object support and the ability to save and load symbol library files between file formats for round robin testing.
2020-02-28 14:03:09 +00:00
const wxString SCH_EAGLE_PLUGIN::GetLibraryFileExtension() const
{
wxT
2022-06-08 17:16:11 +00:00
return wxT( "lbr" );
Implement symbol library s-expression parser. This implements all existing symbol library object support and the ability to save and load symbol library files between file formats for round robin testing.
2020-02-28 14:03:09 +00:00
}
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
int SCH_EAGLE_PLUGIN::GetModifyHash() const
{
return 0;
}
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
void SCH_EAGLE_PLUGIN::checkpoint()
{
const unsigned PROGRESS_DELTA = 5;
if( m_progressReporter )
{
if( ++m_doneCount > m_lastProgressCount + PROGRESS_DELTA )
{
Divide-by-zero safety.
2021-06-24 10:09:03 +00:00
m_progressReporter->SetCurrentProgress( ( (double) m_doneCount )
/ std::max( 1U, m_totalCount ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
if( !m_progressReporter->KeepRefreshing() )
More NULL expunging.
2021-07-16 20:13:26 +00:00
THROW_IO_ERROR( ( "Open canceled by user." ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
m_lastProgressCount = m_doneCount;
}
}
}
Remove KIWAY dependence from SCH_PLUGINs
2020-05-21 03:00:23 +00:00
SCH_SHEET* SCH_EAGLE_PLUGIN::Load( const wxString& aFileName, SCHEMATIC* aSchematic,
Rename PROPERTIES to STRING_UTF8_MAP for clarity This class has nothing to do with the properties system
2022-11-06 16:51:52 +00:00
SCH_SHEET* aAppendToMe, const STRING_UTF8_MAP* aProperties )
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
{
Remove KIWAY dependence from SCH_PLUGINs
2020-05-21 03:00:23 +00:00
wxASSERT( !aFileName || aSchematic != nullptr );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
LOCALE_IO toggle; // toggles on, then off, the C locale.
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
Use wxFFileInputStream explicitly when loading xml documents wxFFile (FILE, buffered) is better than wxFile (syscalls)
2021-05-03 23:39:56 +00:00
m_filename = aFileName;
m_schematic = aSchematic;
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
if( m_progressReporter )
{
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
More NULL expunging.
2021-07-16 20:13:26 +00:00
THROW_IO_ERROR( ( "Open canceled by user." ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
// Load the document
wxXmlDocument xmlDocument;
Use wxFFileInputStream explicitly when loading xml documents wxFFile (FILE, buffered) is better than wxFile (syscalls)
2021-05-03 23:39:56 +00:00
wxFFileInputStream stream( m_filename.GetFullPath() );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Use wxFFileInputStream explicitly when loading xml documents wxFFile (FILE, buffered) is better than wxFile (syscalls)
2021-05-03 23:39:56 +00:00
if( !stream.IsOk() || !xmlDocument.Load( stream ) )
Formatting, some i18n, and shorter log messages.
2020-11-05 23:19:47 +00:00
{
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
THROW_IO_ERROR( wxString::Format( _( "Unable to read file '%s'." ),
Formatting, some i18n, and shorter log messages.
2020-11-05 23:19:47 +00:00
m_filename.GetFullPath() ) );
}
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
Starts the loading layout
2017-03-09 12:49:24 +00:00
// Delete on exception, if I own m_rootSheet, according to aAppendToMe
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
unique_ptr<SCH_SHEET> deleter( aAppendToMe ? nullptr : m_rootSheet );
Starts the loading layout
2017-03-09 12:49:24 +00:00
More fixes for initializing imported filenames.
2020-11-06 01:32:40 +00:00
wxFileName newFilename( m_filename );
Don't hardcode the file extensions where possible
2021-03-03 01:06:25 +00:00
newFilename.SetExt( KiCadSchematicFileExtension );
More fixes for initializing imported filenames.
2020-11-06 01:32:40 +00:00
Starts the loading layout
2017-03-09 12:49:24 +00:00
if( aAppendToMe )
{
wxT
2022-06-08 17:16:11 +00:00
wxCHECK_MSG( aSchematic->IsValid(), nullptr,
wxT( "Can't append to a schematic with no root!" ) );
Move Eeschema globals to new SCHEMATIC object Set up a new lineage for SCH_ITEMS to get back to the SCHEMATIC they live on: Items will all be parented to the SCH_SCREEN that they are added to, and each SCH_SCREEN will point back to the SCHEMATIC that it is part of. Note that this hierarchy is not the same as the actual schematic hierarchy, which continues to be managed through SCH_SHEETs and SCH_SHEET_PATHS.
2020-05-13 02:00:37 +00:00
m_rootSheet = &aSchematic->Root();
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
else
{
Move Eeschema globals to new SCHEMATIC object Set up a new lineage for SCH_ITEMS to get back to the SCHEMATIC they live on: Items will all be parented to the SCH_SCREEN that they are added to, and each SCH_SCREEN will point back to the SCHEMATIC that it is part of. Note that this hierarchy is not the same as the actual schematic hierarchy, which continues to be managed through SCH_SHEETs and SCH_SHEET_PATHS.
2020-05-13 02:00:37 +00:00
m_rootSheet = new SCH_SHEET( aSchematic );
More fixes for initializing imported filenames.
2020-11-06 01:32:40 +00:00
m_rootSheet->SetFileName( newFilename.GetFullPath() );
Update Eagle importer Fixes arc orientation Sets root schematic and page numbers Fixes https://gitlab.com/kicad/code/kicad/issues/9907
2021-12-10 23:40:31 +00:00
aSchematic->SetRoot( m_rootSheet );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
if( !m_rootSheet->GetScreen() )
{
Move SCH_SCREEN project access to SCHEMATIC SCH_SCREEN no longer needs to be a KIWAY_HOLDER
2020-05-21 02:27:48 +00:00
SCH_SCREEN* screen = new SCH_SCREEN( m_schematic );
More fixes for initializing imported filenames.
2020-11-06 01:32:40 +00:00
screen->SetFileName( newFilename.GetFullPath() );
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
m_rootSheet->SetScreen( screen );
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
// Virtual root sheet UUID must be the same as the schematic file UUID.
const_cast<KIID&>( m_rootSheet->m_Uuid ) = screen->GetUuid();
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
}
Fix project references in eagle importer after SCHEMATIC object Fixes https://gitlab.com/kicad/code/kicad/-/issues/4672
2020-06-17 21:30:24 +00:00
SYMBOL_LIB_TABLE* libTable = m_schematic->Prj().SchSymbolLibTable();
Kicad Eagle Project Import Improvements. -- schematic and board files are both visible in file selection dialog. -- Allows for the selection of either the board or schematic file. -- silently fails on not detecting the corrosponding board or schematic file. -- all new kicad files are generated in new project directory -- Silently read netlist without generating annotation warnings which synchronises timestamps and paths based on given eagle references, otherwise renumbering schematic references will break links accross schematic and pcbnew.
2017-08-25 07:14:26 +00:00
wxT
2022-06-08 17:16:11 +00:00
wxCHECK_MSG( libTable, nullptr, wxT( "Could not load symbol lib table." ) );
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
Deprecate saving legacy schematic and symbol library file formats. REMOVED: The ability to save schematics in the legacy file format.
2020-05-15 13:25:11 +00:00
m_pi.set( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_KICAD ) );
Rename PROPERTIES to STRING_UTF8_MAP for clarity This class has nothing to do with the properties system
2022-11-06 16:51:52 +00:00
m_properties = std::make_unique<STRING_UTF8_MAP>();
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
( *m_properties )[SCH_LEGACY_PLUGIN::PropBuffering] = "";
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
/// @note No check is being done here to see if the existing symbol library exists so this
/// will overwrite the existing one.
if( !libTable->HasLibrary( getLibName() ) )
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
{
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
// Create a new empty symbol library.
m_pi->CreateSymbolLib( getLibFileName().GetFullPath() );
wxT
2022-06-08 17:16:11 +00:00
wxString libTableUri = wxT( "${KIPRJMOD}/" ) + getLibFileName().GetFullName();
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
// Add the new library to the project symbol library table.
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
libTable->InsertRow( new SYMBOL_LIB_TABLE_ROW( getLibName(), libTableUri,
wxT( "KiCad" ) ) );
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
// Save project symbol library table.
Fix project references in eagle importer after SCHEMATIC object Fixes https://gitlab.com/kicad/code/kicad/-/issues/4672
2020-06-17 21:30:24 +00:00
wxFileName fn( m_schematic->Prj().GetProjectPath(),
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
SYMBOL_LIB_TABLE::GetSymbolLibTableFileName() );
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
// So output formatter goes out of scope and closes the file before reloading.
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
FILE_OUTPUTFORMATTER formatter( fn.GetFullPath() );
libTable->Format( &formatter, 0 );
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
}
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
// Reload the symbol library table.
More NULL expunging.
2021-07-16 20:13:26 +00:00
m_schematic->Prj().SetElem( PROJECT::ELEM_SYMBOL_LIB_TABLE, nullptr );
Fix project references in eagle importer after SCHEMATIC object Fixes https://gitlab.com/kicad/code/kicad/-/issues/4672
2020-06-17 21:30:24 +00:00
m_schematic->Prj().SchSymbolLibTable();
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
}
Eeschema: Eagle plugin: Save symbols to schematic library cache file. Remove unneeded variable. Fix add extension to filename
2017-06-18 12:02:04 +00:00
Starts the loading layout
2017-03-09 12:49:24 +00:00
// Retrieve the root as current node
wxXmlNode* currentNode = xmlDocument.GetRoot();
// If the attribute is found, store the Eagle version;
// otherwise, store the dummy "0.0" version.
wxT
2022-06-08 17:16:11 +00:00
m_version = currentNode->GetAttribute( wxT( "version" ), wxT( "0.0" ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Map all children into a readable dictionary
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
NODE_MAP children = MapChildren( currentNode );
Starts the loading layout
2017-03-09 12:49:24 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Load drawing
loadDrawing( children["drawing"] );
Starts the loading layout
2017-03-09 12:49:24 +00:00
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
m_pi->SaveLibrary( getLibFileName().GetFullPath() );
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
EAGLE and Altium SCH importers: UpdateSymbolLinks after import Fixes https://gitlab.com/kicad/code/kicad/-/issues/7687
2021-03-16 19:51:31 +00:00
SCH_SCREENS allSheets( m_rootSheet );
allSheets.UpdateSymbolLinks(); // Update all symbol library links for all sheets.
Starts the loading layout
2017-03-09 12:49:24 +00:00
return m_rootSheet;
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
void SCH_EAGLE_PLUGIN::loadDrawing( wxXmlNode* aDrawingNode )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Map all children into a readable dictionary
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
NODE_MAP drawingChildren = MapChildren( aDrawingNode );
Starts the loading layout
2017-03-09 12:49:24 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Board nodes should not appear in .sch files
// wxXmlNode* board = drawingChildren["board"]
// wxXmlNode* grid = drawingChildren["grid"]
Eagle: Fix NULL-dereference on malformed Eagle files Eagle files that are edited may be missing required data. While we do not need to handle these files, we do need to prevent segfaults in KiCad when reading them.
2018-08-09 17:53:48 +00:00
auto layers = drawingChildren["layers"];
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eagle: Fix NULL-dereference on malformed Eagle files Eagle files that are edited may be missing required data. While we do not need to handle these files, we do need to prevent segfaults in KiCad when reading them.
2018-08-09 17:53:48 +00:00
if( layers )
loadLayerDefs( layers );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// wxXmlNode* library = drawingChildren["library"]
// wxXmlNode* settings = drawingChildren["settings"]
// Load schematic
Eagle: Fix NULL-dereference on malformed Eagle files Eagle files that are edited may be missing required data. While we do not need to handle these files, we do need to prevent segfaults in KiCad when reading them.
2018-08-09 17:53:48 +00:00
auto schematic = drawingChildren["schematic"];
Deprecate saving legacy schematic and symbol library file formats. REMOVED: The ability to save schematics in the legacy file format.
2020-05-15 13:25:11 +00:00
Eagle: Fix NULL-dereference on malformed Eagle files Eagle files that are edited may be missing required data. While we do not need to handle these files, we do need to prevent segfaults in KiCad when reading them.
2018-08-09 17:53:48 +00:00
if( schematic )
loadSchematic( schematic );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
void SCH_EAGLE_PLUGIN::countNets( wxXmlNode* aSchematicNode )
{
// Map all children into a readable dictionary
NODE_MAP schematicChildren = MapChildren( aSchematicNode );
Eagle: Fix NULL-dereference on malformed Eagle files Eagle files that are edited may be missing required data. While we do not need to handle these files, we do need to prevent segfaults in KiCad when reading them.
2018-08-09 17:53:48 +00:00
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
// Loop through all the sheets
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* sheetNode = getChildrenNodes( schematicChildren, wxT( "sheets" ) );
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
while( sheetNode )
{
NODE_MAP sheetChildren = MapChildren( sheetNode );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
// Loop through all nets
// From the DTD: "Net is an electrical connection in a schematic."
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* netNode = getChildrenNodes( sheetChildren, wxT( "nets" ) );
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
while( netNode )
{
wxT
2022-06-08 17:16:11 +00:00
wxString netName = netNode->GetAttribute( wxT( "name" ) );
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
if( m_netCounts.count( netName ) )
m_netCounts[netName] = m_netCounts[netName] + 1;
else
m_netCounts[netName] = 1;
// Get next net
netNode = netNode->GetNext();
}
sheetNode = sheetNode->GetNext();
}
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
void SCH_EAGLE_PLUGIN::loadSchematic( wxXmlNode* aSchematicNode )
{
// Map all children into a readable dictionary
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
NODE_MAP schematicChildren = MapChildren( aSchematicNode );
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* partNode = getChildrenNodes( schematicChildren, wxT( "parts" ) );
wxXmlNode* libraryNode = getChildrenNodes( schematicChildren, wxT( "libraries" ) );
wxXmlNode* sheetNode = getChildrenNodes( schematicChildren, wxT( "sheets" ) );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Allow import of Eagle schematics without libraries.
2021-06-16 21:02:50 +00:00
if( !sheetNode )
Eagle: Fix NULL-dereference on malformed Eagle files Eagle files that are edited may be missing required data. While we do not need to handle these files, we do need to prevent segfaults in KiCad when reading them.
2018-08-09 17:53:48 +00:00
return;
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
auto count_nodes =
[]( wxXmlNode* aNode ) -> unsigned
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
{
unsigned count = 0;
while( aNode )
{
count++;
aNode = aNode->GetNext();
}
return count;
};
if( m_progressReporter )
{
m_totalCount = 0;
m_doneCount = 0;
m_totalCount += count_nodes( partNode );
while( libraryNode )
{
NODE_MAP libraryChildren = MapChildren( libraryNode );
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* devicesetNode = getChildrenNodes( libraryChildren, wxT( "devicesets" ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
while( devicesetNode )
{
NODE_MAP deviceSetChildren = MapChildren( devicesetNode );
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* deviceNode = getChildrenNodes( deviceSetChildren, wxT( "devices" ) );
wxXmlNode* gateNode = getChildrenNodes( deviceSetChildren, wxT( "gates" ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
m_totalCount += count_nodes( deviceNode ) * count_nodes( gateNode );
devicesetNode = devicesetNode->GetNext();
}
libraryNode = libraryNode->GetNext();
}
// Rewind
wxT
2022-06-08 17:16:11 +00:00
libraryNode = getChildrenNodes( schematicChildren, wxT( "libraries" ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
while( sheetNode )
{
NODE_MAP sheetChildren = MapChildren( sheetNode );
wxT
2022-06-08 17:16:11 +00:00
m_totalCount += count_nodes( getChildrenNodes( sheetChildren, wxT( "instances" ) ) );
m_totalCount += count_nodes( getChildrenNodes( sheetChildren, wxT( "busses" ) ) );
m_totalCount += count_nodes( getChildrenNodes( sheetChildren, wxT( "nets" ) ) );
m_totalCount += count_nodes( getChildrenNodes( sheetChildren, wxT( "plain" ) ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
sheetNode = sheetNode->GetNext();
}
// Rewind
wxT
2022-06-08 17:16:11 +00:00
sheetNode = getChildrenNodes( schematicChildren, wxT( "sheets" ) );
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
}
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
while( partNode )
{
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
checkpoint();
Cleanup creation of all our smart pointers
2020-10-26 23:49:11 +00:00
std::unique_ptr<EPART> epart = std::make_unique<EPART>( partNode );
Eagle: Fix crash when importing Eagle V6 This fixes multiple issues when importing Eagle V6 files. Crashes occured when arcs of 0-length were found and when parts were referenced in the schematic that were not found in the library. This could happen if the library and schematic were different cases. Fixes: lp:1830564 * https://bugs.launchpad.net/kicad/+bug/1830564
2019-05-27 03:12:27 +00:00
// N.B. Eagle parts are case-insensitive in matching but we keep the display case
m_partlist[epart->name.Upper()] = std::move( epart );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
partNode = partNode->GetNext();
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Allow import of Eagle schematics without libraries.
2021-06-16 21:02:50 +00:00
if( libraryNode )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Allow import of Eagle schematics without libraries.
2021-06-16 21:02:50 +00:00
while( libraryNode )
{
// Read the library name
wxT
2022-06-08 17:16:11 +00:00
wxString libName = libraryNode->GetAttribute( wxT( "name" ) );
Eeschema Eagle Import: Fix package assigment by combining eagle libraries of the same name.
2017-08-23 04:13:37 +00:00
Allow import of Eagle schematics without libraries.
2021-06-16 21:02:50 +00:00
EAGLE_LIBRARY* elib = &m_eagleLibs[libName];
elib->name = libName;
Eeschema Eagle Import: Fix package assigment by combining eagle libraries of the same name.
2017-08-23 04:13:37 +00:00
Allow import of Eagle schematics without libraries.
2021-06-16 21:02:50 +00:00
loadLibrary( libraryNode, &m_eagleLibs[libName] );
Eeschema Eagle Import: Fix package assigment by combining eagle libraries of the same name.
2017-08-23 04:13:37 +00:00
Allow import of Eagle schematics without libraries.
2021-06-16 21:02:50 +00:00
libraryNode = libraryNode->GetNext();
}
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
Allow import of Eagle schematics without libraries.
2021-06-16 21:02:50 +00:00
m_pi->SaveLibrary( getLibFileName().GetFullPath() );
}
Eagle SCH import: save the imported library file once the library section is processed It is required to access symbol data in later import stages.
2018-04-06 10:42:10 +00:00
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
// find all nets and count how many sheets they appear on.
// local labels will be used for nets found only on that sheet.
countNets( aSchematicNode );
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
// There is always at least a root sheet.
m_sheetPath.push_back( m_rootSheet );
Fix Eagle schematic import debug assertion. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13215
2022-12-27 13:31:56 +00:00
m_sheetPath.SetPageNumber( wxT( "1" ) );
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
int sheetCount = countChildren( sheetNode->GetParent(), wxT( "sheet" ) );
if( sheetCount > 1 )
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
{
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
int x, y, i;
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
i = 1;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
x = 1;
y = 1;
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
while( sheetNode )
{
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
VECTOR2I pos = VECTOR2I( x * schIUScale.MilsToIU( 1000 ),
y * schIUScale.MilsToIU( 1000 ) );
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
// Eagle schematics are never more than one sheet deep so the parent sheet is
// always the root sheet.
std::unique_ptr<SCH_SHEET> sheet = std::make_unique<SCH_SHEET>( m_rootSheet, pos );
SCH_SCREEN* screen = new SCH_SCREEN( m_schematic );
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
sheet->SetScreen( screen );
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
screen->SetFileName( sheet->GetFileName() );
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
wxCHECK2( sheet && screen, continue );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
wxString pageNo = wxString::Format( wxT( "%d" ), i );
m_sheetPath.push_back( sheet.get() );
loadSheet( sheetNode, i );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
m_sheetPath.SetPageNumber( pageNo );
m_sheetPath.pop_back();
Update Eagle importer Fixes arc orientation Sets root schematic and page numbers Fixes https://gitlab.com/kicad/code/kicad/issues/9907
2021-12-10 23:40:31 +00:00
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
SCH_SCREEN* currentScreen = m_rootSheet->GetScreen();
wxCHECK2( currentScreen, continue );
currentScreen->Append( sheet.release() );
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
sheetNode = sheetNode->GetNext();
x += 2;
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
if( x > 10 ) // Start next row of sheets.
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
{
Coverity fixes CIDs: 102571 168696 168701 168704 168706 168708 168710 168713 168716 168717
2017-11-01 09:20:13 +00:00
x = 1;
y += 2;
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
i++;
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
}
}
else
{
Fix broken Eagle schematic import. Fixes https://gitlab.com/kicad/code/kicad/-/issues/12893
2022-11-17 14:35:10 +00:00
// There is only one sheet so we make that the root schematic.
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
while( sheetNode )
{
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
loadSheet( sheetNode, 0 );
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
sheetNode = sheetNode->GetNext();
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
// Handle the missing symbol units that need to be instantiated
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
// to create the missing implicit connections
// Calculate the already placed items bounding box and the page size to determine
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
// placement for the new symbols
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
VECTOR2I pageSizeIU = m_rootSheet->GetScreen()->GetPageSettings().GetSizeIU( schIUScale.IU_PER_MILS );
Move EDA_ITEM bounding boxes to BOX2I.
2022-08-31 09:15:42 +00:00
BOX2I sheetBbox = getSheetBbox( m_rootSheet );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I newCmpPosition( sheetBbox.GetLeft(), sheetBbox.GetBottom() );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int maxY = sheetBbox.GetY();
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
SCH_SHEET_PATH sheetpath;
m_rootSheet->LocatePathOfScreen( m_rootSheet->GetScreen(), &sheetpath );
for( auto& cmp : m_missingCmps )
{
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
const SCH_SYMBOL* origSymbol = cmp.second.cmp;
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
Fix more for loops making copies of iterates
2022-09-24 23:45:59 +00:00
for( auto& unitEntry : cmp.second.units )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
if( unitEntry.second == false )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
continue; // unit has been already processed
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
// Instantiate the missing symbol unit
Prepare for MODULE -> FOOTPRINT.
2020-11-12 21:31:41 +00:00
int unit = unitEntry.first;
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
const wxString reference = origSymbol->GetField( REFERENCE_FIELD )->GetText();
std::unique_ptr<SCH_SYMBOL> symbol( (SCH_SYMBOL*) origSymbol->Duplicate() );
Prepare for MODULE -> FOOTPRINT.
2020-11-12 21:31:41 +00:00
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->SetUnitSelection( &sheetpath, unit );
symbol->SetUnit( unit );
symbol->SetOrientation( 0 );
symbol->AddHierarchicalReference( sheetpath.Path(), reference, unit );
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
// Calculate the placement position
Move EDA_ITEM bounding boxes to BOX2I.
2022-08-31 09:15:42 +00:00
BOX2I cmpBbox = symbol->GetBoundingBox();
int posY = newCmpPosition.y + cmpBbox.GetHeight();
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
symbol->SetPosition( VECTOR2I( newCmpPosition.x, posY ) );
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
newCmpPosition.x += cmpBbox.GetWidth();
maxY = std::max( maxY, posY );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
if( newCmpPosition.x >= pageSizeIU.x ) // reached the page boundary?
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
newCmpPosition = VECTOR2I( sheetBbox.GetLeft(), maxY ); // then start a new row
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
// Add the global net labels to recreate the implicit connections
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
addImplicitConnections( symbol.get(), m_rootSheet->GetScreen(), false );
m_rootSheet->GetScreen()->Append( symbol.release() );
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
}
}
m_missingCmps.clear();
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
// Map all children into a readable dictionary
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
NODE_MAP sheetChildren = MapChildren( aSheetNode );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
// Get description node
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* descriptionNode = getChildrenNodes( sheetChildren, wxT( "description" ) );
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_SHEET* sheet = getCurrentSheet();
wxCHECK( sheet, /* void */ );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxString des;
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
std::string filename;
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_FIELD& sheetNameField = sheet->GetFields()[SHEETNAME];
SCH_FIELD& filenameField = sheet->GetFields()[SHEETFILENAME];
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
if( descriptionNode )
{
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
des = descriptionNode->GetContent();
wxT
2022-06-08 17:16:11 +00:00
des.Replace( wxT( "\n" ), wxT( "_" ), true );
Remove duplicated settings from preferences. These have now moved to project-specific settings.
2020-03-13 09:53:44 +00:00
sheetNameField.SetText( des );
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
filename = des.ToStdString();
}
else
{
wxT
2022-06-08 17:16:11 +00:00
filename = wxString::Format( wxT( "%s_%d" ), m_filename.GetName(), aSheetIndex );
Remove duplicated settings from preferences. These have now moved to project-specific settings.
2020-03-13 09:53:44 +00:00
sheetNameField.SetText( filename );
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
}
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
ReplaceIllegalFileNameChars( &filename );
replace( filename.begin(), filename.end(), ' ', '_' );
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
wxFileName fn( m_filename );
fn.SetName( filename );
fn.SetExt( KiCadSchematicFileExtension );
filenameField.SetText( fn.GetFullName() );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_SCREEN* screen = getCurrentScreen();
wxCHECK( screen, /* void */ );
screen->SetFileName( fn.GetFullPath() );
sheet->AutoplaceFields( screen, true );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
// Loop through all of the symbol instances.
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* instanceNode = getChildrenNodes( sheetChildren, wxT( "instances" ) );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
while( instanceNode )
{
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
checkpoint();
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
loadInstance( instanceNode );
instanceNode = instanceNode->GetNext();
}
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Finish off "busses" -> "buses". Fixes https://gitlab.com/kicad/code/kicad/issues/4144
2020-04-02 17:03:53 +00:00
// Loop through all buses
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// From the DTD: "Buses receive names which determine which signals they include.
// A bus is a drawing object. It does not create any electrical connections.
// These are always created by means of the nets and their names."
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* busNode = getChildrenNodes( sheetChildren, wxT( "busses" ) );
Code formatting and cleanup
2017-05-08 14:27:11 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
while( busNode )
{
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
checkpoint();
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Get the bus name
wxT
2022-06-08 17:16:11 +00:00
wxString busName = translateEagleBusName( busNode->GetAttribute( wxT( "name" ) ) );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Load segments of this bus
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
loadSegments( busNode, busName, wxString() );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Get next bus
busNode = busNode->GetNext();
}
// Loop through all nets
// From the DTD: "Net is an electrical connection in a schematic."
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* netNode = getChildrenNodes( sheetChildren, wxT( "nets" ) );
Code formatting and cleanup
2017-05-08 14:27:11 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
while( netNode )
{
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
checkpoint();
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Get the net name and class
wxT
2022-06-08 17:16:11 +00:00
wxString netName = netNode->GetAttribute( wxT( "name" ) );
wxString netClass = netNode->GetAttribute( wxT( "class" ) );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Load segments of this net
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
loadSegments( netNode, netName, netClass );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Get next net
netNode = netNode->GetNext();
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
adjustNetLabels(); // needs to be called before addBusEntries()
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
addBusEntries();
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
/* moduleinst is a design block definition and is an EagleCad 8 feature,
*
* // Loop through all moduleinsts
* wxXmlNode* moduleinstNode = getChildrenNodes( sheetChildren, "moduleinsts" );
*
* while( moduleinstNode )
* {
* loadModuleinst( moduleinstNode );
* moduleinstNode = moduleinstNode->GetNext();
* }
*/
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* plainNode = getChildrenNodes( sheetChildren, wxT( "plain" ) );
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
while( plainNode )
{
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
checkpoint();
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
wxString nodeName = plainNode->GetName();
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
if( nodeName == wxT( "polygon" ) )
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
{
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
screen->Append( loadPolyLine( plainNode ) );
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "wire" ) )
Eeschema Eagle Import: Parse plain wires as lines on the notes layer.
2017-07-16 16:18:58 +00:00
{
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
SEG endpoints;
screen->Append( loadWire( plainNode, endpoints ) );
Eeschema Eagle Import: Parse plain wires as lines on the notes layer.
2017-07-16 16:18:58 +00:00
}
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
else if( nodeName == wxT( "text" ) )
{
screen->Append( loadPlainText( plainNode ) );
}
else if( nodeName == wxT( "circle" ) )
{
screen->Append( loadCircle( plainNode ) );
}
else if( nodeName == wxT( "rectangle" ) )
{
screen->Append( loadRectangle( plainNode ) );
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "frame" ) )
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
{
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
std::vector<SCH_ITEM*> frameItems;
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
loadFrame( plainNode, frameItems );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
for( SCH_ITEM* item : frameItems )
screen->Append( item );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
}
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
plainNode = plainNode->GetNext();
}
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Calculate the new sheet size.
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
BOX2I sheetBoundingBox = getSheetBbox( sheet );
Convert wxPoint/wxSize starting from EDA_RECT usages
2021-12-29 21:30:11 +00:00
VECTOR2I targetSheetSize = sheetBoundingBox.GetSize();
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
targetSheetSize += VECTOR2I( schIUScale.MilsToIU( 1500 ), schIUScale.MilsToIU( 1500 ) );
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Get current Eeschema sheet size.
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
VECTOR2I pageSizeIU = screen->GetPageSettings().GetSizeIU( schIUScale.IU_PER_MILS );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
PAGE_INFO pageInfo = screen->GetPageSettings();
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Increase if necessary
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
if( pageSizeIU.x < targetSheetSize.x )
Move IU2Mils
2022-09-16 23:53:06 +00:00
pageInfo.SetWidthMils( schIUScale.IUToMils( targetSheetSize.x ) );
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
if( pageSizeIU.y < targetSheetSize.y )
Move IU2Mils
2022-09-16 23:53:06 +00:00
pageInfo.SetHeightMils( schIUScale.IUToMils( targetSheetSize.y ) );
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Set the new sheet size.
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->SetPageSettings( pageInfo );
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
pageSizeIU = screen->GetPageSettings().GetSizeIU( schIUScale.IU_PER_MILS );
Convert wxPoint/wxSize starting from EDA_RECT usages
2021-12-29 21:30:11 +00:00
VECTOR2I sheetcentre( pageSizeIU.x / 2, pageSizeIU.y / 2 );
VECTOR2I itemsCentre = sheetBoundingBox.Centre();
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// round the translation to nearest 100mil to place it on the grid.
Convert wxPoint/wxSize starting from EDA_RECT usages
2021-12-29 21:30:11 +00:00
VECTOR2I translation = sheetcentre - itemsCentre;
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
translation.x = translation.x - translation.x % schIUScale.MilsToIU( 100 );
translation.y = translation.y - translation.y % schIUScale.MilsToIU( 100 );
Eeschema Eagle Import: Use bounding box for sheet position and size.
2017-07-13 12:28:35 +00:00
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
// Add global net labels for the named power input pins in this sheet
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
for( SCH_ITEM* item : screen->Items().OfType( SCH_SYMBOL_T ) )
Formatting.
2021-09-20 14:35:45 +00:00
{
SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
addImplicitConnections( symbol, screen, true );
Formatting.
2021-09-20 14:35:45 +00:00
}
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
m_connPoints.clear();
// Translate the items.
Eagle: update RTree after moving schematic After importing, some schmeatics are moved, item at a time. When moving schematic items, we need to update the RTree bounding box to allow searching on position Fixes #3915 | https://gitlab.com/kicad/code/kicad/issues/3915
2020-02-22 18:28:03 +00:00
std::vector<SCH_ITEM*> allItems;
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
std::copy( screen->Items().begin(), screen->Items().end(), std::back_inserter( allItems ) );
Eagle: update RTree after moving schematic After importing, some schmeatics are moved, item at a time. When moving schematic items, we need to update the RTree bounding box to allow searching on position Fixes #3915 | https://gitlab.com/kicad/code/kicad/issues/3915
2020-02-22 18:28:03 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
for( SCH_ITEM* item : allItems )
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
item->SetPosition( item->GetPosition() + translation );
Position intersheet refs in imported Eagle schematics. Fixes https://gitlab.com/kicad/code/kicad/issues/13667
2023-01-27 13:58:22 +00:00
// We don't read positions of Eagle label fields (primarily intersheet refs), so we
// need to autoplace them after applying the translation.
if( SCH_LABEL_BASE* label = dynamic_cast<SCH_LABEL_BASE*>( item ) )
label->AutoplaceFields( screen, false );
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
item->ClearFlags();
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Update( item );
Eagle: update RTree after moving schematic After importing, some schmeatics are moved, item at a time. When moving schematic items, we need to update the RTree bounding box to allow searching on position Fixes #3915 | https://gitlab.com/kicad/code/kicad/issues/3915
2020-02-22 18:28:03 +00:00
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
void SCH_EAGLE_PLUGIN::loadFrame( wxXmlNode* aFrameNode, std::vector<SCH_ITEM*>& aItems )
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
{
EFRAME eframe( aFrameNode );
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
int xMin = eframe.x1.ToSchUnits();
int xMax = eframe.x2.ToSchUnits();
int yMin = -eframe.y1.ToSchUnits();
int yMax = -eframe.y2.ToSchUnits();
if( xMin > xMax )
std::swap( xMin, xMax );
if( yMin > yMax )
std::swap( yMin, yMax );
SCH_SHAPE* lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( xMin, yMin ) );
lines->AddPoint( VECTOR2I( xMax, yMin ) );
lines->AddPoint( VECTOR2I( xMax, yMax ) );
lines->AddPoint( VECTOR2I( xMin, yMax ) );
lines->AddPoint( VECTOR2I( xMin, yMin ) );
aItems.push_back( lines );
if( !( eframe.border_left == false ) )
{
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
aItems.push_back( lines );
int i;
int height = yMax - yMin;
int x1 = xMin;
int x2 = x1 + schIUScale.MilsToIU( 150 );
int legendPosX = xMin + schIUScale.MilsToIU( 75 );
double rowSpacing = height / double( eframe.rows );
double legendPosY = yMin + ( rowSpacing / 2 );
for( i = 1; i < eframe.rows; i++ )
{
int newY = KiROUND( yMin + ( rowSpacing * (double) i ) );
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( x1, newY ) );
lines->AddPoint( VECTOR2I( x2, newY ) );
aItems.push_back( lines );
}
char legendChar = 'A';
for( i = 0; i < eframe.rows; i++ )
{
SCH_TEXT* legendText = new SCH_TEXT();
legendText->SetPosition( VECTOR2I( legendPosX, KiROUND( legendPosY ) ) );
legendText->SetHorizJustify( GR_TEXT_H_ALIGN_CENTER );
legendText->SetVertJustify( GR_TEXT_V_ALIGN_CENTER );
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosY += rowSpacing;
}
}
if( !( eframe.border_right == false ) )
{
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
aItems.push_back( lines );
int i;
int height = yMax - yMin;
int x1 = xMax - schIUScale.MilsToIU( 150 );
int x2 = xMax;
int legendPosX = xMax - schIUScale.MilsToIU( 75 );
double rowSpacing = height / double( eframe.rows );
double legendPosY = yMin + ( rowSpacing / 2 );
for( i = 1; i < eframe.rows; i++ )
{
int newY = KiROUND( yMin + ( rowSpacing * (double) i ) );
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( x1, newY ) );
lines->AddPoint( VECTOR2I( x2, newY ) );
aItems.push_back( lines );
}
char legendChar = 'A';
for( i = 0; i < eframe.rows; i++ )
{
SCH_TEXT* legendText = new SCH_TEXT();
legendText->SetPosition( VECTOR2I( legendPosX, KiROUND( legendPosY ) ) );
legendText->SetHorizJustify( GR_TEXT_H_ALIGN_CENTER );
legendText->SetVertJustify( GR_TEXT_V_ALIGN_CENTER );
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosY += rowSpacing;
}
}
if( !( eframe.border_top == false ) )
{
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
aItems.push_back( lines );
int i;
int width = xMax - xMin;
int y1 = yMin;
int y2 = yMin + schIUScale.MilsToIU( 150 );
int legendPosY = yMin + schIUScale.MilsToIU( 75 );
double columnSpacing = width / double( eframe.columns );
double legendPosX = xMin + ( columnSpacing / 2 );
for( i = 1; i < eframe.columns; i++ )
{
int newX = KiROUND( xMin + ( columnSpacing * (double) i ) );
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( newX, y1 ) );
lines->AddPoint( VECTOR2I( newX, y2 ) );
aItems.push_back( lines );
}
char legendChar = '1';
for( i = 0; i < eframe.columns; i++ )
{
SCH_TEXT* legendText = new SCH_TEXT();
legendText->SetPosition( VECTOR2I( KiROUND( legendPosX ), legendPosY ) );
legendText->SetHorizJustify( GR_TEXT_H_ALIGN_CENTER );
legendText->SetVertJustify( GR_TEXT_V_ALIGN_CENTER );
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosX += columnSpacing;
}
}
if( !( eframe.border_bottom == false ) )
{
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
aItems.push_back( lines );
int i;
int width = xMax - xMin;
int y1 = yMax - schIUScale.MilsToIU( 150 );
int y2 = yMax;
int legendPosY = yMax - schIUScale.MilsToIU( 75 );
double columnSpacing = width / double( eframe.columns );
double legendPosX = xMin + ( columnSpacing / 2 );
for( i = 1; i < eframe.columns; i++ )
{
int newX = KiROUND( xMin + ( columnSpacing * (double) i ) );
lines = new SCH_SHAPE( SHAPE_T::POLY );
lines->AddPoint( VECTOR2I( newX, y1 ) );
lines->AddPoint( VECTOR2I( newX, y2 ) );
aItems.push_back( lines );
}
char legendChar = '1';
for( i = 0; i < eframe.columns; i++ )
{
SCH_TEXT* legendText = new SCH_TEXT();
legendText->SetPosition( VECTOR2I( KiROUND( legendPosX ), legendPosY ) );
legendText->SetHorizJustify( GR_TEXT_H_ALIGN_CENTER );
legendText->SetVertJustify( GR_TEXT_V_ALIGN_CENTER );
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosX += columnSpacing;
}
}
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
}
Formatting.
2021-09-20 14:35:45 +00:00
void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& netName,
const wxString& aNetClass )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Loop through all segments
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxXmlNode* currentSegment = aSegmentsNode->GetChildren();
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_SCREEN* screen = getCurrentScreen();
wxCHECK( screen, /* void */ );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
wxT
2022-06-08 17:16:11 +00:00
int segmentCount = countChildren( aSegmentsNode, wxT( "segment" ) );
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
while( currentSegment )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
bool labelled = false; // has a label been added to this continuously connected segment
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
NODE_MAP segmentChildren = MapChildren( currentSegment );
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
bool firstWireFound = false;
SEG firstWire;
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
m_segments.emplace_back();
SEG_DESC& segDesc = m_segments.back();
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Loop through all segment children
wxXmlNode* segmentAttribute = currentSegment->GetChildren();
Starts the loading layout
2017-03-09 12:49:24 +00:00
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
while( segmentAttribute )
{
wxT
2022-06-08 17:16:11 +00:00
if( segmentAttribute->GetName() == wxT( "wire" ) )
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
{
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
// TODO: Check how intersections used in adjustNetLabels should be
// calculated - for now we pretend that all wires are line segments.
SEG thisWire;
SCH_ITEM* wire = loadWire( segmentAttribute, thisWire );
m_connPoints[thisWire.A].emplace( wire );
m_connPoints[thisWire.B].emplace( wire );
if( !firstWireFound )
{
firstWire = thisWire;
firstWireFound = true;
}
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
// Test for intersections with other wires
Formatting.
2021-09-20 14:35:45 +00:00
for( SEG_DESC& desc : m_segments )
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
{
if( !desc.labels.empty() && desc.labels.front()->GetText() == netName )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
continue; // no point in saving intersections of the same net
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
for( const SEG& seg : desc.segs )
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
OPT_VECTOR2I intersection = thisWire.Intersect( seg, true );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
if( intersection )
m_wireIntersections.push_back( *intersection );
}
}
segDesc.segs.push_back( thisWire );
screen->Append( wire );
}
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
segmentAttribute = segmentAttribute->GetNext();
}
segmentAttribute = currentSegment->GetChildren();
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
while( segmentAttribute )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
wxString nodeName = segmentAttribute->GetName();
wxT
2022-06-08 17:16:11 +00:00
if( nodeName == wxT( "junction" ) )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
screen->Append( loadJunction( segmentAttribute ) );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "label" ) )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
SCH_TEXT* label = loadLabel( segmentAttribute, netName );
screen->Append( label );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxASSERT( segDesc.labels.empty()
|| segDesc.labels.front()->GetText() == label->GetText() );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
segDesc.labels.push_back( label );
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
labelled = true;
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "pinref" ) )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
wxT
2022-06-08 17:16:11 +00:00
segmentAttribute->GetAttribute( wxT( "gate" ) ); // REQUIRED
wxString part = segmentAttribute->GetAttribute( wxT( "part" ) ); // REQUIRED
wxString pin = segmentAttribute->GetAttribute( wxT( "pin" ) ); // REQUIRED
Don't add global labels when a power symbol is connected. Fixes https://gitlab.com/kicad/code/kicad/issues/7497
2021-09-20 18:54:47 +00:00
wxT
2022-06-08 17:16:11 +00:00
auto powerPort = m_powerPorts.find( wxT( "#" ) + part );
Don't add global labels when a power symbol is connected. Fixes https://gitlab.com/kicad/code/kicad/issues/7497
2021-09-20 18:54:47 +00:00
if( powerPort != m_powerPorts.end()
&& powerPort->second == EscapeString( pin, CTX_NETNAME ) )
{
labelled = true;
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "wire" ) )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
// already handled;
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
else // DEFAULT
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
Remove escaped double-quotes For some reason, escaped double quotes in wxString::Format cause issues on Mac. We can replace them with single quotes in most places without loss of clarity
2021-11-04 00:02:14 +00:00
// THROW_IO_ERROR( wxString::Format( _( "XML node '%s' unknown" ), nodeName ) );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
// Get next segment attribute
segmentAttribute = segmentAttribute->GetNext();
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
// Add a small label to the net segment if it hasn't been labeled already or is not
// connect to a power symbol with a pin on the same net. This preserves the named net
// feature of Eagle schematics.
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
if( !labelled && firstWireFound )
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
{
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
std::unique_ptr<SCH_TEXT> label;
Eeschema Eagle Import: Moved net name correction to a function
2017-08-17 15:32:40 +00:00
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
// Add a global label if the net appears on more than one Eagle sheet
if( m_netCounts[netName.ToStdString()] > 1 )
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
label.reset( new SCH_GLOBALLABEL );
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
else if( segmentCount > 1 )
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
label.reset( new SCH_LABEL );
if( label )
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
{
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
label->SetPosition( firstWire.A );
Eagle SCH importer: minor fixes - set correct reference for components - handle "pwr" direction for pins - discarded a redundant variable
2018-04-03 07:57:56 +00:00
label->SetText( escapeName( netName ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
label->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 40 ),
schIUScale.MilsToIU( 40 ) ) );
Improve Eagle importer's label positioning. Fixes https://gitlab.com/kicad/code/kicad/issues/9466
2021-10-27 12:48:49 +00:00
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
if( firstWire.B.x > firstWire.A.x )
Break sch_text.h/.cpp into sch_text and sch_label. Also moves SCH_NETCLASS_FLAG to SCH_DIRECTIVE_LABEL, and remaps Altium harnesses from SCH_TEXT to SCH_DIRECTIVE_LABEL.
2022-01-24 13:40:39 +00:00
label->SetTextSpinStyle( TEXT_SPIN_STYLE::LEFT );
Improve Eagle importer's label positioning. Fixes https://gitlab.com/kicad/code/kicad/issues/9466
2021-10-27 12:48:49 +00:00
else
Break sch_text.h/.cpp into sch_text and sch_label. Also moves SCH_NETCLASS_FLAG to SCH_DIRECTIVE_LABEL, and remaps Altium harnesses from SCH_TEXT to SCH_DIRECTIVE_LABEL.
2022-01-24 13:40:39 +00:00
label->SetTextSpinStyle( TEXT_SPIN_STYLE::RIGHT );
Improve Eagle importer's label positioning. Fixes https://gitlab.com/kicad/code/kicad/issues/9466
2021-10-27 12:48:49 +00:00
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
screen->Append( label.release() );
}
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
}
Eeschema Eagle Import: Renable label generation for unlabeled nets.
2017-08-12 09:17:40 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
currentSegment = currentSegment->GetNext();
}
}
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
SCH_SHAPE* SCH_EAGLE_PLUGIN::loadPolyLine( wxXmlNode* aPolygonNode )
{
std::unique_ptr<SCH_SHAPE> poly = std::make_unique<SCH_SHAPE>( SHAPE_T::POLY );
EPOLYGON epoly( aPolygonNode );
wxXmlNode* vertex = aPolygonNode->GetChildren();
Eagle schematic import: Handling of polygons with curved sides
2023-01-10 20:45:40 +00:00
VECTOR2I pt, prev_pt;
opt_double prev_curve;
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
while( vertex )
{
if( vertex->GetName() == wxT( "vertex" ) ) // skip <xmlattr> node
{
EVERTEX evertex( vertex );
pt = VECTOR2I( evertex.x.ToSchUnits(), -evertex.y.ToSchUnits() );
Eagle schematic import: Handling of polygons with curved sides
2023-01-10 20:45:40 +00:00
if( prev_curve )
{
SHAPE_ARC arc;
arc.ConstructFromStartEndAngle( prev_pt, pt, -EDA_ANGLE( *prev_curve, DEGREES_T ) );
EAGLE SCH: Improve detail of curved shape imports (0.01mm error) Follow-up from https://gitlab.com/kicad/code/kicad/-/merge_requests/1445
2023-01-10 21:45:46 +00:00
poly->GetPolyShape().Append( arc, -1, -1, ARC_ACCURACY );
Eagle schematic import: Handling of polygons with curved sides
2023-01-10 20:45:40 +00:00
}
else
{
poly->AddPoint( pt );
}
prev_pt = pt;
prev_curve = evertex.curve;
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
}
vertex = vertex->GetNext();
}
poly->SetLayer( kiCadLayer( epoly.layer ) );
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
poly->SetStroke( STROKE_PARAMS( epoly.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
poly->SetFillMode( FILL_T::FILLED_SHAPE );
return poly.release();
}
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
SCH_ITEM* SCH_EAGLE_PLUGIN::loadWire( wxXmlNode* aWireNode, SEG& endpoints )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
EWIRE ewire = EWIRE( aWireNode );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
VECTOR2I start, end;
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
start.x = ewire.x1.ToSchUnits();
start.y = -ewire.y1.ToSchUnits();
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
end.x = ewire.x2.ToSchUnits();
end.y = -ewire.y2.ToSchUnits();
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
// For segment wires.
endpoints = SEG( start, end );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
if( ewire.curve )
{
std::unique_ptr<SCH_SHAPE> arc = std::make_unique<SCH_SHAPE>( SHAPE_T::ARC );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
VECTOR2I center = ConvertArcCenter( start, end, *ewire.curve );
arc->SetCenter( center );
arc->SetStart( start );
arc->SetArcAngleAndEnd( -EDA_ANGLE( *ewire.curve, DEGREES_T ), true ); // KiCad rotates the other way
arc->SetLayer( kiCadLayer( ewire.layer ) );
arc->SetStroke( STROKE_PARAMS( ewire.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
Eagle schematic import: Handling of curved plain/wire and segment/wire
2023-01-09 14:44:58 +00:00
return arc.release();
}
else
{
std::unique_ptr<SCH_LINE> line = std::make_unique<SCH_LINE>();
line->SetStartPoint( start );
line->SetEndPoint( end );
line->SetLayer( kiCadLayer( ewire.layer ) );
line->SetStroke( STROKE_PARAMS( ewire.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
return line.release();
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
Eagle schematic import: Added missing plain elements
2023-01-09 14:18:23 +00:00
SCH_SHAPE* SCH_EAGLE_PLUGIN::loadCircle( wxXmlNode* aCircleNode )
{
std::unique_ptr<SCH_SHAPE> circle = std::make_unique<SCH_SHAPE>( SHAPE_T::CIRCLE );
ECIRCLE c( aCircleNode );
VECTOR2I center( c.x.ToSchUnits(), -c.y.ToSchUnits() );
circle->SetLayer( kiCadLayer( c.layer ) );
circle->SetPosition( center );
circle->SetEnd( VECTOR2I( center.x + c.radius.ToSchUnits(), center.y ) );
circle->SetStroke( STROKE_PARAMS( c.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
return circle.release();
}
SCH_SHAPE* SCH_EAGLE_PLUGIN::loadRectangle( wxXmlNode* aRectNode )
{
std::unique_ptr<SCH_SHAPE> rectangle = std::make_unique<SCH_SHAPE>( SHAPE_T::RECT );
ERECT rect( aRectNode );
rectangle->SetLayer( kiCadLayer( rect.layer ) );
rectangle->SetPosition( VECTOR2I( rect.x1.ToSchUnits(), -rect.y1.ToSchUnits() ) );
rectangle->SetEnd( VECTOR2I( rect.x2.ToSchUnits(), -rect.y2.ToSchUnits() ) );
if( rect.rot )
{
VECTOR2I pos( rectangle->GetPosition() );
VECTOR2I end( rectangle->GetEnd() );
VECTOR2I center( rectangle->GetCenter() );
RotatePoint( pos, center, EDA_ANGLE( rect.rot->degrees, DEGREES_T ) );
RotatePoint( end, center, EDA_ANGLE( rect.rot->degrees, DEGREES_T ) );
rectangle->SetPosition( pos );
rectangle->SetEnd( end );
}
// Eagle rectangles are filled by definition.
rectangle->SetFillMode( FILL_T::FILLED_SHAPE );
return rectangle.release();
}
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
SCH_JUNCTION* SCH_EAGLE_PLUGIN::loadJunction( wxXmlNode* aJunction )
{
Cleanup creation of all our smart pointers
2020-10-26 23:49:11 +00:00
std::unique_ptr<SCH_JUNCTION> junction = std::make_unique<SCH_JUNCTION>();
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
EJUNCTION ejunction = EJUNCTION( aJunction );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I pos( ejunction.x.ToSchUnits(), -ejunction.y.ToSchUnits() );
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle SCH import: Code formatting
2018-03-28 10:59:56 +00:00
junction->SetPosition( pos );
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
return junction.release();
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
}
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
SCH_TEXT* SCH_EAGLE_PLUGIN::loadLabel( wxXmlNode* aLabelNode, const wxString& aNetName )
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
ELABEL elabel = ELABEL( aLabelNode, aNetName );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I elabelpos( elabel.x.ToSchUnits(), -elabel.y.ToSchUnits() );
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
// Determine if the label is local or global depending on
// the number of sheets the net appears in
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
bool global = m_netCounts[aNetName] > 1;
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
std::unique_ptr<SCH_TEXT> label;
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
VECTOR2I textSize = VECTOR2I( KiROUND( elabel.size.ToSchUnits() * 0.7 ),
KiROUND( elabel.size.ToSchUnits() * 0.7 ) );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
if( global )
Cleanup creation of all our smart pointers
2020-10-26 23:49:11 +00:00
label = std::make_unique<SCH_GLOBALLABEL>();
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
else
Cleanup creation of all our smart pointers
2020-10-26 23:49:11 +00:00
label = std::make_unique<SCH_LABEL>();
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
label->SetPosition( elabelpos );
label->SetText( escapeName( elabel.netname ) );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
label->SetTextSize( textSize );
Break sch_text.h/.cpp into sch_text and sch_label. Also moves SCH_NETCLASS_FLAG to SCH_DIRECTIVE_LABEL, and remaps Altium harnesses from SCH_TEXT to SCH_DIRECTIVE_LABEL.
2022-01-24 13:40:39 +00:00
label->SetTextSpinStyle( TEXT_SPIN_STYLE::RIGHT );
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
if( elabel.rot )
{
Use consistent label size and fix issues with rotation. Fixes https://gitlab.com/kicad/code/kicad/issues/5950
2021-09-20 14:39:56 +00:00
for( int i = 0; i < KiROUND( elabel.rot->degrees / 90 ) %4; ++i )
label->Rotate90( false );
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
Make global labels have the same spin style as net/hierarchical labels For legacy reasons, it stored left and right "spin" as flipped integers in the file format. But the code handled the flip in multiple locations rather than just doing it on file io. This change unifies the internal code and does the mapping in the file I/O.
2020-01-08 19:07:55 +00:00
if( elabel.rot->mirror )
Use consistent label size and fix issues with rotation. Fixes https://gitlab.com/kicad/code/kicad/issues/5950
2021-09-20 14:39:56 +00:00
label->MirrorSpinStyle( false );
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
}
Eagle importer: use only global net labels Local net labels are preceded with sheetpath (even for single sheet schematics it is '/') causing net name conflicts between schematics and layout. It can be easily avoided by using exclusively global net labels, at the cost having uglier schematics.
2018-02-16 22:48:58 +00:00
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
return label.release();
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
}
Formatting.
2021-09-20 14:35:45 +00:00
std::pair<VECTOR2I, const SEG*>
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
SCH_EAGLE_PLUGIN::findNearestLinePoint( const VECTOR2I& aPoint,
Formatting.
2021-09-20 14:35:45 +00:00
const std::vector<SEG>& aLines ) const
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
VECTOR2I nearestPoint;
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
const SEG* nearestLine = nullptr;
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
float d, mindistance = std::numeric_limits<float>::max();
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Find the nearest start, middle or end of a line from the list of lines.
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
for( const SEG& line : aLines )
Eeschema Eagle Import: Fix label rotation.
2017-07-09 05:16:27 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
VECTOR2I testpoint = line.A;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
d = sqrt( abs( ( ( aPoint.x - testpoint.x ) ^ 2 ) + ( ( aPoint.y - testpoint.y ) ^ 2 ) ) );
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
if( d < mindistance )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
mindistance = d;
nearestPoint = testpoint;
nearestLine = &line;
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
}
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
testpoint = line.Center();
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
d = sqrt( abs( ( ( aPoint.x - testpoint.x ) ^ 2 ) + ( ( aPoint.y - testpoint.y ) ^ 2 ) ) );
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
if( d < mindistance )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
mindistance = d;
nearestPoint = testpoint;
nearestLine = &line;
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
}
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
testpoint = line.B;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
d = sqrt( abs( ( ( aPoint.x - testpoint.x ) ^ 2 ) + ( ( aPoint.y - testpoint.y ) ^ 2 ) ) );
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
if( d < mindistance )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
mindistance = d;
nearestPoint = testpoint;
nearestLine = &line;
Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.
2017-07-13 12:42:06 +00:00
}
Eeschema Eagle Import: Fix label rotation.
2017-07-09 05:16:27 +00:00
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
return std::make_pair( nearestPoint, nearestLine );
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
void SCH_EAGLE_PLUGIN::loadInstance( wxXmlNode* aInstanceNode )
{
Formatting.
2021-09-20 14:35:45 +00:00
EINSTANCE einstance = EINSTANCE( aInstanceNode );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_SCREEN* screen = getCurrentScreen();
wxCHECK( screen, /* void */ );
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
// Find the part in the list for the sheet.
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
// Assign the symbol its value from the part entry
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
// Calculate the unit number from the gate entry of the instance
Fix source comment / documentation typos
2021-06-09 19:32:58 +00:00
// Assign the LIB_ID from device set and device names
Eagle: Fix crash when importing Eagle V6 This fixes multiple issues when importing Eagle V6 files. Crashes occured when arcs of 0-length were found and when parts were referenced in the schematic that were not found in the library. This could happen if the library and schematic were different cases. Fixes: lp:1830564 * https://bugs.launchpad.net/kicad/+bug/1830564
2019-05-27 03:12:27 +00:00
auto part_it = m_partlist.find( einstance.part.Upper() );
if( part_it == m_partlist.end() )
{
Move importers from wxLog to REPORTER. Fixes https://gitlab.com/kicad/code/kicad/issues/6389
2021-03-31 21:33:30 +00:00
m_reporter->Report( wxString::Format( _( "Error parsing Eagle file. Could not find '%s' "
"instance but it is referenced in the schematic." ),
einstance.part ),
RPT_SEVERITY_ERROR );
Eagle: Fix crash when importing Eagle V6 This fixes multiple issues when importing Eagle V6 files. Crashes occured when arcs of 0-length were found and when parts were referenced in the schematic that were not found in the library. This could happen if the library and schematic were different cases. Fixes: lp:1830564 * https://bugs.launchpad.net/kicad/+bug/1830564
2019-05-27 03:12:27 +00:00
return;
}
EPART* epart = part_it->second.get();
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
wxString libraryname = epart->library;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxString gatename = epart->deviceset + epart->device + einstance.gate;
wxString symbolname = wxString( epart->deviceset + epart->device );
wxT
2022-06-08 17:16:11 +00:00
symbolname.Replace( wxT( "*" ), wxEmptyString );
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
wxString kisymbolname = EscapeString( symbolname, CTX_LIBID );
Eeschema Eagle Import: Parse eagle symbol name prefix and fix reference values.
2017-08-20 05:56:14 +00:00
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
// Eagle schematics can have multiple libraries containing symbols with duplicate symbol
// names. Because this parser stores all of the symbols in a single library, the
// loadSymbol() function, prefixed the original Eagle library name to the symbol name
// in case of a name clash. Check for the prefixed symbol first. This ensures that
// the correct library symbol gets mapped on load.
wxString altSymbolName = libraryname + wxT( "_" ) + symbolname;
altSymbolName = EscapeString( altSymbolName, CTX_LIBID );
wxString libIdSymbolName = altSymbolName;
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
int unit = m_eagleLibs[libraryname].GateUnit[gatename];
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxString package;
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
EAGLE_LIBRARY* elib = &m_eagleLibs[libraryname];
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
eeschema: Rescue symbols with illegal chars When parsing component names, we need to account for the possibility of illegal characters (e.g. "/", ":") in the names from v4 libraries. They are fixed internally by the cache parser but if we don't fix them in the rescue routine, the symbol won't match it's cache name. This standardizes all schematic illegal character routines into LIB_ID Fixes: lp:1774774 * https://bugs.launchpad.net/kicad/+bug/1774774
2018-06-21 04:12:11 +00:00
auto p = elib->package.find( kisymbolname );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
if( p != elib->package.end() )
Eeschema Eagle Import: Fix package assigment by combining eagle libraries of the same name.
2017-08-23 04:13:37 +00:00
package = p->second;
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
LIB_SYMBOL* part = m_pi->LoadSymbol( getLibFileName().GetFullPath(), altSymbolName,
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
m_properties.get() );
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
if( !part )
{
part = m_pi->LoadSymbol( getLibFileName().GetFullPath(), kisymbolname,
m_properties.get() );
libIdSymbolName = kisymbolname;
}
Implement simple inheritance for library symbols. This change completely removes the LIB_ALIAS design pattern an replaces it by allowing LIB_PART objects to inherit from other LIB_PART objects. The initial implementation only allows for single inheritance and only supports the mandatory fields in the derived part because that is all that the current symbol library file format will support. Once the new file format is implemented and saving to the old file format is deprecated, more complex inheritance will be added. The LIB_ALIAS information saved in the document files was move into the LIB_PART object. This change impacts virtually every part of the schematic and symbol library editor code so this commit message is woefully incomplete. REMOVE: Removed the symbol aliases concept from the schematic and symbol editors and the symbol viewer. NEW: Replace the symbol alias concept with simple inheritance that allows a library symbol to be derived from another library symbol.
2019-11-06 19:15:42 +00:00
if( !part )
Eagle SCH import: validate imported symbol names Fixes: lp:1753189 * https://bugs.launchpad.net/kicad/+bug/1753189
2018-05-29 07:28:28 +00:00
{
Move importers from wxLog to REPORTER. Fixes https://gitlab.com/kicad/code/kicad/issues/6389
2021-03-31 21:33:30 +00:00
m_reporter->Report( wxString::Format( _( "Could not find '%s' in the imported library." ),
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
UnescapeString( kisymbolname ) ),
Move importers from wxLog to REPORTER. Fixes https://gitlab.com/kicad/code/kicad/issues/6389
2021-03-31 21:33:30 +00:00
RPT_SEVERITY_ERROR );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
return;
Eagle SCH import: validate imported symbol names Fixes: lp:1753189 * https://bugs.launchpad.net/kicad/+bug/1753189
2018-05-29 07:28:28 +00:00
}
Kicad: Add Project import function. -- add menu entry -- add ImportFile kiway function -- expose functions for creating/reading netlist -- add example eagle boad file as well
2017-08-24 15:56:15 +00:00
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
LIB_ID libId( getLibName(), libIdSymbolName );
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
std::unique_ptr<SCH_SYMBOL> symbol = std::make_unique<SCH_SYMBOL>();
symbol->SetLibId( libId );
symbol->SetUnit( unit );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
symbol->SetPosition( VECTOR2I( einstance.x.ToSchUnits(), -einstance.y.ToSchUnits() ) );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
eeschema: EAGLE plugin does not reference footprint with library suffix Fixes https://gitlab.com/kicad/code/kicad/issues/10261
2022-01-05 09:58:06 +00:00
// assume that footprint library is identical to project name
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
if( !package.IsEmpty() )
{
wxString footprint = m_schematic->Prj().GetProjectName() + wxT( ":" ) + package;
symbol->GetField( FOOTPRINT_FIELD )->SetText( footprint );
}
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
if( einstance.rot )
{
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->SetOrientation( kiCadComponentRotation( einstance.rot->degrees ) );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
if( einstance.rot->mirror )
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->MirrorHorizontally( einstance.x.ToSchUnits() );
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
}
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
Fix some bugs in Change Symbol and Update Symbols. In particular, there was a typo that kept library values from being updated, and there was missing logic to fetch the various field names from the library parts (and the change-to part). Also implements some performance gains by desisting from copying LIB_FIELDs around every time we want to look at them. Fixes https://gitlab.com/kicad/code/kicad/issues/6733 Fixes https://gitlab.com/kicad/code/kicad/issues/6749
2020-12-15 15:06:19 +00:00
std::vector<LIB_FIELD*> partFields;
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
part->GetFields( partFields );
Fix some bugs in Change Symbol and Update Symbols. In particular, there was a typo that kept library values from being updated, and there was missing logic to fetch the various field names from the library parts (and the change-to part). Also implements some performance gains by desisting from copying LIB_FIELDs around every time we want to look at them. Fixes https://gitlab.com/kicad/code/kicad/issues/6733 Fixes https://gitlab.com/kicad/code/kicad/issues/6749
2020-12-15 15:06:19 +00:00
for( const LIB_FIELD* field : partFields )
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
{
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->GetFieldById( field->GetId() )->ImportValues( *field );
Convert wxPoint/wxSize starting from EDA_RECT usages
2021-12-29 21:30:11 +00:00
symbol->GetFieldById( field->GetId() )->SetTextPos( (VECTOR2I)symbol->GetPosition()
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
+ field->GetTextPos() );
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
}
Eagle SCH importer: prepend # to references of symbols without assigned footprints With hash character starting the reference value, schematic components are considered as virtual and therefore netlist updater do not warn about an unsigned footprint anymore. This approach is useful to handle logos, frames or other virtual Eagle components. Fixes: lp:1756281 * https://bugs.launchpad.net/kicad/+bug/1756281
2018-03-22 17:17:23 +00:00
// If there is no footprint assigned, then prepend the reference value
// with a hash character to mute netlist updater complaints
wxString reference = package.IsEmpty() ? '#' + einstance.part : einstance.part;
Eeschema Eagle Import: Field checks and library insertion fix.
2017-07-14 15:20:59 +00:00
Fixing Eagle refs that do not work with KiCad KiCad has stricter requirements for what consititutes an annotated symbol. This checks for and corrects annotations that begin with '#', do not begin with a non-numeric character or do not end with a number
2022-02-25 23:42:47 +00:00
// reference must end with a number but EAGLE does not enforce this
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
if( reference.find_last_not_of( wxT( "0123456789" ) ) == ( reference.Length()-1 ) )
wxT
2022-06-08 17:16:11 +00:00
reference.Append( wxT( "0" ) );
Fixing Eagle refs that do not work with KiCad KiCad has stricter requirements for what consititutes an annotated symbol. This checks for and corrects annotations that begin with '#', do not begin with a non-numeric character or do not end with a number
2022-02-25 23:42:47 +00:00
EAGLE: Prevent numeric-only component references KiCad does not allow references to be numeric only. This prefixes such references with "UNK" to note that the reference designator type is unknown.
2019-05-21 02:47:32 +00:00
// EAGLE allows references to be single digits. This breaks KiCad netlisting, which requires
// parts to have non-digit + digit annotation. If the reference begins with a number,
// we prepend 'UNK' (unknown) for the symbol designator
wxT
2022-06-08 17:16:11 +00:00
if( reference.find_first_not_of( wxT( "0123456789" ) ) != 0 )
reference.Prepend( wxT( "UNK" ) );
Fixing Eagle refs that do not work with KiCad KiCad has stricter requirements for what consititutes an annotated symbol. This checks for and corrects annotations that begin with '#', do not begin with a non-numeric character or do not end with a number
2022-02-25 23:42:47 +00:00
// EAGLE allows designator to start with # but that is used in KiCad
// for symbols which do not have a footprint
wxT
2022-06-08 17:16:11 +00:00
if( einstance.part.find_first_not_of( wxT( "#" ) ) != 0 )
reference.Prepend( wxT( "UNK" ) );
EAGLE: Prevent numeric-only component references KiCad does not allow references to be numeric only. This prefixes such references with "UNK" to note that the reference designator type is unknown.
2019-05-21 02:47:32 +00:00
Eagle schematic import: Corrected visibility for >NAME and >VALUE
2023-01-14 14:40:35 +00:00
SCH_FIELD* referenceField = symbol->GetField( REFERENCE_FIELD );
referenceField->SetText( reference );
referenceField->SetVisible( part->GetFieldById( REFERENCE_FIELD )->IsVisible() );
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
Eagle schematic import: Corrected visibility for >NAME and >VALUE
2023-01-14 14:40:35 +00:00
SCH_FIELD* valueField = symbol->GetField( VALUE_FIELD );
bool userValue = m_userValue.at( libIdSymbolName );
valueField->SetVisible( part->GetFieldById( VALUE_FIELD )->IsVisible() );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
Eagle schematic import: Corrected visibility for >NAME and >VALUE
2023-01-14 14:40:35 +00:00
if( userValue && epart->value )
{
valueField->SetText( *epart->value );
}
else
{
valueField->SetText( kisymbolname );
Eeschema Eagle Import: Field checks and library insertion fix.
2017-07-14 15:20:59 +00:00
Eagle schematic import: Corrected visibility for >NAME and >VALUE
2023-01-14 14:40:35 +00:00
if( userValue )
valueField->SetVisible( false );
}
Eeschema Eagle Import: Hide reference and values based component smashed status and attribute.
2017-08-19 07:35:21 +00:00
Minor speed cleanup This adjusts iterators to use const reference when only used for copy. It also ensures pre-allocation of vectors when size is known ahead of time.
2019-12-05 15:20:59 +00:00
for( const auto& a : epart->attribute )
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
{
Fix duplicate symbol value fields when importing Eagle schematic. Don't use the value field when adding Eagle part attributes to a symbol. This issue was cause by using a mandatory symbol field ID instead of using the next available field ID when adding new fields to as symbol. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13468
2023-02-04 17:37:24 +00:00
VECTOR2I newFieldPosition( 0, 0 );
SCH_FIELD* lastField = symbol->GetFieldById( symbol->GetFieldCount() - 1 );
if( lastField )
newFieldPosition = lastField->GetPosition();
SCH_FIELD newField( newFieldPosition, symbol->GetFieldCount(), symbol.get() );
newField.SetName( a.first );
newField.SetText( a.second );
newField.SetVisible( false );
symbol->AddField( newField );
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
}
Minor speed cleanup This adjusts iterators to use const reference when only used for copy. It also ensures pre-allocation of vectors when size is known ahead of time.
2019-12-05 15:20:59 +00:00
for( const auto& a : epart->variant )
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
SCH_FIELD* field = symbol->AddField( *symbol->GetField( VALUE_FIELD ) );
wxT
2022-06-08 17:16:11 +00:00
field->SetName( wxT( "VARIANT_" ) + a.first );
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
field->SetText( a.second );
field->SetVisible( false );
}
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
bool valueAttributeFound = false;
bool nameAttributeFound = false;
Eeschema Eagle Import: Hide reference and values based component smashed status and attribute.
2017-08-19 07:35:21 +00:00
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
wxXmlNode* attributeNode = aInstanceNode->GetChildren();
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Parse attributes for the instance
while( attributeNode )
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
{
wxT
2022-06-08 17:16:11 +00:00
if( attributeNode->GetName() == wxT( "attribute" ) )
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
EATTR attr = EATTR( attributeNode );
More NULL expunging.
2021-07-16 20:13:26 +00:00
SCH_FIELD* field = nullptr;
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
wxT
2022-06-08 17:16:11 +00:00
if( attr.name.Lower() == wxT( "name" ) )
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
{
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
field = symbol->GetField( REFERENCE_FIELD );
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
nameAttributeFound = true;
}
wxT
2022-06-08 17:16:11 +00:00
else if( attr.name.Lower() == wxT( "value" ) )
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
{
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
field = symbol->GetField( VALUE_FIELD );
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
valueAttributeFound = true;
}
else
{
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
field = symbol->FindField( attr.name );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( field )
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
field->SetVisible( false );
}
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
if( field )
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
{
Eeschema Eagle Import: Set visibility of fields based on attribute display value.
2017-08-20 03:38:47 +00:00
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
field->SetPosition( VECTOR2I( attr.x->ToSchUnits(), -attr.y->ToSchUnits() ) );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int align = attr.align ? *attr.align : ETEXT::BOTTOM_LEFT;
int absdegrees = attr.rot ? attr.rot->degrees : 0;
bool mirror = attr.rot ? attr.rot->mirror : false;
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( einstance.rot && einstance.rot->mirror )
mirror = !mirror;
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
bool spin = attr.rot ? attr.rot->spin : false;
Eeschema Eagle Import: check rotation property before accessing it
2017-07-25 09:58:54 +00:00
Use default for attribute "display" if not found. Fixes: lp:1767447 * https://bugs.launchpad.net/kicad/+bug/1767447
2018-05-11 13:44:36 +00:00
if( attr.display == EATTR::Off || attr.display == EATTR::NAME )
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
field->SetVisible( false );
Eeschema Eagle Import: Set visibility of fields based on attribute display value.
2017-08-20 03:38:47 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int rotation = einstance.rot ? einstance.rot->degrees : 0;
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
int reldegrees = ( absdegrees - rotation + 360.0 );
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
reldegrees %= 360;
Formatting.
2021-09-20 14:35:45 +00:00
eagleToKicadAlignment( (EDA_TEXT*) field, align, reldegrees, mirror, spin,
absdegrees );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
}
}
wxT
2022-06-08 17:16:11 +00:00
else if( attributeNode->GetName() == wxT( "variant" ) )
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
{
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
wxString variantName, fieldValue;
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
if( attributeNode->GetAttribute( wxT( "name" ), &variantName )
&& attributeNode->GetAttribute( wxT( "value" ), &fieldValue ) )
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
{
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_FIELD field( VECTOR2I( 0, 0 ), -1, symbol.get() );
field.SetName( wxT( "VARIANT_" ) + variantName );
field.SetText( fieldValue );
field.SetVisible( false );
symbol->AddField( field );
Eeschema: Copy attributes from eagle. Eagle allows for variants of components to be listed in the schematic. This patch copies the variant data into the imported schematic item, prefixing the alternate variant names with "VARIANT_" and keeping the alternate values.
2018-07-10 14:32:10 +00:00
}
}
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
attributeNode = attributeNode->GetNext();
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
}
Eeschema Eagle Import: Hide reference and values based component smashed status and attribute.
2017-08-19 07:35:21 +00:00
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
// Use the instance attribute to determine the reference and value field visibility.
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
if( einstance.smashed && einstance.smashed.Get() )
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
{
if( !valueAttributeFound )
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->GetField( VALUE_FIELD )->SetVisible( false );
Eeschema Eagle Import: Hide reference and values based component smashed status and attribute.
2017-08-19 07:35:21 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
if( !nameAttributeFound )
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->GetField( REFERENCE_FIELD )->SetVisible( false );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
}
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
Remove schematic symbol value and footprint field instance data. https://gitlab.com/kicad/code/kicad/-/issues/12933
2022-11-25 14:25:39 +00:00
symbol->AddHierarchicalReference( m_sheetPath.Path(), reference, unit );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
// Save the pin positions
Fix project references in eagle importer after SCHEMATIC object Fixes https://gitlab.com/kicad/code/kicad/-/issues/4672
2020-06-17 21:30:24 +00:00
SYMBOL_LIB_TABLE& schLibTable = *m_schematic->Prj().SchSymbolLibTable();
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
LIB_SYMBOL* libSymbol = schLibTable.LoadSymbol( symbol->GetLibId() );
Make the new schematic and symbol library file formats the default. This is a very large and potentially disruptive change so this will be an unusually long and detailed commit message. The new file formats are now the default in both the schematic and symbol library editors. Existing symbol libraries will be saved in their current format until new features are added to library symbols. Once this happens, both the legacy schematic and symbol file formats will be no longer be savable and existing libraries will have to be converted. Saving to the legacy file formats is still available for round robin testing and should not be used for normal editing. When loading the legacy schematic file, it is imperative that the schematic library symbols are rescued and/or remapped to valid library identifiers. Otherwise, there will be no way to link to the original library symbol and the user will be required manually set the library identifier. The cached symbol will be saved in the schematic file so the last library symbol in the cache will still be used but there will be no way to update it from the original library. The next save after loading a legacy schematic file will be converted to the s-expression file format. Schematics with hierarchical sheets will automatically have all sheet file name extensions changed to .kicad_sym and saved to the new format as well. Appending schematics requires that the schematic to append has already been converted to the new file format. This is required to ensure that library symbols are guaranteed to be valid for the appended schematic. The schematic symbol library symbol link resolution has been moved out of the SCH_COMPONENT object and move into the SCH_SCREEN object that owns the symbol. This was done to ensure that there is a single place where the library symbol links get resolved rather than the dozen or so different code paths that previously existed. It also removes the necessity of the SCH_COMPONENT object of requiring any knowledge of the symbol library table and/or the cache library. When opening an s-expression schematic, the legacy cache library is not loaded so any library symbols not rescued cannot be loaded. Broken library symbol links will have to be manually resolved by adding the cache library to the symbol library table and changing the links in the schematic symbol. Now that the library symbols are embedded in the schematic file, the SCH_SCREEN object maintains the list of library symbols for the schematic automatically. No external manipulation of this library cache should ever occur. ADDED: S-expression schematic and symbol library file formats.
2020-04-16 16:43:50 +00:00
wxCHECK( libSymbol, /*void*/ );
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
symbol->SetLibSymbol( new LIB_SYMBOL( *libSymbol ) );
Make the new schematic and symbol library file formats the default. This is a very large and potentially disruptive change so this will be an unusually long and detailed commit message. The new file formats are now the default in both the schematic and symbol library editors. Existing symbol libraries will be saved in their current format until new features are added to library symbols. Once this happens, both the legacy schematic and symbol file formats will be no longer be savable and existing libraries will have to be converted. Saving to the legacy file formats is still available for round robin testing and should not be used for normal editing. When loading the legacy schematic file, it is imperative that the schematic library symbols are rescued and/or remapped to valid library identifiers. Otherwise, there will be no way to link to the original library symbol and the user will be required manually set the library identifier. The cached symbol will be saved in the schematic file so the last library symbol in the cache will still be used but there will be no way to update it from the original library. The next save after loading a legacy schematic file will be converted to the s-expression file format. Schematics with hierarchical sheets will automatically have all sheet file name extensions changed to .kicad_sym and saved to the new format as well. Appending schematics requires that the schematic to append has already been converted to the new file format. This is required to ensure that library symbols are guaranteed to be valid for the appended schematic. The schematic symbol library symbol link resolution has been moved out of the SCH_COMPONENT object and move into the SCH_SCREEN object that owns the symbol. This was done to ensure that there is a single place where the library symbol links get resolved rather than the dozen or so different code paths that previously existed. It also removes the necessity of the SCH_COMPONENT object of requiring any knowledge of the symbol library table and/or the cache library. When opening an s-expression schematic, the legacy cache library is not loaded so any library symbols not rescued cannot be loaded. Broken library symbol links will have to be manually resolved by adding the cache library to the symbol library table and changing the links in the schematic symbol. Now that the library symbols are embedded in the schematic file, the SCH_SCREEN object maintains the list of library symbols for the schematic automatically. No external manipulation of this library cache should ever occur. ADDED: S-expression schematic and symbol library file formats.
2020-04-16 16:43:50 +00:00
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
std::vector<LIB_PIN*> pins;
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->GetLibPins( pins );
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
for( const LIB_PIN* pin : pins )
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
m_connPoints[symbol->GetPinPhysicalPosition( pin )].emplace( pin );
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
Don't add global labels when a power symbol is connected. Fixes https://gitlab.com/kicad/code/kicad/issues/7497
2021-09-20 18:54:47 +00:00
if( part->IsPower() )
m_powerPorts[ reference ] = symbol->GetField( VALUE_FIELD )->GetText();
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
symbol->ClearFlags();
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
screen->Append( symbol.release() );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
EAGLE_LIBRARY* SCH_EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLibraryNode,
EAGLE_LIBRARY* aEagleLibrary )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
NODE_MAP libraryChildren = MapChildren( aLibraryNode );
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Loop through the symbols and load each of them
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* symbolNode = getChildrenNodes( libraryChildren, wxT( "symbols" ) );
Code formatting and cleanup
2017-05-08 14:27:11 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
while( symbolNode )
{
wxT
2022-06-08 17:16:11 +00:00
wxString symbolName = symbolNode->GetAttribute( wxT( "name" ) );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
aEagleLibrary->SymbolNodes[symbolName] = symbolNode;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
symbolNode = symbolNode->GetNext();
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
// Loop through the device sets and load each of them
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* devicesetNode = getChildrenNodes( libraryChildren, wxT( "devicesets" ) );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
while( devicesetNode )
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
{
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
// Get Device set information
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
EDEVICE_SET edeviceset = EDEVICE_SET( devicesetNode );
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
Turn on and fix MSVC compliance mode issues We want /permissive- to enable debug performance improvements in MSVC 17.5+. This flag is also default under C++20 so we'll have to deal with these compile issues anyway at some point in the future. In particular, MSVC becomes pedantic about ternary types. See https://learn.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance?view=msvc-170#ambiguous-conditional-operator-arguments MSFT cites https://cplusplus.github.io/CWG/issues/1805.html
2023-02-12 21:29:26 +00:00
wxString prefix = edeviceset.prefix ? edeviceset.prefix.Get() : wxString( wxT( "" ) );
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
NODE_MAP deviceSetChildren = MapChildren( devicesetNode );
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* deviceNode = getChildrenNodes( deviceSetChildren, wxT( "devices" ) );
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
// For each device in the device set:
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
while( deviceNode )
{
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
// Get device information
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
EDEVICE edevice = EDEVICE( deviceNode );
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
// Create symbol name from deviceset and device names.
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
wxString symbolName = edeviceset.name + edevice.name;
wxT
2022-06-08 17:16:11 +00:00
symbolName.Replace( wxT( "*" ), wxEmptyString );
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
wxASSERT( !symbolName.IsEmpty() );
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
symbolName = EscapeString( symbolName, CTX_LIBID );
Eeschema Eagle Import: Fix package assigment by combining eagle libraries of the same name.
2017-08-23 04:13:37 +00:00
Eeschema Eagle Import: Field checks and library insertion fix.
2017-07-14 15:20:59 +00:00
if( edevice.package )
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
aEagleLibrary->package[symbolName] = edevice.package.Get();
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// Create KiCad symbol.
Sprinkle in some make_unique
2022-02-06 02:26:36 +00:00
std::unique_ptr<LIB_SYMBOL> libSymbol = std::make_unique<LIB_SYMBOL>( symbolName );
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
// Process each gate in the deviceset for this device.
wxT
2022-06-08 17:16:11 +00:00
wxXmlNode* gateNode = getChildrenNodes( deviceSetChildren, wxT( "gates" ) );
int gates_count = countChildren( deviceSetChildren["gates"], wxT( "gate" ) );
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
libSymbol->SetUnitCount( gates_count );
libSymbol->LockUnits( true );
Eeschema Eagle Import: Parse eagle symbol name prefix and fix reference values.
2017-08-20 05:56:14 +00:00
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
LIB_FIELD* reference = libSymbol->GetFieldById( REFERENCE_FIELD );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
if( prefix.length() == 0 )
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
{
Eeschema Eagle Import: Parse eagle symbol name prefix and fix reference values.
2017-08-20 05:56:14 +00:00
reference->SetVisible( false );
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
}
Eeschema Eagle Import: Parse eagle symbol name prefix and fix reference values.
2017-08-20 05:56:14 +00:00
else
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
{
Eagle SCH importer: prepend # to references of symbols without assigned footprints With hash character starting the reference value, schematic components are considered as virtual and therefore netlist updater do not warn about an unsigned footprint anymore. This approach is useful to handle logos, frames or other virtual Eagle components. Fixes: lp:1756281 * https://bugs.launchpad.net/kicad/+bug/1756281
2018-03-22 17:17:23 +00:00
// If there is no footprint assigned, then prepend the reference value
// with a hash character to mute netlist updater complaints
reference->SetText( edevice.package ? prefix : '#' + prefix );
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int gateindex = 1;
bool ispower = false;
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
while( gateNode )
{
File open/import progress dialogs. Fixes https://gitlab.com/kicad/code/kicad/issues/6864 Fixes https://gitlab.com/kicad/code/kicad/issues/2166
2021-06-23 22:53:08 +00:00
checkpoint();
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
EGATE egate = EGATE( gateNode );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
aEagleLibrary->GateUnit[edeviceset.name + edevice.name + egate.name] = gateindex;
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
ispower = loadSymbol( aEagleLibrary->SymbolNodes[egate.symbol], libSymbol, &edevice,
gateindex, egate.name );
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
WIP: Symbols are imported and displayed, and save to cache file on schematic save.
2017-07-02 12:26:23 +00:00
gateindex++;
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
gateNode = gateNode->GetNext();
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
} // gateNode
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
libSymbol->SetUnitCount( gates_count );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
if( gates_count == 1 && ispower )
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
libSymbol->SetPower();
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
// Don't set the footprint field if no package is defined in the Eagle schematic.
if( edevice.package )
{
// assume that footprint library is identical to project name
wxString packageString = m_schematic->Prj().GetProjectName() + wxT( ":" ) +
aEagleLibrary->package[symbolName];
libSymbol->GetFootprintField().SetText( packageString );
}
wxString libName = libSymbol->GetName();
libSymbol->SetName( libName );
// If duplicate symbol names exist in multiple Eagle symbol libraries, prefix the
// Eagle symbol library name to the symbol which should ensure that it is unique.
if( m_pi->LoadSymbol( getLibFileName().GetFullPath(), libName ) )
{
libName = aEagleLibrary->name + wxT( "_" ) + libName;
libName = EscapeString( libName, CTX_LIBID );
libSymbol->SetName( libName );
}
eeschema: automatic generated symbol library from EAGLE plugin does not include footprint reference Fixes https://gitlab.com/kicad/code/kicad/issues/10262
2022-01-05 10:14:14 +00:00
Fix double-escaping in Eagle importer. This has actually been there since dot, but the old escaping method just deleted chars it didn't like so you could run it as many times as you wanted. Fixes https://gitlab.com/kicad/code/kicad/issues/8694
2021-07-31 19:06:31 +00:00
m_pi->SaveSymbol( getLibFileName().GetFullPath(), new LIB_SYMBOL( *libSymbol.get() ),
m_properties.get() );
Fix Eagle schematic import on duplicate symbol library names. Fixes https://gitlab.com/kicad/code/kicad/-/issues/13434
2023-01-11 19:09:48 +00:00
aEagleLibrary->KiCadSymbols.insert( libName, libSymbol.release() );
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
Eagle schematic import: Corrected visibility for >NAME and >VALUE
2023-01-14 14:40:35 +00:00
// Store information on whether the value of VALUE_FIELD for a part should be
// part/@value or part/@deviceset + part/@device.
m_userValue.emplace( std::make_pair( libName,
edeviceset.uservalue == true ) );
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
deviceNode = deviceNode->GetNext();
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
} // devicenode
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
devicesetNode = devicesetNode->GetNext();
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
} // devicesetNode
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
return aEagleLibrary;
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
bool SCH_EAGLE_PLUGIN::loadSymbol( wxXmlNode* aSymbolNode, std::unique_ptr<LIB_SYMBOL>& aSymbol,
Overhaul arc internal model to not over-specify information.
2021-07-17 19:56:18 +00:00
EDEVICE* aDevice, int aGateNumber, const wxString& aGateName )
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
{
wxT
2022-06-08 17:16:11 +00:00
wxString symbolName = aSymbolNode->GetAttribute( wxT( "name" ) );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
std::vector<LIB_ITEM*> items;
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
wxXmlNode* currentNode = aSymbolNode->GetChildren();
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
bool showRefDes = false;
bool showValue = false;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
bool ispower = false;
int pincount = 0;
Eeschema Eagle Import: Set value and reference component field visibilities based on presence of text in symbol definition.
2017-07-16 16:15:04 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
while( currentNode )
{
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
wxString nodeName = currentNode->GetName();
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
wxT
2022-06-08 17:16:11 +00:00
if( nodeName == wxT( "circle" ) )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( loadSymbolCircle( aSymbol, currentNode, aGateNumber ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "pin" ) )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
EPIN ePin = EPIN( currentNode );
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
std::unique_ptr<LIB_PIN> pin( loadPin( aSymbol, currentNode, &ePin, aGateNumber ) );
Eeschema Eagle Import: Set symbol as a power symbol for single supply pin eagle symbols.
2017-07-30 09:50:38 +00:00
pincount++;
Convert enums inside eeschema and the symbol editor to be scoped Scope: NETLIST_ITEM, CONNECTION_TYPE, ELECTRICAL_PINTYPE, NET_CONNECTION, NETLIST_ITEM, GRAPHIC_PINSHAPE Note, the pin type enum had PT_ added to the front to prevent shadowing of the INPUT symbol on msys2 (see discussion at https://gitlab.com/kicad/code/kicad/commit/c17c9960d83141bd42153dad07dd1025b03c31cb)
2020-01-18 20:51:28 +00:00
pin->SetType( ELECTRICAL_PINTYPE::PT_BIDI );
eagle: Set default pin type Eagle 7.4 DTD defines pin direction as optional with a default of IO (bidirectional). Fixes: lp:1808585 * https://bugs.launchpad.net/kicad/+bug/1808585
2019-01-06 16:53:16 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
if( ePin.direction )
Eeschema Eagle Import: Set symbol as a power symbol for single supply pin eagle symbols.
2017-07-30 09:50:38 +00:00
{
Eagle SCH importer: fixed open-collector pin type, simplified pin direction matching
2018-04-03 11:16:29 +00:00
for( const auto& pinDir : pinDirectionsMap )
Eeschema Eagle Import: Parse all pin directions
2017-08-05 05:41:03 +00:00
{
Eagle SCH importer: fixed open-collector pin type, simplified pin direction matching
2018-04-03 11:16:29 +00:00
if( ePin.direction->Lower() == pinDir.first )
{
pin->SetType( pinDir.second );
wxT
2022-06-08 17:16:11 +00:00
if( pinDir.first == wxT( "sup" ) ) // power supply symbol
Eagle SCH importer: fixed open-collector pin type, simplified pin direction matching
2018-04-03 11:16:29 +00:00
ispower = true;
break;
}
Eeschema Eagle Import: Parse all pin directions
2017-08-05 05:41:03 +00:00
}
Eeschema Eagle Import: Set symbol as a power symbol for single supply pin eagle symbols.
2017-07-30 09:50:38 +00:00
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
if( aDevice->connects.size() != 0 )
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
for( const ECONNECT& connect : aDevice->connects )
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
{
Eagle Schematics Importer: support for UTF-8 Fixes: lp:1736083 * https://bugs.launchpad.net/kicad/+bug/1736083
2017-12-14 09:37:32 +00:00
if( connect.gate == aGateName && pin->GetName() == connect.pin )
Eeschema Eagle Import: Import pins even if Eagle even if pin to pad mapping (connects) to found. Fixes missing pins in supply symbols.
2017-07-09 02:40:23 +00:00
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxArrayString pads = wxSplit( wxString( connect.pad ), ' ' );
Eagle Import: Handle muli-pad pins. Adds overlapping pins in the symbol definition to ensure that electrical connections are made to each pad on the footprint.
2017-09-23 07:34:20 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
pin->SetUnit( aGateNumber );
Eeschema Eagle Import: changed fixNetName() to escapeName()
2017-10-11 12:28:07 +00:00
pin->SetName( escapeName( pin->GetName() ) );
Eeschema Eagle Import: Convert overbar prefix on pins.
2017-07-14 14:36:46 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( pads.GetCount() > 1 )
Eagle Import: Handle muli-pad pins. Adds overlapping pins in the symbol definition to ensure that electrical connections are made to each pad on the footprint.
2017-09-23 07:34:20 +00:00
{
pin->SetNumberTextSize( 0 );
}
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
for( unsigned i = 0; i < pads.GetCount(); i++ )
Eagle Import: Handle muli-pad pins. Adds overlapping pins in the symbol definition to ensure that electrical connections are made to each pad on the footprint.
2017-09-23 07:34:20 +00:00
{
LIB_PIN* apin = new LIB_PIN( *pin );
wxString padname( pads[i] );
apin->SetNumber( padname );
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( apin );
Eagle Import: Handle muli-pad pins. Adds overlapping pins in the symbol definition to ensure that electrical connections are made to each pad on the footprint.
2017-09-23 07:34:20 +00:00
}
Eagle: Fix stacked NC pin import Since Eagle does not connect stacked NC pins but KiCad will if the pins are coincident, we choose to only import the first of the stacked NC pins. While this creates symbols that are slightly different in pin count from the Eagle version, it keeps the schematic and netlist functionally correct relative to the Eagle version. Fixes: lp:1821319 * https://bugs.launchpad.net/kicad/+bug/1821319 (cherry picked from commit 370109b8689f7390d29a9587e2573e48c74893ce)
2019-06-10 00:00:09 +00:00
Eeschema Eagle Import: Import pins even if Eagle even if pin to pad mapping (connects) to found. Fixes missing pins in supply symbols.
2017-07-09 02:40:23 +00:00
break;
}
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
}
}
Eeschema Eagle Import: Import pins even if Eagle even if pin to pad mapping (connects) to found. Fixes missing pins in supply symbols.
2017-07-09 02:40:23 +00:00
else
{
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
pin->SetUnit( aGateNumber );
wxT
2022-06-08 17:16:11 +00:00
pin->SetNumber( wxString::Format( wxT( "%i" ), pincount ) );
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( pin.release() );
Eeschema Eagle Import: Import pins even if Eagle even if pin to pad mapping (connects) to found. Fixes missing pins in supply symbols.
2017-07-09 02:40:23 +00:00
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "polygon" ) )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( loadSymbolPolyLine( aSymbol, currentNode, aGateNumber ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "rectangle" ) )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( loadSymbolRectangle( aSymbol, currentNode, aGateNumber ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "text" ) )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
std::unique_ptr<LIB_TEXT> libtext( loadSymbolText( aSymbol, currentNode, aGateNumber ) );
Eeschema Eagle Import: Set value and reference component field visibilities based on presence of text in symbol definition.
2017-07-16 16:15:04 +00:00
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
if( libtext->GetText() == wxT( "${REFERENCE}" ) )
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
{
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
// Move text & attributes to Reference field and discard LIB_TEXT item
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
LIB_FIELD* field = aSymbol->GetFieldById( REFERENCE_FIELD );
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
loadFieldAttributes( field, libtext.get() );
Eagle schematic import: Corrected visibility for >NAME and >VALUE
2023-01-14 14:40:35 +00:00
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
// Show Reference field if Eagle reference was uppercase
showRefDes = currentNode->GetNodeContent() == wxT( ">NAME" );
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
}
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
else if( libtext->GetText() == wxT( "${VALUE}" ) )
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
{
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
// Move text & attributes to Value field and discard LIB_TEXT item
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
LIB_FIELD* field = aSymbol->GetFieldById( VALUE_FIELD );
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
loadFieldAttributes( field, libtext.get() );
Eagle schematic import: Corrected visibility for >NAME and >VALUE
2023-01-14 14:40:35 +00:00
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
// Show Value field if Eagle reference was uppercase
showValue = currentNode->GetNodeContent() == wxT( ">VALUE" );
WIP: Symbols are imported and displayed, and save to cache file on schematic save.
2017-07-02 12:26:23 +00:00
}
else
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( libtext.release() );
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "wire" ) )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( loadSymbolWire( aSymbol, currentNode, aGateNumber ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
wxT
2022-06-08 17:16:11 +00:00
else if( nodeName == wxT( "frame" ) )
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
{
std::vector<LIB_ITEM*> frameItems;
loadFrame( currentNode, frameItems );
for( LIB_ITEM* item : frameItems )
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
item->SetParent( aSymbol.get() );
Pay attention to units for page frames. Fixes https://gitlab.com/kicad/code/kicad/issues/11408
2022-07-23 19:16:08 +00:00
item->SetUnit( aGateNumber );
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->AddDrawItem( item );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
}
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
/*
* else if( nodeName == "description" )
* {
* }
* else if( nodeName == "dimension" )
* {
* }
*/
Starts the loading layout
2017-03-09 12:49:24 +00:00
currentNode = currentNode->GetNext();
}
Eeschema Eagle Import: Set value and reference component field visibilities based on presence of text in symbol definition.
2017-07-16 16:15:04 +00:00
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
if( !showRefDes )
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->GetFieldById( REFERENCE_FIELD )->SetVisible( false );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Rework >NAME and >VALUE special processing a bit. Earlier commit moved variable substition earlier (in loadSymbolText()) so we didn't have the correct info later when we tried to do the special processing on it. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-17 12:47:05 +00:00
if( !showValue )
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
aSymbol->GetFieldById( VALUE_FIELD )->SetVisible( false );
Eeschema Eagle Import: Set value and reference component field visibilities based on presence of text in symbol definition.
2017-07-16 16:15:04 +00:00
Eeschema Eagle Import: Set symbol as a power symbol for single supply pin eagle symbols.
2017-07-30 09:50:38 +00:00
return pincount == 1 ? ispower : false;
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Code formatting and cleanup
2017-05-08 14:27:11 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
LIB_SHAPE* SCH_EAGLE_PLUGIN::loadSymbolCircle( std::unique_ptr<LIB_SYMBOL>& aSymbol,
wxXmlNode* aCircleNode, int aGateNumber )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
// Parse the circle properties
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
ECIRCLE c( aCircleNode );
LIB_SHAPE* circle = new LIB_SHAPE( aSymbol.get(), SHAPE_T::CIRCLE );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I center( c.x.ToSchUnits(), c.y.ToSchUnits() );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
circle->SetPosition( center );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
circle->SetEnd( VECTOR2I( center.x + c.radius.ToSchUnits(), center.y ) );
Shapes for schematic. ADDED arc, circle and rectangle shapes for schematic. Shapes support line styles and fill colors. CHANGED sheet background color in Edit Text & Graphics Properties to fill color (and it now affects shapes). Pushed STROKE_PARAMS down into common and moved all shapes to using it for stroke descriptions.
2021-07-17 19:56:18 +00:00
circle->SetStroke( STROKE_PARAMS( c.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
circle->SetUnit( aGateNumber );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
return circle;
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
LIB_SHAPE* SCH_EAGLE_PLUGIN::loadSymbolRectangle( std::unique_ptr<LIB_SYMBOL>& aSymbol,
wxXmlNode* aRectNode, int aGateNumber )
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
ERECT rect( aRectNode );
LIB_SHAPE* rectangle = new LIB_SHAPE( aSymbol.get(), SHAPE_T::RECT );
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
rectangle->SetPosition( VECTOR2I( rect.x1.ToSchUnits(), rect.y1.ToSchUnits() ) );
rectangle->SetEnd( VECTOR2I( rect.x2.ToSchUnits(), rect.y2.ToSchUnits() ) );
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
Handle rotated symbol rectangles in Eagle import Fixes https://gitlab.com/kicad/code/kicad/issues/10360 (cherry picked from commit dcb8f29317a89dd336cdc6aaf3356ea6fa7eda56)
2022-01-12 21:47:37 +00:00
if( rect.rot )
{
Fix cherry-picked wxPoint
2022-01-12 23:49:03 +00:00
VECTOR2I pos( rectangle->GetPosition() );
VECTOR2I end( rectangle->GetEnd() );
VECTOR2I center( rectangle->GetCenter() );
Handle rotated symbol rectangles in Eagle import Fixes https://gitlab.com/kicad/code/kicad/issues/10360 (cherry picked from commit dcb8f29317a89dd336cdc6aaf3356ea6fa7eda56)
2022-01-12 21:47:37 +00:00
Angle cleanup in Eagle importer.
2022-01-18 02:20:36 +00:00
RotatePoint( pos, center, EDA_ANGLE( rect.rot->degrees, DEGREES_T ) );
RotatePoint( end, center, EDA_ANGLE( rect.rot->degrees, DEGREES_T ) );
Handle rotated symbol rectangles in Eagle import Fixes https://gitlab.com/kicad/code/kicad/issues/10360 (cherry picked from commit dcb8f29317a89dd336cdc6aaf3356ea6fa7eda56)
2022-01-12 21:47:37 +00:00
rectangle->SetPosition( pos );
rectangle->SetEnd( end );
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
rectangle->SetUnit( aGateNumber );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Eeschema Eagle Import: Fill rectangles in symbols
2017-07-23 14:27:42 +00:00
// Eagle rectangles are filled by definition.
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
rectangle->SetFillMode( FILL_T::FILLED_SHAPE );
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
return rectangle;
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
}
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
LIB_ITEM* SCH_EAGLE_PLUGIN::loadSymbolWire( std::unique_ptr<LIB_SYMBOL>& aSymbol,
wxXmlNode* aWireNode, int aGateNumber )
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
{
Formatting.
2021-09-20 14:35:45 +00:00
EWIRE ewire = EWIRE( aWireNode );
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I begin, end;
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
begin.x = ewire.x1.ToSchUnits();
begin.y = ewire.y1.ToSchUnits();
end.x = ewire.x2.ToSchUnits();
end.y = ewire.y2.ToSchUnits();
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eagle: Fix crash when importing Eagle V6 This fixes multiple issues when importing Eagle V6 files. Crashes occured when arcs of 0-length were found and when parts were referenced in the schematic that were not found in the library. This could happen if the library and schematic were different cases. Fixes: lp:1830564 * https://bugs.launchpad.net/kicad/+bug/1830564
2019-05-27 03:12:27 +00:00
if( begin == end )
return nullptr;
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// if the wire is an arc
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
if( ewire.curve )
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
LIB_SHAPE* arc = new LIB_SHAPE( aSymbol.get(), SHAPE_T::ARC );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I center = ConvertArcCenter( begin, end, *ewire.curve * -1 );
Eagle schematic import: Corrected handling of curved symbol/wire
2023-01-11 12:31:46 +00:00
double radius = sqrt( ( ( center.x - begin.x ) * ( center.x - begin.x ) ) +
( ( center.y - begin.y ) * ( center.y - begin.y ) ) );
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
// this emulates the filled semicircles created by a thick arc with flat ends caps.
Eagle schematic import: Corrected handling of curved symbol/wire
2023-01-11 12:31:46 +00:00
if( ewire.cap == EWIRE::FLAT && ewire.width.ToSchUnits() >= 2 * radius )
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
{
Eagle schematic import: Corrected handling of curved symbol/wire
2023-01-11 12:31:46 +00:00
VECTOR2I centerStartVector = ( begin - center ) * ( ewire.width.ToSchUnits() / radius );
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
begin = center + centerStartVector;
Shapes for schematic. ADDED arc, circle and rectangle shapes for schematic. Shapes support line styles and fill colors. CHANGED sheet background color in Edit Text & Graphics Properties to fill color (and it now affects shapes). Pushed STROKE_PARAMS down into common and moved all shapes to using it for stroke descriptions.
2021-07-17 19:56:18 +00:00
arc->SetStroke( STROKE_PARAMS( 1, PLOT_DASH_TYPE::SOLID ) );
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
arc->SetFillMode( FILL_T::FILLED_SHAPE );
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
}
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
else
{
Shapes for schematic. ADDED arc, circle and rectangle shapes for schematic. Shapes support line styles and fill colors. CHANGED sheet background color in Edit Text & Graphics Properties to fill color (and it now affects shapes). Pushed STROKE_PARAMS down into common and moved all shapes to using it for stroke descriptions.
2021-07-17 19:56:18 +00:00
arc->SetStroke( STROKE_PARAMS( ewire.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
}
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
Eagle schematic import: Corrected handling of curved symbol/wire
2023-01-11 12:31:46 +00:00
arc->SetCenter( center );
arc->SetStart( begin );
arc->SetArcAngleAndEnd( EDA_ANGLE( *ewire.curve, DEGREES_T ), true );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
arc->SetUnit( aGateNumber );
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
return arc;
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
}
else
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
LIB_SHAPE* poly = new LIB_SHAPE( aSymbol.get(), SHAPE_T::POLY );
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
poly->AddPoint( begin );
poly->AddPoint( end );
poly->SetUnit( aGateNumber );
Shapes for schematic. ADDED arc, circle and rectangle shapes for schematic. Shapes support line styles and fill colors. CHANGED sheet background color in Edit Text & Graphics Properties to fill color (and it now affects shapes). Pushed STROKE_PARAMS down into common and moved all shapes to using it for stroke descriptions.
2021-07-17 19:56:18 +00:00
poly->SetStroke( STROKE_PARAMS( ewire.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
return poly;
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
}
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
}
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
LIB_SHAPE* SCH_EAGLE_PLUGIN::loadSymbolPolyLine( std::unique_ptr<LIB_SYMBOL>& aSymbol,
wxXmlNode* aPolygonNode, int aGateNumber )
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
LIB_SHAPE* poly = new LIB_SHAPE( aSymbol.get(), SHAPE_T::POLY );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
EPOLYGON epoly( aPolygonNode );
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
wxXmlNode* vertex = aPolygonNode->GetChildren();
Eagle schematic import: Handling of polygons with curved sides
2023-01-10 20:45:40 +00:00
VECTOR2I pt, prev_pt;
opt_double prev_curve;
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
while( vertex )
{
wxT
2022-06-08 17:16:11 +00:00
if( vertex->GetName() == wxT( "vertex" ) ) // skip <xmlattr> node
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
{
EVERTEX evertex( vertex );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
pt = VECTOR2I( evertex.x.ToSchUnits(), evertex.y.ToSchUnits() );
Eagle schematic import: Handling of polygons with curved sides
2023-01-10 20:45:40 +00:00
if( prev_curve )
{
SHAPE_ARC arc;
arc.ConstructFromStartEndAngle( prev_pt, pt, -EDA_ANGLE( *prev_curve, DEGREES_T ) );
EAGLE SCH: Improve detail of curved shape imports (0.01mm error) Follow-up from https://gitlab.com/kicad/code/kicad/-/merge_requests/1445
2023-01-10 21:45:46 +00:00
poly->GetPolyShape().Append( arc, -1, -1, ARC_ACCURACY );
Eagle schematic import: Handling of polygons with curved sides
2023-01-10 20:45:40 +00:00
}
else
{
poly->AddPoint( pt );
}
prev_pt = pt;
prev_curve = evertex.curve;
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
vertex = vertex->GetNext();
Work in progress - !! Eeschema uses Eagle plugin for loading schematics (i.e. it does not use KiCad format anymore) - Fixed build errors - Fixed a few crashes - Code formatting
2017-05-08 15:11:14 +00:00
}
Eagle schematic import: Handling of polygons with curved sides
2023-01-10 20:45:40 +00:00
poly->SetStroke( STROKE_PARAMS( epoly.width.ToSchUnits(), PLOT_DASH_TYPE::SOLID ) );
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
poly->SetFillMode( FILL_T::FILLED_SHAPE );
poly->SetUnit( aGateNumber );
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
return poly;
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
LIB_PIN* SCH_EAGLE_PLUGIN::loadPin( std::unique_ptr<LIB_SYMBOL>& aSymbol, wxXmlNode* aPin,
EPIN* aEPin, int aGateNumber )
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
std::unique_ptr<LIB_PIN> pin = std::make_unique<LIB_PIN>( aSymbol.get() );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
pin->SetPosition( VECTOR2I( aEPin->x.ToSchUnits(), aEPin->y.ToSchUnits() ) );
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
pin->SetName( aEPin->name );
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
pin->SetUnit( aGateNumber );
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
int roti = aEPin->rot ? aEPin->rot->degrees : 0;
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
switch( roti )
{
Overhaul arc internal model to not over-specify information.
2021-07-17 19:56:18 +00:00
case 0: pin->SetOrientation( 'R' ); break;
case 90: pin->SetOrientation( 'U' ); break;
case 180: pin->SetOrientation( 'L' ); break;
case 270: pin->SetOrientation( 'D' ); break;
wxT
2022-06-08 17:16:11 +00:00
default: wxFAIL_MSG( wxString::Format( wxT( "Unhandled orientation (%d degrees)." ), roti ) );
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
}
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
pin->SetLength( schIUScale.MilsToIU( 300 ) ); // Default pin length when not defined.
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( aEPin->length )
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
wxString length = aEPin->length.Get();
Eagle plugin: check before dereferencing optional attributes
2017-06-19 12:44:31 +00:00
wxT
2022-06-08 17:16:11 +00:00
if( length == wxT( "short" ) )
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
pin->SetLength( schIUScale.MilsToIU( 100 ) );
wxT
2022-06-08 17:16:11 +00:00
else if( length == wxT( "middle" ) )
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
pin->SetLength( schIUScale.MilsToIU( 200 ) );
wxT
2022-06-08 17:16:11 +00:00
else if( length == wxT( "long" ) )
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
pin->SetLength( schIUScale.MilsToIU( 300 ) );
wxT
2022-06-08 17:16:11 +00:00
else if( length == wxT( "point" ) )
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
pin->SetLength( schIUScale.MilsToIU( 0 ) );
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
}
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
// emulate the visibility of pin elements
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( aEPin->visible )
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
wxString visible = aEPin->visible.Get();
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
wxT
2022-06-08 17:16:11 +00:00
if( visible == wxT( "off" ) )
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
{
pin->SetNameTextSize( 0 );
pin->SetNumberTextSize( 0 );
}
wxT
2022-06-08 17:16:11 +00:00
else if( visible == wxT( "pad" ) )
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
{
pin->SetNameTextSize( 0 );
}
wxT
2022-06-08 17:16:11 +00:00
else if( visible == wxT( "pin" ) )
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
{
pin->SetNumberTextSize( 0 );
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
/*
wxT
2022-06-08 17:16:11 +00:00
* else if( visible == wxT( "both" ) )
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
* {
* }
*/
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
}
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( aEPin->function )
Eeschema Eagle Import: Set Pinshape. - modifies lin_pin.cpp function InternalPinDecoSize to default back to number text size if pin name text is set to zero.
2017-08-19 05:41:48 +00:00
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
wxString function = aEPin->function.Get();
Eeschema Eagle Import: Set Pinshape. - modifies lin_pin.cpp function InternalPinDecoSize to default back to number text size if pin name text is set to zero.
2017-08-19 05:41:48 +00:00
wxT
2022-06-08 17:16:11 +00:00
if( function == wxT( "dot" ) )
Convert enums inside eeschema and the symbol editor to be scoped Scope: NETLIST_ITEM, CONNECTION_TYPE, ELECTRICAL_PINTYPE, NET_CONNECTION, NETLIST_ITEM, GRAPHIC_PINSHAPE Note, the pin type enum had PT_ added to the front to prevent shadowing of the INPUT symbol on msys2 (see discussion at https://gitlab.com/kicad/code/kicad/commit/c17c9960d83141bd42153dad07dd1025b03c31cb)
2020-01-18 20:51:28 +00:00
pin->SetShape( GRAPHIC_PINSHAPE::INVERTED );
wxT
2022-06-08 17:16:11 +00:00
else if( function == wxT( "clk" ) )
Convert enums inside eeschema and the symbol editor to be scoped Scope: NETLIST_ITEM, CONNECTION_TYPE, ELECTRICAL_PINTYPE, NET_CONNECTION, NETLIST_ITEM, GRAPHIC_PINSHAPE Note, the pin type enum had PT_ added to the front to prevent shadowing of the INPUT symbol on msys2 (see discussion at https://gitlab.com/kicad/code/kicad/commit/c17c9960d83141bd42153dad07dd1025b03c31cb)
2020-01-18 20:51:28 +00:00
pin->SetShape( GRAPHIC_PINSHAPE::CLOCK );
wxT
2022-06-08 17:16:11 +00:00
else if( function == wxT( "dotclk" ) )
Convert enums inside eeschema and the symbol editor to be scoped Scope: NETLIST_ITEM, CONNECTION_TYPE, ELECTRICAL_PINTYPE, NET_CONNECTION, NETLIST_ITEM, GRAPHIC_PINSHAPE Note, the pin type enum had PT_ added to the front to prevent shadowing of the INPUT symbol on msys2 (see discussion at https://gitlab.com/kicad/code/kicad/commit/c17c9960d83141bd42153dad07dd1025b03c31cb)
2020-01-18 20:51:28 +00:00
pin->SetShape( GRAPHIC_PINSHAPE::INVERTED_CLOCK );
Eeschema Eagle Import: Set Pinshape. - modifies lin_pin.cpp function InternalPinDecoSize to default back to number text size if pin name text is set to zero.
2017-08-19 05:41:48 +00:00
}
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
return pin.release();
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
}
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
LIB_TEXT* SCH_EAGLE_PLUGIN::loadSymbolText( std::unique_ptr<LIB_SYMBOL>& aSymbol,
wxXmlNode* aLibText, int aGateNumber )
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
{
Rename LIB_PART to LIB_SYMBOL.
2021-06-10 18:51:46 +00:00
std::unique_ptr<LIB_TEXT> libtext = std::make_unique<LIB_TEXT>( aSymbol.get() );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
ETEXT etext( aLibText );
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
libtext->SetUnit( aGateNumber );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
libtext->SetPosition( VECTOR2I( etext.x.ToSchUnits(), etext.y.ToSchUnits() ) );
Fix malformed symbol libraries when importing Eagle schematics. KiCad library symbol text objects cannot contain carriage returns and/or line feeds which isn't the case with Eagle symbol libraries. Otherwise, the library file will be corrupt when it is saved. Fixing this in the legacy plugin would break the current file format so just replace them with underscores. Ideally these text objects should be broken into multiple text objects but the current plugin design doesn't support this.
2017-11-04 01:37:18 +00:00
Substitute variables in imported symbol text. Also allows mulit-line text items to be imported. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-16 15:14:39 +00:00
const wxString& eagleText = aLibText->GetNodeContent();
wxString adjustedText;
wxStringTokenizer tokenizer( eagleText, "\r\n" );
// Strip the whitespace from both ends of each line.
while( tokenizer.HasMoreTokens() )
{
Eagle schematic import: Handling of escaped text
2023-01-18 12:33:36 +00:00
wxString tmp = interpretText( tokenizer.GetNextToken().Trim( true ).Trim( false ) );
Substitute variables in imported symbol text. Also allows mulit-line text items to be imported. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-16 15:14:39 +00:00
if( tokenizer.HasMoreTokens() )
tmp += wxT( "\n" );
adjustedText += tmp;
}
Turn on and fix MSVC compliance mode issues We want /permissive- to enable debug performance improvements in MSVC 17.5+. This flag is also default under C++20 so we'll have to deal with these compile issues anyway at some point in the future. In particular, MSVC becomes pedantic about ternary types. See https://learn.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance?view=msvc-170#ambiguous-conditional-operator-arguments MSFT cites https://cplusplus.github.io/CWG/issues/1805.html
2023-02-12 21:29:26 +00:00
libtext->SetText( adjustedText.IsEmpty() ? wxString( wxT( "~" ) ) : adjustedText );
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
loadTextAttributes( libtext.get(), etext );
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
return libtext.release();
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
void SCH_EAGLE_PLUGIN::loadFrame( wxXmlNode* aFrameNode, std::vector<LIB_ITEM*>& aItems )
{
EFRAME eframe( aFrameNode );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
int xMin = eframe.x1.ToSchUnits();
int xMax = eframe.x2.ToSchUnits();
int yMin = eframe.y1.ToSchUnits();
int yMax = eframe.y2.ToSchUnits();
if( xMin > xMax )
std::swap( xMin, xMax );
if( yMin > yMax )
std::swap( yMin, yMax );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
LIB_SHAPE* lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
lines->AddPoint( VECTOR2I( xMin, yMin ) );
lines->AddPoint( VECTOR2I( xMax, yMin ) );
lines->AddPoint( VECTOR2I( xMax, yMax ) );
lines->AddPoint( VECTOR2I( xMin, yMax ) );
lines->AddPoint( VECTOR2I( xMin, yMin ) );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
aItems.push_back( lines );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
if( !( eframe.border_left == false ) )
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
int i;
int height = yMax - yMin;
int x1 = xMin;
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
int x2 = x1 + schIUScale.MilsToIU( 150 );
int legendPosX = xMin + schIUScale.MilsToIU( 75 );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
double rowSpacing = height / double( eframe.rows );
double legendPosY = yMax - ( rowSpacing / 2 );
for( i = 1; i < eframe.rows; i++ )
{
int newY = KiROUND( yMin + ( rowSpacing * (double) i ) );
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
lines->AddPoint( VECTOR2I( x1, newY ) );
lines->AddPoint( VECTOR2I( x2, newY ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
}
char legendChar = 'A';
for( i = 0; i < eframe.rows; i++ )
{
LIB_TEXT* legendText = new LIB_TEXT( nullptr );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
legendText->SetPosition( VECTOR2I( legendPosX, KiROUND( legendPosY ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosY -= rowSpacing;
}
}
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
if( !( eframe.border_right == false ) )
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
int i;
int height = yMax - yMin;
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
int x1 = xMax - schIUScale.MilsToIU( 150 );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
int x2 = xMax;
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
int legendPosX = xMax - schIUScale.MilsToIU( 75 );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
double rowSpacing = height / double( eframe.rows );
double legendPosY = yMax - ( rowSpacing / 2 );
for( i = 1; i < eframe.rows; i++ )
{
int newY = KiROUND( yMin + ( rowSpacing * (double) i ) );
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
lines->AddPoint( VECTOR2I( x1, newY ) );
lines->AddPoint( VECTOR2I( x2, newY ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
}
char legendChar = 'A';
for( i = 0; i < eframe.rows; i++ )
{
LIB_TEXT* legendText = new LIB_TEXT( nullptr );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
legendText->SetPosition( VECTOR2I( legendPosX, KiROUND( legendPosY ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosY -= rowSpacing;
}
}
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
if( !( eframe.border_top == false ) )
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMax - schIUScale.MilsToIU( 150 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
int i;
int width = xMax - xMin;
int y1 = yMin;
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
int y2 = yMin + schIUScale.MilsToIU( 150 );
int legendPosY = yMax - schIUScale.MilsToIU( 75 );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
double columnSpacing = width / double( eframe.columns );
double legendPosX = xMin + ( columnSpacing / 2 );
for( i = 1; i < eframe.columns; i++ )
{
int newX = KiROUND( xMin + ( columnSpacing * (double) i ) );
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
lines->AddPoint( VECTOR2I( newX, y1 ) );
lines->AddPoint( VECTOR2I( newX, y2 ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
}
char legendChar = '1';
for( i = 0; i < eframe.columns; i++ )
{
LIB_TEXT* legendText = new LIB_TEXT( nullptr );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
legendText->SetPosition( VECTOR2I( KiROUND( legendPosX ), legendPosY ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosX += columnSpacing;
}
}
Eagle schematic import: Corrected handling of plain/frame
2023-01-13 14:36:49 +00:00
if( !( eframe.border_bottom == false ) )
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
{
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
lines->AddPoint( VECTOR2I( xMax - schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
lines->AddPoint( VECTOR2I( xMin + schIUScale.MilsToIU( 150 ),
yMin + schIUScale.MilsToIU( 150 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
int i;
int width = xMax - xMin;
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
int y1 = yMax - schIUScale.MilsToIU( 150 );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
int y2 = yMax;
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
int legendPosY = yMin + schIUScale.MilsToIU( 75 );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
double columnSpacing = width / double( eframe.columns );
double legendPosX = xMin + ( columnSpacing / 2 );
for( i = 1; i < eframe.columns; i++ )
{
int newX = KiROUND( xMin + ( columnSpacing * (double) i ) );
Replace individual LIB_* shapes with LIB_SHAPE (based on EDA_SHAPE). Also moves to more capable FILL_T model that can be shared.
2021-07-18 23:08:54 +00:00
lines = new LIB_SHAPE( nullptr, SHAPE_T::POLY );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
lines->AddPoint( VECTOR2I( newX, y1 ) );
lines->AddPoint( VECTOR2I( newX, y2 ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( lines );
}
char legendChar = '1';
for( i = 0; i < eframe.columns; i++ )
{
LIB_TEXT* legendText = new LIB_TEXT( nullptr );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
legendText->SetPosition( VECTOR2I( KiROUND( legendPosX ), legendPosY ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
legendText->SetText( wxString( legendChar ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
legendText->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 90 ),
schIUScale.MilsToIU( 100 ) ) );
Eeschema: Eagle schematic plugin parser improvements. * Complete drawing of sheet border/title block symbol.
2021-02-16 14:33:15 +00:00
aItems.push_back( legendText );
legendChar++;
legendPosX += columnSpacing;
}
}
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
SCH_TEXT* SCH_EAGLE_PLUGIN::loadPlainText( wxXmlNode* aSchText )
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
{
Cleanup creation of all our smart pointers
2020-10-26 23:49:11 +00:00
std::unique_ptr<SCH_TEXT> schtext = std::make_unique<SCH_TEXT>();
ETEXT etext = ETEXT( aSchText );
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
Substitute variables in imported symbol text. Also allows mulit-line text items to be imported. Fixes https://gitlab.com/kicad/code/kicad/issues/13541
2023-01-16 15:14:39 +00:00
const wxString& eagleText = aSchText->GetNodeContent();
wxString adjustedText;
wxStringTokenizer tokenizer( eagleText, "\r\n" );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
// Strip the whitespace from both ends of each line.
while( tokenizer.HasMoreTokens() )
{
Eagle schematic import: Handling of escaped text
2023-01-18 12:33:36 +00:00
wxString tmp = interpretText( tokenizer.GetNextToken().Trim( true ).Trim( false ) );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
if( tokenizer.HasMoreTokens() )
tmp += wxT( "\n" );
adjustedText += tmp;
}
Turn on and fix MSVC compliance mode issues We want /permissive- to enable debug performance improvements in MSVC 17.5+. This flag is also default under C++20 so we'll have to deal with these compile issues anyway at some point in the future. In particular, MSVC becomes pedantic about ternary types. See https://learn.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance?view=msvc-170#ambiguous-conditional-operator-arguments MSFT cites https://cplusplus.github.io/CWG/issues/1805.html
2023-02-12 21:29:26 +00:00
schtext->SetText( adjustedText.IsEmpty() ? wxString( wxT( "\" \"" ) ) : escapeName( adjustedText ) );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
schtext->SetPosition( VECTOR2I( etext.x.ToSchUnits(), -etext.y.ToSchUnits() ) );
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
loadTextAttributes( schtext.get(), etext );
schtext->SetItalic( false );
Eeschema Eagle: Created convertTextSize function.
2017-08-19 07:34:22 +00:00
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
return schtext.release();
}
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
void SCH_EAGLE_PLUGIN::loadTextAttributes( EDA_TEXT* aText, const ETEXT& aAttribs ) const
{
aText->SetTextSize( aAttribs.ConvertSize() );
if( aAttribs.ratio )
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
{
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
if( aAttribs.ratio.CGet() > 12 )
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
{
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
aText->SetBold( true );
Remove a bunch of globals.
2020-04-14 12:25:00 +00:00
aText->SetTextThickness( GetPenSizeForBold( aText->GetTextWidth() ) );
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
}
}
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int align = aAttribs.align ? *aAttribs.align : ETEXT::BOTTOM_LEFT;
int degrees = aAttribs.rot ? aAttribs.rot->degrees : 0;
bool mirror = aAttribs.rot ? aAttribs.rot->mirror : false;
bool spin = aAttribs.rot ? aAttribs.rot->spin : false;
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
eagleToKicadAlignment( aText, align, degrees, mirror, spin, 0 );
Eeschema: Eagle Import: Add schematic text. Parse eagle vector text ratio to determine if text is bold.
2017-07-05 15:05:03 +00:00
}
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
void SCH_EAGLE_PLUGIN::loadFieldAttributes( LIB_FIELD* aField, const LIB_TEXT* aText ) const
{
aField->SetTextPos( aText->GetPosition() );
aField->SetTextSize( aText->GetTextSize() );
aField->SetTextAngle( aText->GetTextAngle() );
aField->SetBold( aText->IsBold() );
aField->SetVertJustify( aText->GetVertJustify() );
aField->SetHorizJustify( aText->GetHorizJustify() );
}
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
void SCH_EAGLE_PLUGIN::adjustNetLabels()
{
// Eagle supports detached labels, so a label does not need to be placed on a wire
// to be associated with it. KiCad needs to move them, so the labels actually touch the
// corresponding wires.
// Sort the intersection points to speed up the search process
std::sort( m_wireIntersections.begin(), m_wireIntersections.end() );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
auto onIntersection =
[&]( const VECTOR2I& aPos )
{
return std::binary_search( m_wireIntersections.begin(),
m_wireIntersections.end(), aPos );
};
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
Formatting.
2021-09-20 14:35:45 +00:00
for( SEG_DESC& segDesc : m_segments )
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
{
for( SCH_TEXT* label : segDesc.labels )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
VECTOR2I labelPos( label->GetPosition() );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
const SEG* segAttached = segDesc.LabelAttached( label );
if( segAttached && !onIntersection( labelPos ) )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
continue; // label is placed correctly
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
// Move the label to the nearest wire
if( !segAttached )
{
Formatting.
2021-09-20 14:35:45 +00:00
std::tie( labelPos, segAttached ) = findNearestLinePoint( label->GetPosition(),
segDesc.segs );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( !segAttached ) // we cannot do anything
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
continue;
}
// Create a vector pointing in the direction of the wire, 50 mils long
VECTOR2I wireDirection( segAttached->B - segAttached->A );
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
wireDirection = wireDirection.Resize( schIUScale.MilsToIU( 50 ) );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
const VECTOR2I origPos( labelPos );
// Flags determining the search direction
bool checkPositive = true, checkNegative = true, move = false;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int trial = 0;
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
// Be sure the label is not placed on a wire intersection
while( ( !move || onIntersection( labelPos ) ) && ( checkPositive || checkNegative ) )
{
move = false;
// Move along the attached wire to find the new label position
if( trial % 2 == 1 )
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
labelPos = VECTOR2I( origPos + wireDirection * trial / 2 );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
move = checkPositive = segAttached->Contains( labelPos );
}
else
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
labelPos = VECTOR2I( origPos - wireDirection * trial / 2 );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
move = checkNegative = segAttached->Contains( labelPos );
}
++trial;
}
if( move )
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
label->SetPosition( VECTOR2I( labelPos ) );
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
}
}
m_segments.clear();
m_wireIntersections.clear();
}
Eeschema: Add CheckHeader function to SCH_PLUGIN and cycle through plugins when loading files.
2017-06-21 12:41:00 +00:00
bool SCH_EAGLE_PLUGIN::CheckHeader( const wxString& aFileName )
{
// Open file and check first line
wxTextFile tempFile;
tempFile.Open( aFileName );
wxString firstline;
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
Eeschema: Add CheckHeader function to SCH_PLUGIN and cycle through plugins when loading files.
2017-06-21 12:41:00 +00:00
// read the first line
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
firstline = tempFile.GetFirstLine();
wxString secondline = tempFile.GetNextLine();
wxString thirdline = tempFile.GetNextLine();
Eeschema: Add CheckHeader function to SCH_PLUGIN and cycle through plugins when loading files.
2017-06-21 12:41:00 +00:00
tempFile.Close();
wxT
2022-06-08 17:16:11 +00:00
return firstline.StartsWith( wxT( "<?xml" ) )
&& secondline.StartsWith( wxT( "<!DOCTYPE eagle SYSTEM" ) )
&& thirdline.StartsWith( wxT( "<eagle version" ) );
Eeschema: Add CheckHeader function to SCH_PLUGIN and cycle through plugins when loading files.
2017-06-21 12:41:00 +00:00
}
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
void SCH_EAGLE_PLUGIN::moveLabels( SCH_LINE* aWire, const VECTOR2I& aNewEndPoint )
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
{
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_SCREEN* screen = getCurrentScreen();
wxCHECK( screen, /* void */ );
SCH_NETCLASS_FLAGs and SCH_FIELDs for labels. ADDED: a new label type for netclass flags. ADDED: the ability to define fields on labels.
2021-10-12 20:05:37 +00:00
for( SCH_ITEM* item : screen->Items().Overlapping( aWire->GetBoundingBox() ) )
Eeschema Eagle Import: Move any labels while inserting bus entry symbols.
2017-08-14 14:45:57 +00:00
{
Move KICAD_T[] to std::initializer_list<KICAD_T>.
2022-08-20 09:27:35 +00:00
if( !item->IsType( { SCH_LABEL_LOCATE_ANY_T } ) )
SCH_NETCLASS_FLAGs and SCH_FIELDs for labels. ADDED: a new label type for netclass flags. ADDED: the ability to define fields on labels.
2021-10-12 20:05:37 +00:00
continue;
if( TestSegmentHit( item->GetPosition(), aWire->GetStartPoint(), aWire->GetEndPoint(), 0 ) )
item->SetPosition( aNewEndPoint );
Eeschema Eagle Import: Move any labels while inserting bus entry symbols.
2017-08-14 14:45:57 +00:00
}
}
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
void SCH_EAGLE_PLUGIN::addBusEntries()
{
// Add bus entry symbols
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
// TODO: Cleanup this function and break into pieces
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
// for each wire segment, compare each end with all busses.
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
// If the wire end is found to end on a bus segment, place a bus entry symbol.
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
std::vector<SCH_LINE*> buses;
std::vector<SCH_LINE*> wires;
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
SCH_SCREEN* screen = getCurrentScreen();
wxCHECK( screen, /* void */ );
for( SCH_ITEM* ii : screen->Items().OfType( SCH_LINE_T ) )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_LINE* line = static_cast<SCH_LINE*>( ii );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( line->IsBus() )
buses.push_back( line );
else if( line->IsWire() )
wires.push_back( line );
}
First take at repairing Eagle import of bus entries. Simplify logic by adding quadrant-based BUS_ENTRY ctor. Fix issue with bus entry size having been in mils rather than IU. Fix issues with logic. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-15 22:21:53 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
for( SCH_LINE* wire : wires )
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I wireStart = wire->GetStartPoint();
VECTOR2I wireEnd = wire->GetEndPoint();
First take at repairing Eagle import of bus entries. Simplify logic by adding quadrant-based BUS_ENTRY ctor. Fix issue with bus entry size having been in mils rather than IU. Fix issues with logic. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-15 22:21:53 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
for( SCH_LINE* bus : buses )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I busStart = bus->GetStartPoint();
VECTOR2I busEnd = bus->GetEndPoint();
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
auto entrySize =
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
[]( int signX, int signY ) -> VECTOR2I
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
{
Strip out Mils2Iu
2022-09-16 23:42:20 +00:00
return VECTOR2I( schIUScale.MilsToIU( DEFAULT_SCH_ENTRY_SIZE ) * signX,
schIUScale.MilsToIU( DEFAULT_SCH_ENTRY_SIZE ) * signY );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
};
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
auto testBusHit =
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
[&]( const VECTOR2I& aPt ) -> bool
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
{
return TestSegmentHit( aPt, busStart, busEnd, 0 );
};
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( wireStart.y == wireEnd.y && busStart.x == busEnd.x )
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
// Horizontal wire and vertical bus
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireStart ) )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
// Wire start is on the vertical bus
if( wireEnd.x < busStart.x )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* the end of the wire is to the left of the bus
* ⎥⎢
* ——————⎥⎢
* ⎥⎢
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( -1, 0 );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireStart + entrySize( 0, -1 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* there is room above the wire for the bus entry
* ⎥⎢
* _____/⎥⎢
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else if( testBusHit( wireStart + entrySize( 0, 1 ) ) )
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* there is room below the wire for the bus entry
* _____ ⎥⎢
* \⎥⎢
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
else
{
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
else
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* the wire end is to the right of the bus
* ⎥⎢
* ⎥⎢——————
* ⎥⎢
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( 1, 0 );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireStart + entrySize( 0, -1 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* There is room above the wire for the bus entry
* ⎥⎢
* ⎥⎢\_____
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p , 4 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
else if( testBusHit( wireStart + entrySize( 0, 1 ) ) )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* There is room below the wire for the bus entry
* ⎥⎢ _____
* ⎥⎢/
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
break;
}
else if( testBusHit( wireEnd ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
// Wire end is on the vertical bus
if( wireStart.x < busStart.x )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* start of the wire is to the left of the bus
* ⎥⎢
* ——————⎥⎢
* ⎥⎢
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( -1, 0 );
First take at repairing Eagle import of bus entries. Simplify logic by adding quadrant-based BUS_ENTRY ctor. Fix issue with bus entry size having been in mils rather than IU. Fix issues with logic. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-15 22:21:53 +00:00
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireEnd + entrySize( 0, -1 ) ) )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* there is room above the wire for the bus entry
* ⎥⎢
* _____/⎥⎢
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else if( testBusHit( wireEnd + entrySize( 0, -1 ) ) )
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* there is room below the wire for the bus entry
* _____ ⎥⎢
* \⎥⎢
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, wireEnd + entrySize( -1, 0 ) );
wire->SetEndPoint( wireEnd + entrySize( -1, 0 ) );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
First take at repairing Eagle import of bus entries. Simplify logic by adding quadrant-based BUS_ENTRY ctor. Fix issue with bus entry size having been in mils rather than IU. Fix issues with logic. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-15 22:21:53 +00:00
else
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
else
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* the start of the wire is to the right of the bus
* ⎥⎢
* ⎥⎢——————
* ⎥⎢
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( 1, 0 );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireEnd + entrySize( 0, -1 ) ) )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* There is room above the wire for the bus entry
* ⎥⎢
* ⎥⎢\_____
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else if( testBusHit( wireEnd + entrySize( 0, 1 ) ) )
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* There is room below the wire for the bus entry
* ⎥⎢ _____
* ⎥⎢/
* ⎥⎢
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
First take at repairing Eagle import of bus entries. Simplify logic by adding quadrant-based BUS_ENTRY ctor. Fix issue with bus entry size having been in mils rather than IU. Fix issues with logic. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-15 22:21:53 +00:00
else
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
}
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
break;
}
}
else if( wireStart.x == wireEnd.x && busStart.y == busEnd.y )
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
// Vertical wire and horizontal bus
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireStart ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
// Wire start is on the bus
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( wireEnd.y < busStart.y )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* the end of the wire is above the bus
* |
* |
* |
* =======
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( 0, -1 );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireStart + entrySize( -1, 0 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
fix compil warnings ( "multi-line comment" ) and missing override
2021-06-17 06:08:27 +00:00
/* there is room to the left of the wire for the bus entry
Improved ASCII art.
2021-06-18 11:01:16 +00:00
* |
* |
* /
* =======
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
else if( testBusHit( wireStart + entrySize( 1, 0 ) ) )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
fix compil warnings ( "multi-line comment" ) and missing override
2021-06-17 06:08:27 +00:00
/* there is room to the right of the wire for the bus entry
Improved ASCII art.
2021-06-18 11:01:16 +00:00
* |
* |
* \
* =======
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
}
else
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* wire end is below the bus
* =======
* |
* |
* |
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( 0, 1 );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireStart + entrySize( -1, 0 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
fix compil warnings ( "multi-line comment" ) and missing override
2021-06-17 06:08:27 +00:00
/* there is room to the left of the wire for the bus entry
Improved ASCII art.
2021-06-18 11:01:16 +00:00
* =======
* \
* |
* |
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
else if( testBusHit( wireStart + entrySize( 1, 0 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
fix compil warnings ( "multi-line comment" ) and missing override
2021-06-17 06:08:27 +00:00
/* there is room to the right of the wire for the bus entry
Improved ASCII art.
2021-06-18 11:01:16 +00:00
* =======
* /
* |
* |
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
break;
}
else if( testBusHit( wireEnd ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
// Wire end is on the bus
Eagle Project Import: Code cleanup and documentation. - Also makes the project and file import functions filetype dependent. - The change from IO_MGR::KICAD to IO_MGR::KICAD_SEXP removes a conflict from a compile definition for KICAD when compiling kicad/import_project.cpp
2017-10-03 10:23:52 +00:00
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( wireStart.y < busStart.y )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* the start of the wire is above the bus
* |
* |
* |
* =======
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( 0, -1 );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireEnd + entrySize( -1, 0 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
fix compil warnings ( "multi-line comment" ) and missing override
2021-06-17 06:08:27 +00:00
/* there is room to the left of the wire for the bus entry
Improved ASCII art.
2021-06-18 11:01:16 +00:00
* |
* |
* /
* =======
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
else if( testBusHit( wireEnd + entrySize( 1, 0 ) ) )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
{
fix compil warnings ( "multi-line comment" ) and missing override
2021-06-17 06:08:27 +00:00
/* there is room to the right of the wire for the bus entry
Improved ASCII art.
2021-06-18 11:01:16 +00:00
* |
* |
* \
* =======
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
}
else
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* wire start is below the bus
* =======
* |
* |
* |
*/
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( 0, 1 );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
if( testBusHit( wireEnd + entrySize( -1, 0 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
fix compil warnings ( "multi-line comment" ) and missing override
2021-06-17 06:08:27 +00:00
/* there is room to the left of the wire for the bus entry
Improved ASCII art.
2021-06-18 11:01:16 +00:00
* =======
* \
* |
* |
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
else if( testBusHit( wireEnd + entrySize( 1, 0 ) ) )
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
{
Improved ASCII art.
2021-06-18 11:01:16 +00:00
/* there is room to the right of the wire for the bus entry
* =======
* /
* |
* |
*/
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( marker );
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
}
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
break;
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
}
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
else
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
// Wire isn't horizontal or vertical
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( testBusHit( wireStart ) )
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I wirevector = wireStart - wireEnd;
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( wirevector.x > 0 )
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( wirevector.y > 0 )
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( -1, -1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( -1, 1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
}
else
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( wirevector.y > 0 )
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( 1, -1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireStart + entrySize( 1, 1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetStartPoint( p );
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
}
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
break;
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
}
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
else if( testBusHit( wireEnd ) )
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I wirevector = wireStart - wireEnd;
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( wirevector.x > 0 )
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( wirevector.y > 0 )
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( 1, 1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( 1, -1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
}
else
{
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
if( wirevector.y > 0 )
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( -1, 1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I p = wireEnd + entrySize( -1, -1 );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
screen->Append( busEntry );
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
moveLabels( wire, p );
wire->SetEndPoint( p );
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
}
More Eagle importer fixes. 1) Don't process wires more than once when looking for bus entries. 2) Don't allow processing a wire to mess up iteration over the RTree.
2021-06-17 17:16:38 +00:00
break;
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
}
}
Replace EESchema DLIST This moves EESchema DLIST structures to rtree. These changes are more fundamental than the pcbnew changes from 9163ac543 888c01d11 d1877d7c1 and 961b22d60 as eeschema operations were more dependent on passing drawing list references around with SCH_ITEM* objects.
2019-06-25 23:39:58 +00:00
}
Fixes for Eagle importer. 1) Make sure we set an absolute path on the sheet. 2) Don't mix RTree iterators; wires get skipped between buses. 3) Implement a real ERC error so we don't assert. Fixes https://gitlab.com/kicad/code/kicad/issues/7042
2021-06-16 20:02:39 +00:00
}
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
}
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
const SEG* SCH_EAGLE_PLUGIN::SEG_DESC::LabelAttached( const SCH_TEXT* aLabel ) const
{
VECTOR2I labelPos( aLabel->GetPosition() );
Formatting.
2021-09-20 14:35:45 +00:00
for( const SEG& seg : segs )
Eagle SCH import: Improved net label placement algorithm Eagle support net labels that are naming wires not directly connected to the labels. In KiCad it is not possible, therefore such detached net labels need to be moved, so they touch the corresponding wire. The initial algorithm did not take into account that a moved net label might be placed on a wire crossing, effectively shorting two nets. This commit improves the placement algorithm by avoiding the wire crossing points when placing a label. Fixes: lp:1748502 * https://bugs.launchpad.net/kicad/+bug/1748502
2018-03-28 14:03:27 +00:00
{
if( seg.Contains( labelPos ) )
return &seg;
}
return nullptr;
}
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
Fix more broken Doxygen comment specifiers.
2021-01-26 15:23:37 +00:00
// TODO could be used to place junctions, instead of IsJunctionNeeded()
// (see SCH_EDIT_FRAME::importFile())
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
bool SCH_EAGLE_PLUGIN::checkConnections( const SCH_SYMBOL* aSymbol, const LIB_PIN* aPin ) const
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
{
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
wxCHECK( aSymbol && aPin, false );
Neurotically update position wxPoint usages
2022-01-01 06:04:08 +00:00
VECTOR2I pinPosition = aSymbol->GetPinPhysicalPosition( aPin );
auto pointIt = m_connPoints.find( pinPosition );
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
if( pointIt == m_connPoints.end() )
return false;
const auto& items = pointIt->second;
Update Eagle schematic importer to handle recent instance data changes.
2022-11-02 12:25:58 +00:00
wxCHECK( items.find( aPin ) != items.end(), false );
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
return items.size() > 1;
}
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
void SCH_EAGLE_PLUGIN::addImplicitConnections( SCH_SYMBOL* aSymbol, SCH_SCREEN* aScreen,
bool aUpdateSet )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
Expunge the use of the word part from Eeschema code.
2021-06-15 12:31:28 +00:00
wxCHECK( aSymbol->GetLibSymbolRef(), /*void*/ );
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
// Normally power parts also have power input pins,
// but they already force net names on the attached wires
Expunge the use of the word part from Eeschema code.
2021-06-15 12:31:28 +00:00
if( aSymbol->GetLibSymbolRef()->IsPower() )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
return;
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
int unit = aSymbol->GetUnit();
const wxString reference = aSymbol->GetField( REFERENCE_FIELD )->GetText();
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
std::vector<LIB_PIN*> pins;
Expunge the use of the word part from Eeschema code.
2021-06-15 12:31:28 +00:00
aSymbol->GetLibSymbolRef()->GetPins( pins );
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
std::set<int> missingUnits;
// Search all units for pins creating implicit connections
Formatting.
2021-09-20 14:35:45 +00:00
for( const LIB_PIN* pin : pins )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
Convert enums inside eeschema and the symbol editor to be scoped Scope: NETLIST_ITEM, CONNECTION_TYPE, ELECTRICAL_PINTYPE, NET_CONNECTION, NETLIST_ITEM, GRAPHIC_PINSHAPE Note, the pin type enum had PT_ added to the front to prevent shadowing of the INPUT symbol on msys2 (see discussion at https://gitlab.com/kicad/code/kicad/commit/c17c9960d83141bd42153dad07dd1025b03c31cb)
2020-01-18 20:51:28 +00:00
if( pin->GetType() == ELECTRICAL_PINTYPE::PT_POWER_IN )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
bool pinInUnit = !unit || pin->GetUnit() == unit; // pin belongs to the tested unit
Eagle SCH import: improved implicit connections resolution Nets assigned by power pins are weak, meaning they are valid as long as there is nothing else attached to such pins. This patch checks whether there are other wires or pins attached to a power pin before placing a global net label. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-12 16:10:22 +00:00
// Create a global net label only if there are no other wires/pins attached
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
if( pinInUnit )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
if( !checkConnections( aSymbol, pin ) )
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
{
// Create a net label to force the net name on the pin
SCH_GLOBALLABEL* netLabel = new SCH_GLOBALLABEL;
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
netLabel->SetPosition( aSymbol->GetPinPhysicalPosition( pin ) );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
netLabel->SetText( extractNetName( pin->GetName() ) );
Yeet the last of wxSize/wxPoint to stop leaking gdicmn everywhere
2023-02-19 03:40:07 +00:00
netLabel->SetTextSize( VECTOR2I( schIUScale.MilsToIU( 40 ),
schIUScale.MilsToIU( 40 ) ) );
Improve Eagle importer's label positioning. Fixes https://gitlab.com/kicad/code/kicad/issues/9466
2021-10-27 12:48:49 +00:00
switch( pin->GetOrientation() )
{
Break sch_text.h/.cpp into sch_text and sch_label. Also moves SCH_NETCLASS_FLAG to SCH_DIRECTIVE_LABEL, and remaps Altium harnesses from SCH_TEXT to SCH_DIRECTIVE_LABEL.
2022-01-24 13:40:39 +00:00
case PIN_LEFT: netLabel->SetTextSpinStyle( TEXT_SPIN_STYLE::RIGHT ); break;
case PIN_RIGHT: netLabel->SetTextSpinStyle( TEXT_SPIN_STYLE::LEFT ); break;
case PIN_UP: netLabel->SetTextSpinStyle( TEXT_SPIN_STYLE::UP ); break;
case PIN_DOWN: netLabel->SetTextSpinStyle( TEXT_SPIN_STYLE::BOTTOM ); break;
Improve Eagle importer's label positioning. Fixes https://gitlab.com/kicad/code/kicad/issues/9466
2021-10-27 12:48:49 +00:00
}
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
aScreen->Append( netLabel );
}
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
}
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
else if( aUpdateSet )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
// Found a pin creating implicit connection information in another unit.
// Such units will be instantiated if they do not appear in another sheet and
// processed later.
wxASSERT( pin->GetUnit() );
missingUnits.insert( pin->GetUnit() );
}
}
}
Expunge the use of the word part from Eeschema code.
2021-06-15 12:31:28 +00:00
if( aUpdateSet && aSymbol->GetLibSymbolRef()->GetUnitCount() > 1 )
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
auto cmpIt = m_missingCmps.find( reference );
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
// The first unit found has always already been processed.
if( cmpIt == m_missingCmps.end() )
{
EAGLE_MISSING_CMP& entry = m_missingCmps[reference];
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
entry.cmp = aSymbol;
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
entry.units.emplace( unit, false );
}
else
{
// Set the flag indicating this unit has been processed.
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
cmpIt->second.units[unit] = false;
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
}
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
if( !missingUnits.empty() ) // Save the units that need later processing
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
{
EAGLE_MISSING_CMP& entry = m_missingCmps[reference];
Rename SCH_COMPONENT to SCH_SYMBOL.
2021-06-10 14:10:55 +00:00
entry.cmp = aSymbol;
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
// Add units that haven't already been processed.
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
for( int i : missingUnits )
Eeschema: Eagle schematic plugin parser improvements. * Fix multi line text alignment. * Parse schematic frame objects and convert them to lines. * Make implicit global labels normal size so they can easily be seen. * Move sheet fields to a more sensible position. * Parse schematic symbol instances before wires so that the implicit power connections can properly be tested. This will be used at a later time. * Scale label text size down to allow for differences in label offset and graphical items.
2021-02-15 21:44:58 +00:00
{
if( entry.units.find( i ) != entry.units.end() )
entry.units.emplace( i, true );
}
Eagle SCH import: handle implicit connections Each named power input pin in Eagle creates an implicit connection to a net with the name of the pin (e.g. GND, VCC). It is also done for the units (gates in Eagle nomenclature) that have not been instantiated in the schematics. To emulate this behaviour in KiCad: - Placed components are checked for power input pins, so they will have global net labels attached to create the described implicit connections. - As the components are placed, the remaining units of the symbol are checked for power inputs to see if they need to be instantiated together with global net labels. Fixes: lp:1755191 * https://bugs.launchpad.net/kicad/+bug/1755191
2018-04-06 13:56:32 +00:00
}
}
}
Eagle SCH importer: fix slash characters when fixing symbol names Even though slash is a valid character in symbol names, it is a revision separator, but is not the case with Eagle symbol names. Fixes: lp:1791653 * https://bugs.launchpad.net/kicad/+bug/1791653
2018-09-12 08:10:33 +00:00
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
wxString SCH_EAGLE_PLUGIN::translateEagleBusName( const wxString& aEagleName ) const
{
Integration of netclasses into Eeschema. This is mostly architecture, with the hookup of the Schematic Setup dialog's Net Classes page. Things like assigning to a net on the canvas to follow. Fixes https://gitlab.com/kicad/code/kicad/issues/2132 Fixes https://gitlab.com/kicad/code/kicad/issues/4581
2020-07-06 10:51:04 +00:00
if( NET_SETTINGS::ParseBusVector( aEagleName, nullptr, nullptr ) )
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
return aEagleName;
wxT
2022-06-08 17:16:11 +00:00
wxString ret = wxT( "{" );
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
wxT
2022-06-08 17:16:11 +00:00
wxStringTokenizer tokenizer( aEagleName, wxT( "," ) );
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
while( tokenizer.HasMoreTokens() )
{
wxString member = tokenizer.GetNextToken();
// In Eagle, overbar text is automatically stopped at the end of the net name, even when
// that net name is part of a bus definition. In KiCad, we don't (currently) do that, so
// if there is an odd number of overbar markers in this net name, we need to append one
// to close it out before appending the space.
if( member.Freq( '!' ) % 2 > 0 )
wxT
2022-06-08 17:16:11 +00:00
member << wxT( "!" );
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
wxT
2022-06-08 17:16:11 +00:00
ret << member << wxS( " " );
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
}
ret.Trim( true );
wxT
2022-06-08 17:16:11 +00:00
ret << wxT( "}" );
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
return ret;
}