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

2636 lines
92 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
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
* Copyright (C) 2017-2020 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
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 <sch_eagle_plugin.h>
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
#include <kiway.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 <properties.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>
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +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
#include <class_libentry.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 <class_library.h>
#include <eagle_parser.h>
#include <gr_text.h>
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
#include <lib_arc.h>
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
#include <lib_circle.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>
#include <lib_item.h>
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
#include <lib_pin.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_polyline.h>
#include <lib_rectangle.h>
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
#include <lib_text.h>
Introduce new KI_FALLTHROUGH macro Annotate purposeful fallthroughs in switch statements with the KI_FALLTHROUGH macro.
2020-04-24 23:44:09 +00:00
#include <macros.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>
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_component.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>
#include <sch_legacy_plugin.h>
#include <sch_marker.h>
#include <sch_screen.h>
#include <sch_sheet.h>
#include <sch_sheet_path.h>
#include <sch_text.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 <template_fieldnames.h>
#include <wildcards_and_files_ext.h>
#include <ws_draw_item.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
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
// 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 = {
{ "sup", ELECTRICAL_PINTYPE::PT_POWER_IN },
{ "pas", ELECTRICAL_PINTYPE::PT_PASSIVE },
{ "out", ELECTRICAL_PINTYPE::PT_OUTPUT },
{ "in", ELECTRICAL_PINTYPE::PT_INPUT },
{ "nc", ELECTRICAL_PINTYPE::PT_NC },
{ "io", ELECTRICAL_PINTYPE::PT_BIDI },
{ "oc", ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR },
{ "hiz", ELECTRICAL_PINTYPE::PT_TRISTATE },
{ "pwr", ELECTRICAL_PINTYPE::PT_POWER_IN },
};
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
/**
* Provides an easy access to the children of an XML node via their names.
* @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
Eagle SCH import: moved sheet bbox calculation to a function
2018-04-06 11:23:24 +00:00
///> Computes a bounding box for all items in a schematic sheet
static EDA_RECT getSheetBbox( SCH_SHEET* aSheet )
{
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
EDA_RECT bbox;
Eagle SCH import: do not crash if nothing was imported
2018-05-29 07:27:11 +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
for( auto 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;
}
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
///> Extracts the net name part from a pin name (e.g. return 'GND' for pin named 'GND@2')
static inline wxString extractNetName( const wxString& aPinName )
{
return aPinName.BeforeFirst( '@' );
}
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() )
m_libName = "noname";
m_libName += "-eagle-import";
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
m_libName = LIB_ID::FixIllegalChars( m_libName, LIB_ID::ID_SCH, 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
for( const auto& elayer : eagleLayers )
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +00:00
{
/**
* Layers in Kicad schematics are not actually layers, but abstract groups mainly used to
* decide item colours.
*
* <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>
*/
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( elayer.name == "Nets" )
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
m_layerMap[elayer.number] = LAYER_WIRE;
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +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( elayer.name == "Info" || elayer.name == "Guide" )
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
m_layerMap[elayer.number] = LAYER_NOTES;
Eeschema Eagle Import: Update layer handling
2017-07-23 14:26:13 +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( elayer.name == "Busses" )
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
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
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 the kicad component orientation based on eagle rotation degrees.
static COMPONENT_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 )
{
default:
wxASSERT_MSG( false, wxString::Format( "Unhandled orientation (%d degrees)", roti ) );
Introduce new KI_FALLTHROUGH macro Annotate purposeful fallthroughs in switch statements with the KI_FALLTHROUGH macro.
2020-04-24 23:44:09 +00:00
KI_FALLTHROUGH;
Eeschema Eagle Plugin: Set Component Orientation
2017-07-06 11:55:41 +00:00
case 0:
return CMP_ORIENT_0;
case 90:
return CMP_ORIENT_90;
case 180:
return CMP_ORIENT_180;
case 270:
return CMP_ORIENT_270;
}
return CMP_ORIENT_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
// 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,
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
{
aText->SetTextAngle( 900 );
}
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
{
aText->SetTextAngle( 900 );
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:
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_CENTER );
aText->SetVertJustify( GR_TEXT_VJUSTIFY_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:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
aText->SetVertJustify( GR_TEXT_VJUSTIFY_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:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_RIGHT );
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
aText->SetVertJustify( GR_TEXT_VJUSTIFY_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:
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_CENTER );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
aText->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
break;
case ETEXT::TOP_LEFT:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
aText->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
break;
case ETEXT::TOP_RIGHT:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_RIGHT );
aText->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
break;
case ETEXT::BOTTOM_CENTER:
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_CENTER );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
aText->SetVertJustify( GR_TEXT_VJUSTIFY_BOTTOM );
break;
case ETEXT::BOTTOM_LEFT:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
aText->SetVertJustify( GR_TEXT_VJUSTIFY_BOTTOM );
break;
case ETEXT::BOTTOM_RIGHT:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_RIGHT );
aText->SetVertJustify( GR_TEXT_VJUSTIFY_BOTTOM );
break;
default:
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_RIGHT );
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +00:00
aText->SetVertJustify( GR_TEXT_VJUSTIFY_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
}
}
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
SCH_EAGLE_PLUGIN::SCH_EAGLE_PLUGIN()
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
m_kiway = nullptr;
m_rootSheet = nullptr;
Coverity fixes CIDs: 102571 168696 168701 168704 168706 168708 168710 168713 168716 168717
2017-11-01 09:20:13 +00:00
m_currentSheet = nullptr;
Coverity fixes
2020-05-19 02:58:28 +00:00
m_schematic = nullptr;
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
{
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
return "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
{
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
return "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
{
return "lbr";
}
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;
}
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,
SCH_SHEET* aAppendToMe, const PROPERTIES* 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
Starts the loading layout
2017-03-09 12:49:24 +00:00
// Load the document
wxXmlDocument xmlDocument;
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
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_filename = aFileName;
m_schematic = aSchematic;
Adds necessary structure to implement and test Eagle schematich plugin
2017-02-27 10:07:52 +00:00
WIP: Symbols are imported and displayed, and save to cache file on schematic save.
2017-07-02 12:26:23 +00:00
if( !xmlDocument.Load( m_filename.GetFullPath() ) )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
THROW_IO_ERROR(
wxString::Format( _( "Unable to read file \"%s\"" ), 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
if( aAppendToMe )
{
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
wxCHECK_MSG( aSchematic->IsValid(), nullptr, "Can't append to a schematic with no root!" );
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 );
Starts the loading layout
2017-03-09 12:49:24 +00:00
m_rootSheet->SetFileName( aFileName );
}
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 );
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
screen->SetFileName( aFileName );
m_rootSheet->SetScreen( screen );
}
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
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
wxCHECK_MSG( libTable, NULL, "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 ) );
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 = std::make_unique<PROPERTIES>();
( *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() );
wxString libTableUri = "${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.
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
libTable->InsertRow(
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
new SYMBOL_LIB_TABLE_ROW( getLibName(), libTableUri, wxString( "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(),
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
}
// Relaod the 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
m_schematic->Prj().SetElem( PROJECT::ELEM_SYMBOL_LIB_TABLE, NULL );
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.
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
m_version = currentNode->GetAttribute( "version", "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
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 );
// Loop through all the sheets
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
wxXmlNode* sheetNode = getChildrenNodes( schematicChildren, "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 );
// Loop through all nets
// From the DTD: "Net is an electrical connection in a schematic."
wxXmlNode* netNode = getChildrenNodes( sheetChildren, "nets" );
while( netNode )
{
wxString netName = netNode->GetAttribute( "name" );
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
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 schematicChildren = MapChildren( aSchematicNode );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
auto partNode = getChildrenNodes( schematicChildren, "parts" );
auto libraryNode = getChildrenNodes( schematicChildren, "libraries" );
auto sheetNode = getChildrenNodes( schematicChildren, "sheets" );
Eeschema Eagle plugin
2017-05-08 14:10:23 +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( !partNode || !libraryNode || !sheetNode )
return;
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( partNode )
{
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::unique_ptr<EPART> epart( new 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
// Loop through all the libraries
while( libraryNode )
Starts the loading layout
2017-03-09 12:49:24 +00:00
{
Eeschema Eagle Import: Fix package assigment by combining eagle libraries of the same name.
2017-08-23 04:13:37 +00:00
// Read the library name
wxString libName = libraryNode->GetAttribute( "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
EAGLE_LIBRARY* elib = &m_eagleLibs[libName];
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
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
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
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
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
libraryNode = libraryNode->GetNext();
}
Starts the loading layout
2017-03-09 12:49:24 +00:00
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
m_pi->SaveLibrary( getLibFileName().GetFullPath() );
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 );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Loop through all the sheets
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
int sheet_count = countChildren( sheetNode->GetParent(), "sheet" );
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
Eagle SCH import: Code formatting
2018-03-28 10:59:56 +00:00
// If eagle schematic has multiple sheets then create corresponding subsheets on the root sheet
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
if( sheet_count > 1 )
{
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;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
i = 1;
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 )
{
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
wxPoint pos = wxPoint( x * Mils2iu( 1000 ), y * Mils2iu( 1000 ) );
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
std::unique_ptr<SCH_SHEET> sheet( new SCH_SHEET( m_rootSheet, pos ) );
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 );
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
sheet->SetScreen( screen );
Coverity fixes CIDs: 102571 168696 168701 168704 168706 168708 168710 168713 168716 168717
2017-11-01 09:20:13 +00:00
sheet->GetScreen()->SetFileName( sheet->GetFileName() );
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
m_currentSheet = sheet.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
loadSheet( sheetNode, i );
Coverity fixes CIDs: 102571 168696 168701 168704 168706 168708 168710 168713 168716 168717
2017-11-01 09:20:13 +00:00
m_rootSheet->GetScreen()->Append( sheet.release() );
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
sheetNode = sheetNode->GetNext();
x += 2;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( x > 10 ) // start next row
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
{
Eeschema: Handle multiple sheets in Eagle plugin.
2017-06-18 11:25:09 +00:00
while( sheetNode )
{
m_currentSheet = m_rootSheet;
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
// Handle the missing component units that need to be instantiated
// to create the missing implicit connections
// Calculate the already placed items bounding box and the page size to determine
// placement for the new components
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxSize pageSizeIU = m_rootSheet->GetScreen()->GetPageSettings().GetSizeIU();
EDA_RECT sheetBbox = getSheetBbox( m_rootSheet );
wxPoint newCmpPosition( sheetBbox.GetLeft(), sheetBbox.GetBottom() );
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 )
{
const SCH_COMPONENT* origCmp = cmp.second.cmp;
for( auto unitEntry : cmp.second.units )
{
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
// Instantiate the missing component unit
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int unit = unitEntry.first;
const wxString reference = origCmp->GetField( REFERENCE )->GetText();
Convert timestamps to UUIDs.
2020-02-20 12:11:04 +00:00
std::unique_ptr<SCH_COMPONENT> component( (SCH_COMPONENT*) origCmp->Duplicate() );
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
component->SetUnitSelection( &sheetpath, unit );
component->SetUnit( unit );
component->SetOrientation( 0 );
component->AddHierarchicalReference( sheetpath.Path(), reference, unit );
// Calculate the placement position
EDA_RECT cmpBbox = component->GetBoundingBox();
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int posY = newCmpPosition.y + cmpBbox.GetHeight();
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
component->SetPosition( wxPoint( newCmpPosition.x, posY ) );
newCmpPosition.x += cmpBbox.GetWidth();
maxY = std::max( maxY, posY );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( newCmpPosition.x >= pageSizeIU.GetWidth() ) // reached the page boundary?
newCmpPosition = wxPoint( 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
addImplicitConnections( component.get(), m_rootSheet->GetScreen(), false );
m_rootSheet->GetScreen()->Append( component.release() );
}
}
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
wxXmlNode* descriptionNode = getChildrenNodes( sheetChildren, "description" );
Eagle plugin: Code formatting
2017-06-19 13:43: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 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;
Remove duplicated settings from preferences. These have now moved to project-specific settings.
2020-03-13 09:53:44 +00:00
SCH_FIELD& sheetNameField = m_currentSheet->GetFields()[SHEETNAME];
SCH_FIELD& filenameField = m_currentSheet->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();
eagle: Strip newlines from description Eeschema old format is line-terminated so the newlines in descriptions will break the schematic file if saved. Fixes: lp:1829707 * https://bugs.launchpad.net/kicad/+bug/1829707 (cherry picked from commit fb85612f81ccd05ef73a9365f17ee3ae3a1251f3)
2019-06-08 05:06:41 +00:00
des.Replace( "\n", "_", 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
{
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
filename = wxString::Format( "%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
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
wxString fn = wxString( filename + ".sch" );
Remove duplicated settings from preferences. These have now moved to project-specific settings.
2020-03-13 09:53:44 +00:00
filenameField.SetText( fn );
wxFileName fileName( fn );
Eeschema Eagle Import: Set subsheet name based on original Eagle schematic file name.
2017-08-12 09:18:18 +00:00
m_currentSheet->GetScreen()->SetFileName( fileName.GetFullPath() );
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."
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
wxXmlNode* busNode = getChildrenNodes( sheetChildren, "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 )
{
// Get the bus name
Eagle: properly translate group buses now that we support them
2019-06-06 02:09:09 +00:00
wxString busName = translateEagleBusName( busNode->GetAttribute( "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."
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
wxXmlNode* netNode = getChildrenNodes( sheetChildren, "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 )
{
// Get the net name and class
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 netName = netNode->GetAttribute( "name" );
wxString netClass = netNode->GetAttribute( "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();
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
// Loop through all instances
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
wxXmlNode* instanceNode = getChildrenNodes( sheetChildren, "instances" );
Code formatting and cleanup
2017-05-08 14:27:11 +00:00
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
while( instanceNode )
{
loadInstance( instanceNode );
instanceNode = instanceNode->GetNext();
}
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
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
wxXmlNode* plainNode = getChildrenNodes( sheetChildren, "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 )
{
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();
Eeschema Eagle Import: Parse plain wires as lines on the notes layer.
2017-07-16 16:18:58 +00:00
if( nodeName == "text" )
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 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
m_currentSheet->GetScreen()->Append( loadPlainText( 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
}
Eeschema Eagle Import: Parse plain wires as lines on the notes layer.
2017-07-16 16:18:58 +00:00
else if( nodeName == "wire" )
{
m_currentSheet->GetScreen()->Append( loadWire( 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
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.
Eagle SCH import: moved sheet bbox calculation to a function
2018-04-06 11:23:24 +00:00
EDA_RECT sheetBoundingBox = getSheetBbox( m_currentSheet );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxSize targetSheetSize = sheetBoundingBox.GetSize();
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
targetSheetSize.IncBy( Mils2iu( 1500 ), Mils2iu( 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.
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxSize pageSizeIU = m_currentSheet->GetScreen()->GetPageSettings().GetSizeIU();
PAGE_INFO pageInfo = m_currentSheet->GetScreen()->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 )
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
pageInfo.SetWidthMils( Iu2Mils( 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 )
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
pageInfo.SetHeightMils( Iu2Mils( 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.
Eeschema Eagle Import: dynamically size sheet based on positions of wires and junctions within the sheet.
2017-07-09 02:37:02 +00:00
m_currentSheet->GetScreen()->SetPageSettings( pageInfo );
pageSizeIU = m_currentSheet->GetScreen()->GetPageSettings().GetSizeIU();
wxPoint sheetcentre( pageSizeIU.x / 2, pageSizeIU.y / 2 );
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
wxPoint 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.
wxPoint translation = sheetcentre - itemsCentre;
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
translation.x = translation.x - translation.x % Mils2iu( 100 );
translation.y = translation.y - translation.y % Mils2iu( 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
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
for( auto item : m_currentSheet->GetScreen()->Items().OfType( SCH_COMPONENT_T ) )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
addImplicitConnections(
static_cast<SCH_COMPONENT*>( item ), m_currentSheet->GetScreen(), true );
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;
std::copy( m_currentSheet->GetScreen()->Items().begin(),
m_currentSheet->GetScreen()->Items().end(), std::back_inserter( allItems ) );
for( auto 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
{
item->SetPosition( item->GetPosition() + translation );
item->ClearFlags();
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
m_currentSheet->GetScreen()->Update( item );
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
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +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();
SCH_SCREEN* screen = m_currentSheet->GetScreen();
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Revert "Eagle importer: use only global net labels" This reverts commit b1f456fade43284408f6ca88f9c6c5d6e2527fef.
2018-02-18 10:54:37 +00:00
int segmentCount = countChildren( aSegmentsNode, "segment" );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
// wxCHECK( screen, [>void<] );
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
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
bool labelled = false; // has a label been added to this continously connected segment
NODE_MAP segmentChildren = MapChildren( currentSegment );
SCH_LINE* firstWire = nullptr;
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 )
{
if( segmentAttribute->GetName() == "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
{
SCH_LINE* wire = loadWire( segmentAttribute );
if( !firstWire )
firstWire = wire;
// Test for intersections with other wires
SEG thisWire( wire->GetStartPoint(), wire->GetEndPoint() );
for( auto& desc : m_segments )
{
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
for( const auto& seg : desc.segs )
{
auto intersection = thisWire.Intersect( seg, true );
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();
if( nodeName == "junction" )
{
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
}
else if( nodeName == "label" )
{
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
}
else if( nodeName == "pinref" )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
segmentAttribute->GetAttribute( "gate" ); // REQUIRED
segmentAttribute->GetAttribute( "part" ); // REQUIRED
segmentAttribute->GetAttribute( "pin" ); // REQUIRED
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
}
else if( nodeName == "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
// 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
{
Fix quotes in UI messages This replaces all single and angle bracket quotes in UI messages with double quotes, for consistency. Sorry to all translators.
2017-12-15 11:37:46 +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
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
// Add a small label to the net segment if it hasn't been labelled already
// this preserves the named net feature of Eagle schematics.
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( !labelled && firstWire )
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 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
label->SetPosition( firstWire->GetStartPoint() );
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 ) );
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
label->SetTextSize( wxSize( Mils2iu( 10 ), Mils2iu( 10 ) ) );
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
label->SetLabelSpinStyle( LABEL_SPIN_STYLE::LEFT );
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();
}
}
Eeschema Eagle Import: Parse plain wires as lines on the notes layer.
2017-07-16 16:18:58 +00:00
SCH_LINE* SCH_EAGLE_PLUGIN::loadWire( wxXmlNode* aWireNode )
Eeschema Eagle plugin
2017-05-08 14:10:23 +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
std::unique_ptr<SCH_LINE> wire( new SCH_LINE );
auto ewire = EWIRE( aWireNode );
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
wire->SetLayer( kiCadLayer( ewire.layer ) );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
wxPoint begin, end;
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();
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
wire->SetStartPoint( begin );
wire->SetEndPoint( end );
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[begin].emplace( wire.get() );
m_connPoints[end].emplace( wire.get() );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
return wire.release();
}
Eagle plugin: Code formatting
2017-06-19 13:43:55 +00:00
SCH_JUNCTION* SCH_EAGLE_PLUGIN::loadJunction( wxXmlNode* aJunction )
{
std::unique_ptr<SCH_JUNCTION> junction( new SCH_JUNCTION );
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +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
auto ejunction = EJUNCTION( aJunction );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
wxPoint 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 sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
auto elabel = ELABEL( aLabelNode, aNetName );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
wxPoint 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
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
if( global )
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
Eagle SCH importer: reduced code duplication for importing labels
2018-03-22 15:19:38 +00:00
label.reset( new 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 ) );
label->SetTextSize( wxSize( elabel.size.ToSchUnits(), elabel.size.ToSchUnits() ) );
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
label->SetLabelSpinStyle( LABEL_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 )
{
Add ERC & DRC checks for unresolved variables.
2020-03-29 01:12:29 +00:00
label->SetLabelSpinStyle( (LABEL_SPIN_STYLE::SPIN) ( KiROUND( elabel.rot->degrees / 90 ) % 4 ) );
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 )
{
label->SetLabelSpinStyle( label->GetLabelSpinStyle().MirrorY() );
}
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 sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
std::pair<VECTOR2I, const SEG*> SCH_EAGLE_PLUGIN::findNearestLinePoint(
const wxPoint& aPoint, 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
{
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
auto 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 )
{
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
auto einstance = EINSTANCE( aInstanceNode );
SCH_SCREEN* screen = m_currentSheet->GetScreen();
// Find the part in the list for the sheet.
// Assign the component its value from the part entry
// Calculate the unit number from the gate entry of the instance
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
// Assign the the LIB_ID from deviceset and device names
WIP: Eagle symbol importation
2017-06-26 07:56:11 +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
auto part_it = m_partlist.find( einstance.part.Upper() );
if( part_it == m_partlist.end() )
{
wxLogError( _( "Error parsing Eagle file. "
"Could not find \"%s\" instance but it is referenced in the schematic." ),
einstance.part );
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 );
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
symbolname.Replace( "*", "" );
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
wxString kisymbolname = fixSymbolName( symbolname );
Eeschema Eagle Import: Parse eagle symbol name prefix and fix reference values.
2017-08-20 05:56:14 +00:00
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
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
LIB_PART* part =
m_pi->LoadSymbol( getLibFileName().GetFullPath(), kisymbolname, m_properties.get() );
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
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
{
Convert timestamps to UUIDs.
2020-02-20 12:11:04 +00:00
wxLogMessage( wxString::Format( _( "Could not find %s in the imported library" ),
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
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
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
LIB_ID libId( getLibName(), kisymbolname );
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
std::unique_ptr<SCH_COMPONENT> component( new SCH_COMPONENT() );
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
component->SetLibId( libId );
component->SetUnit( unit );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
component->SetPosition( wxPoint( einstance.x.ToSchUnits(), -einstance.y.ToSchUnits() ) );
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
component->GetField( FOOTPRINT )->SetText( package );
Store imported Eagle symbols in a library
2017-07-03 14:02:55 +00:00
if( einstance.rot )
{
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
component->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 )
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
component->MirrorY( 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
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
LIB_FIELDS 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 );
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +00:00
for( auto const& 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
component->GetField( field.GetId() )->ImportValues( field );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
component->GetField( field.GetId() )
->SetTextPos( component->GetPosition() + 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
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
if( reference.find_first_not_of( "0123456789" ) == wxString::npos )
reference.Prepend( "UNK" );
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
SCH_SHEET_PATH sheetpath;
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
m_rootSheet->LocatePathOfScreen( screen, &sheetpath );
Promote PathsAndReferences from wxArrayString to first-class-citizen. Keeping the data in an un-serialized format greatly simplifies usage, and should make it more robust.
2020-02-22 21:39:59 +00:00
wxString current_sheetpath = sheetpath.PathAsString() + component->m_Uuid.AsString();
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
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
component->GetField( REFERENCE )->SetText( reference );
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
component->AddHierarchicalReference( current_sheetpath, reference, unit );
Eeschema Eagle Import: Update text alignment parsing
2017-07-23 14:28:23 +00:00
Eeschema Eagle Import: Field checks and library insertion fix.
2017-07-14 15:20:59 +00:00
if( epart->value )
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
component->GetField( VALUE )->SetText( *epart->value );
Eeschema Eagle Import: Field checks and library insertion fix.
2017-07-14 15:20:59 +00:00
else
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
component->GetField( VALUE )->SetText( kisymbolname );
Eeschema Eagle Import: Field checks and library insertion fix.
2017-07-14 15:20:59 +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 visibility of fields.
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
component->GetField( REFERENCE )->SetVisible( part->GetField( REFERENCE )->IsVisible() );
component->GetField( VALUE )->SetVisible( part->GetField( VALUE )->IsVisible() );
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
{
auto field = component->AddField( *component->GetField( VALUE ) );
field->SetName( a.first );
field->SetText( a.second );
field->SetVisible( false );
}
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
{
auto field = component->AddField( *component->GetField( VALUE ) );
field->SetName( "VARIANT_" + a.first );
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
{
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( attributeNode->GetName() == "attribute" )
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
auto attr = EATTR( attributeNode );
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
SCH_FIELD* field = NULL;
if( attr.name.Lower() == "name" )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
field = component->GetField( REFERENCE );
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;
}
else if( attr.name.Lower() == "value" )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
field = component->GetField( 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
valueAttributeFound = true;
}
else
{
field = component->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
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
field->SetPosition( wxPoint( 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 sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +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
}
}
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
else if( attributeNode->GetName() == "variant" )
{
wxString variant, value;
if( attributeNode->GetAttribute( "name", &variant )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
&& attributeNode->GetAttribute( "value", &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
{
auto field = component->AddField( *component->GetField( VALUE ) );
field->SetName( "VARIANT_" + variant );
field->SetText( value );
field->SetVisible( false );
}
}
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
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 )
component->GetField( VALUE )->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 )
component->GetField( REFERENCE )->SetVisible( false );
}
Eeschema Eagle Import: Parse instance attributes for value and refererence positions and alignment.
2017-07-16 16:12:05 +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();
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
LIB_PART* libSymbol = schLibTable.LoadSymbol( component->GetLibId() );
wxCHECK( libSymbol, /*void*/ );
Eeschema: fix update schematic symbol library link bugs.
2020-05-05 22:06:43 +00:00
component->SetLibSymbol( new LIB_PART( *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;
ADDED alternate pin definitions and assignments. Fixes https://gitlab.com/kicad/code/kicad/issues/2002
2020-08-21 15:54:24 +00:00
component->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
for( const auto& pin : pins )
m_connPoints[component->GetPinPhysicalPosition( pin )].emplace( pin );
WIP: Symbols are imported and displayed, and save to cache file on schematic save.
2017-07-02 12:26:23 +00:00
component->ClearFlags();
WIP: Eagle symbol importation
2017-06-26 07:56:11 +00:00
screen->Append( component.release() );
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
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
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
wxXmlNode* symbolNode = getChildrenNodes( libraryChildren, "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 )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxString symbolName = symbolNode->GetAttribute( "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
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
// Loop through the devicesets and load each of them
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
wxXmlNode* devicesetNode = getChildrenNodes( libraryChildren, "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
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
wxString prefix = edeviceset.prefix ? edeviceset.prefix.Get() : "";
WIP: Eagle symbol importation
2017-06-26 07:56:11 +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
NODE_MAP aDeviceSetChildren = MapChildren( devicesetNode );
wxXmlNode* deviceNode = getChildrenNodes( aDeviceSetChildren, "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;
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
symbolName.Replace( "*", "" );
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() );
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
symbolName = fixSymbolName( symbolName );
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.
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
unique_ptr<LIB_PART> kpart( new LIB_PART( 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.
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxXmlNode* gateNode = getChildrenNodes( aDeviceSetChildren, "gates" );
int gates_count = countChildren( aDeviceSetChildren["gates"], "gate" );
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
kpart->SetUnitCount( gates_count );
Eagle SCH import: keep multi-unit parts not interchangeable Eagle supports more sophisticated unit swapping information, so the safest choice is to prevent any unit manipulation.
2018-05-08 10:17:46 +00:00
kpart->LockUnits( true );
Eeschema Eagle Import: Parse eagle symbol name prefix and fix reference values.
2017-08-20 05:56:14 +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
LIB_FIELD* reference = kpart->GetField( REFERENCE );
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
if( prefix.length() == 0 )
Eeschema Eagle Import: Parse eagle symbol name prefix and fix reference values.
2017-08-20 05:56:14 +00:00
reference->SetVisible( false );
else
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 );
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 )
{
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;
Eeschema Eagle Import: Symbol field positioning fixes.
2017-07-09 09:35:13 +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
ispower = loadSymbol( aEagleLibrary->SymbolNodes[egate.symbol], kpart, &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
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
kpart->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 )
kpart->SetPower();
WIP: Eagle symbol importation
2017-06-26 07:56:11 +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
wxString name = fixSymbolName( kpart->GetName() );
Update Eagle plugin to use symbol library table.
2017-10-24 23:08:28 +00:00
kpart->SetName( name );
m_pi->SaveSymbol( getLibFileName().GetFullPath(), new LIB_PART( *kpart.get() ),
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.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
aEagleLibrary->KiCadSymbols.insert( name, kpart.release() );
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
}
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
bool SCH_EAGLE_PLUGIN::loadSymbol( wxXmlNode* aSymbolNode, std::unique_ptr<LIB_PART>& aPart,
EDEVICE* aDevice, int aGateNumber, const wxString& aGateName )
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
wxString symbolName = aSymbolNode->GetAttribute( "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();
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
bool foundName = false;
bool foundValue = false;
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
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( nodeName == "circle" )
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
aPart->AddDrawItem( loadSymbolCircle( aPart, currentNode, aGateNumber ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
else if( nodeName == "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 );
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::unique_ptr<LIB_PIN> pin( loadPin( aPart, 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 );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( pinDir.first == "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
{
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& 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 );
}
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
// Eagle does not connect multiple NC pins together when they are stacked.
// KiCad will do this for pins that are coincident. We opt here for correct
// schematic netlist and leave out the multiple NC pins when stacked.
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
{
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_NC && i > 0 )
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
break;
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 );
Eagle import plugin: Code clean-up and formatting
2017-10-17 08:19:43 +00:00
aPart->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 );
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
pin->SetNumber( wxString::Format( "%i", pincount ) );
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
aPart->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
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
else if( nodeName == "polygon" )
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
aPart->AddDrawItem( loadSymbolPolyLine( aPart, currentNode, aGateNumber ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
else if( nodeName == "rectangle" )
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
aPart->AddDrawItem( loadSymbolRectangle( aPart, currentNode, aGateNumber ) );
Starts the loading layout
2017-03-09 12:49:24 +00:00
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
else if( nodeName == "text" )
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
std::unique_ptr<LIB_TEXT> libtext( loadSymbolText( aPart, 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
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( libtext->GetText().Upper() == ">NAME" )
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
{
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
LIB_FIELD* field = aPart->GetField( REFERENCE );
loadFieldAttributes( field, libtext.get() );
foundName = true;
}
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
else if( libtext->GetText().Upper() == ">VALUE" )
Eeschema Eagle Import: fixed name and reference fields placement
2017-10-18 08:33:51 +00:00
{
LIB_FIELD* field = aPart->GetField( VALUE );
loadFieldAttributes( field, libtext.get() );
foundValue = true;
WIP: Symbols are imported and displayed, and save to cache file on schematic save.
2017-07-02 12:26:23 +00:00
}
else
{
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
aPart->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
}
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
else if( nodeName == "wire" )
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
aPart->AddDrawItem( loadSymbolWire( aPart, currentNode, aGateNumber ) );
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" )
* {
* }
* else if( nodeName == "frame" )
* {
* }
*/
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
if( foundName == 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
aPart->GetField( REFERENCE )->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
if( foundValue == 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
aPart->GetField( VALUE )->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
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
LIB_CIRCLE* SCH_EAGLE_PLUGIN::loadSymbolCircle(
std::unique_ptr<LIB_PART>& aPart, 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
ECIRCLE c( aCircleNode );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
unique_ptr<LIB_CIRCLE> circle( new LIB_CIRCLE( aPart.get() ) );
Eeschema Eagle plugin
2017-05-08 14:10:23 +00:00
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
circle->SetPosition( wxPoint( c.x.ToSchUnits(), c.y.ToSchUnits() ) );
circle->SetRadius( c.radius.ToSchUnits() );
circle->SetWidth( c.width.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
circle->SetUnit( aGateNumber );
Eeschema Eagle plugin
2017-05-08 14:10:23 +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
return circle.release();
}
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
LIB_RECTANGLE* SCH_EAGLE_PLUGIN::loadSymbolRectangle(
std::unique_ptr<LIB_PART>& aPart, 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
{
ERECT rect( aRectNode );
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
unique_ptr<LIB_RECTANGLE> rectangle( new LIB_RECTANGLE( aPart.get() ) );
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
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
rectangle->SetPosition( wxPoint( rect.x1.ToSchUnits(), rect.y1.ToSchUnits() ) );
rectangle->SetEnd( wxPoint( 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
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 Import: Fill rectangles in symbols
2017-07-23 14:27:42 +00:00
// Eagle rectangles are filled by definition.
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->SetFillMode( 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
return rectangle.release();
}
Eagle plugin: Code formatting
2017-06-19 13:43: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
LIB_ITEM* SCH_EAGLE_PLUGIN::loadSymbolWire(
std::unique_ptr<LIB_PART>& aPart, wxXmlNode* aWireNode, int aGateNumber )
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
{
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
auto ewire = EWIRE( aWireNode );
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
wxPoint 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 )
{
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
std::unique_ptr<LIB_ARC> arc( new LIB_ARC( aPart.get() ) );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxPoint center = ConvertArcCenter( begin, end, *ewire.curve * -1 );
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
Eeschema Eagle Import: corrected arc radius size
2017-08-07 09:25:15 +00:00
double radius = sqrt( abs( ( ( center.x - begin.x ) * ( center.x - begin.x ) )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
+ ( ( center.y - begin.y ) * ( center.y - begin.y ) ) ) )
* 2;
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.
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
if( 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
{
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
wxPoint centerStartVector = begin - center;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
wxPoint centerEndVector = end - center;
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
centerStartVector.x = centerStartVector.x * ewire.width.ToSchUnits() * 2 / radius;
centerStartVector.y = centerStartVector.y * ewire.width.ToSchUnits() * 2 / radius;
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
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
centerEndVector.x = centerEndVector.x * ewire.width.ToSchUnits() * 2 / radius;
centerEndVector.y = centerEndVector.y * ewire.width.ToSchUnits() * 2 / radius;
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
begin = center + centerStartVector;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
end = center + centerEndVector;
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
Eeschema Eagle Import: corrected arc radius size
2017-08-07 09:25:15 +00:00
radius = sqrt( abs( ( ( center.x - begin.x ) * ( center.x - begin.x ) )
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
+ ( ( center.y - begin.y ) * ( center.y - begin.y ) ) ) )
* 2;
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
arc->SetWidth( 1 );
arc->SetFillMode( 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
{
arc->SetWidth( ewire.width.ToSchUnits() );
}
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
arc->SetPosition( center );
if( *ewire.curve > 0 )
{
arc->SetStart( begin );
arc->SetEnd( end );
}
else
{
arc->SetStart( end );
arc->SetEnd( begin );
}
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
arc->SetRadius( radius );
arc->CalcRadiusAngles();
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 );
return (LIB_ITEM*) arc.release();
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
}
else
{
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
std::unique_ptr<LIB_POLYLINE> polyLine( new LIB_POLYLINE( aPart.get() ) );
Eeschema Eagle Import: Improve arc parsing to replicate eagle filled arcs.
2017-07-25 13:51:07 +00:00
polyLine->AddPoint( begin );
polyLine->AddPoint( 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
polyLine->SetUnit( aGateNumber );
Eagle: Set linewidth in polylines
2020-02-22 18:44:30 +00:00
polyLine->SetWidth( ewire.width.ToSchUnits() );
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
return (LIB_ITEM*) polyLine.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 sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
LIB_POLYLINE* SCH_EAGLE_PLUGIN::loadSymbolPolyLine(
std::unique_ptr<LIB_PART>& aPart, 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
{
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
std::unique_ptr<LIB_POLYLINE> polyLine( new LIB_POLYLINE( aPart.get() ) );
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
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();
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
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
wxPoint pt;
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 )
{
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( vertex->GetName() == "vertex" ) // skip <xmlattr> node
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
{
EVERTEX evertex( vertex );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
pt = wxPoint( evertex.x.ToSchUnits(), evertex.y.ToSchUnits() );
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
polyLine->AddPoint( pt );
}
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
}
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +00:00
polyLine->SetFillMode( FILLED_SHAPE );
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
polyLine->SetUnit( aGateNumber );
Eeschema Eagle Import: Parse polyline symbol elements.
2017-07-17 12:47:49 +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
return polyLine.release();
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 sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
LIB_PIN* SCH_EAGLE_PLUGIN::loadPin(
std::unique_ptr<LIB_PART>& aPart, wxXmlNode* aPin, EPIN* aEPin, int aGateNumber )
Eeschema: Eagle plugin> work on schematic and symbol elements
2017-06-18 11:31:11 +00:00
{
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
std::unique_ptr<LIB_PIN> pin( new LIB_PIN( aPart.get() ) );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
pin->SetPosition( wxPoint( 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 )
{
Assert for non-standard rotation during Eagle schematics import
2017-07-03 14:01:39 +00:00
default:
wxASSERT_MSG( false, wxString::Format( "Unhandled orientation (%d degrees)", roti ) );
Introduce new KI_FALLTHROUGH macro Annotate purposeful fallthroughs in switch statements with the KI_FALLTHROUGH macro.
2020-04-24 23:44:09 +00:00
KI_FALLTHROUGH;
Eeschema Eagle Plugin: Code Cleanup
2017-07-06 12:31:11 +00:00
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
case 0:
pin->SetOrientation( 'R' );
break;
case 90:
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
pin->SetOrientation( 'U' );
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
break;
case 180:
pin->SetOrientation( 'L' );
break;
case 270:
WIP: Refactor symbol importation to account for multiple gates and device connect pin maps.
2017-06-30 01:52:05 +00:00
pin->SetOrientation( 'D' );
Eeschema: Eagle Plugin: Handle pin rotation.
2017-06-18 12:25:36 +00:00
break;
}
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
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
if( length == "short" )
Eagle plugin: check before dereferencing optional attributes
2017-06-19 12:44:31 +00:00
{
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
pin->SetLength( Mils2iu( 100 ) );
Eagle plugin: check before dereferencing optional attributes
2017-06-19 12:44:31 +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 if( length == "middle" )
Eagle plugin: check before dereferencing optional attributes
2017-06-19 12:44:31 +00:00
{
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
pin->SetLength( Mils2iu( 200 ) );
Eagle plugin: check before dereferencing optional attributes
2017-06-19 12:44:31 +00:00
}
else if( length == "long" )
{
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
pin->SetLength( Mils2iu( 300 ) );
Eagle plugin: check before dereferencing optional attributes
2017-06-19 12:44:31 +00:00
}
else if( length == "point" )
{
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
pin->SetLength( Mils2iu( 0 ) );
Eagle plugin: check before dereferencing optional attributes
2017-06-19 12:44:31 +00:00
}
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
if( visible == "off" )
{
pin->SetNameTextSize( 0 );
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
else if( visible == "pad" )
Eeschema Eagle Import: Set pin and pad name visibilities using text size.
2017-07-16 16:13:10 +00:00
{
pin->SetNameTextSize( 0 );
}
else if( visible == "pin" )
{
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
/*
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( visible == "both" )
* {
* }
*/
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
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( function == "dot" )
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
{
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 );
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
}
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( function == "clk" )
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
{
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 );
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
}
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( function == "dotclk" )
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
{
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 sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
LIB_TEXT* SCH_EAGLE_PLUGIN::loadSymbolText(
std::unique_ptr<LIB_PART>& aPart, wxXmlNode* aLibText, int aGateNumber )
Eeschema: Eagle Plugin: Add loadSymboltext, and position default symbol texts.
2017-06-18 12:36:35 +00:00
{
Eeschema Eagle Import: WIP trying to fix indirect memory leaks
2017-08-06 14:20:29 +00:00
std::unique_ptr<LIB_TEXT> libtext( new LIB_TEXT( aPart.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 );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
libtext->SetPosition( wxPoint( 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
// Eagle supports multiple line text in library symbols. Legacy library symbol text cannot
// contain CRs or LFs.
//
// @todo Split this into multiple text objects and offset the Y position so that it looks
// more like the original Eagle schematic.
wxString text = aLibText->GetNodeContent();
std::replace( text.begin(), text.end(), '\n', '_' );
std::replace( text.begin(), text.end(), '\r', '_' );
libtext->SetText( text.IsEmpty() ? "~~" : text );
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
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
{
std::unique_ptr<SCH_TEXT> schtext( new SCH_TEXT() );
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 = 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
Eeschema Eagle Import: refactored common code for setting text attributes
2017-10-18 08:12:22 +00:00
const wxString& thetext = aSchText->GetNodeContent();
schtext->SetText( thetext.IsEmpty() ? "\" \"" : escapeName( thetext ) );
Modified Eagle import plugins to use nanometers as the internal unit
2017-10-17 08:18:54 +00:00
schtext->SetPosition( wxPoint( 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() );
aField->SetVisible( 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
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() );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
auto onIntersection = [&]( const VECTOR2I& 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
return std::binary_search( m_wireIntersections.begin(), m_wireIntersections.end(), aPos );
};
for( auto& segDesc : m_segments )
{
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 sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +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 );
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
wireDirection = wireDirection.Resize( Mils2iu( 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 )
{
labelPos = wxPoint( origPos + wireDirection * trial / 2 );
move = checkPositive = segAttached->Contains( labelPos );
}
else
{
labelPos = wxPoint( origPos - wireDirection * trial / 2 );
move = checkNegative = segAttached->Contains( labelPos );
}
++trial;
}
if( move )
label->SetPosition( wxPoint( labelPos ) );
}
}
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;
// 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();
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 firstline.StartsWith( "<?xml" ) && secondline.StartsWith( "<!DOCTYPE eagle SYSTEM" )
&& thirdline.StartsWith( "<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
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
void SCH_EAGLE_PLUGIN::moveLabels( SCH_ITEM* aWire, const wxPoint& 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
{
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
for( auto item : m_currentSheet->GetScreen()->Items().Overlapping( aWire->GetBoundingBox() ) )
Eeschema Eagle Import: Move any labels while inserting bus entry symbols.
2017-08-14 14:45:57 +00:00
{
if( item->Type() == SCH_LABEL_T || item->Type() == SCH_GLOBAL_LABEL_T )
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
if( TestSegmentHit( item->GetPosition(), ( (SCH_LINE*) aWire )->GetStartPoint(),
( (SCH_LINE*) aWire )->GetEndPoint(), 0 ) )
Eeschema Eagle Import: Move any labels while inserting bus entry symbols.
2017-08-14 14:45:57 +00:00
{
Eeschema Eagle Import: Code clean-up and formatting
2017-10-03 10:30:23 +00:00
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
// for each wire segment, compare each end with all busess.
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
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
for( auto it1 = m_currentSheet->GetScreen()->Items().OfType( SCH_LINE_T ).begin();
it1 != m_currentSheet->GetScreen()->Items().end(); ++it1 )
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
SCH_LINE* bus = static_cast<SCH_LINE*>( *it1 );
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
// Check line type for wire
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
if( bus->GetLayer() != LAYER_BUS )
Eeschema Eagle Import: Add wire to bus entry symbols.
2017-07-13 12:35:26 +00:00
continue;
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
wxPoint busstart = bus->GetStartPoint();
wxPoint busend = bus->GetEndPoint();
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
auto it2 = it1;
++it2;
for( ; it2 != m_currentSheet->GetScreen()->Items().end(); ++it2 )
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
SCH_LINE* line = static_cast<SCH_LINE*>( *it2 );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
// Check line type for bus
if( ( (SCH_LINE*) *it2 )->GetLayer() == LAYER_WIRE )
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
// Get points of both segments.
wxPoint linestart = line->GetStartPoint();
wxPoint lineend = line->GetEndPoint();
// Test for horizontal wire and vertical bus
if( linestart.y == lineend.y && busstart.x == busend.x )
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
if( TestSegmentHit( linestart, busstart, busend, 0 ) )
{
// Wire start is on a bus.
// Wire start is on the vertical bus
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
// if the end of the wire is to the left of the bus
if( lineend.x < busstart.x )
{
// |
// ---|
// |
if( TestSegmentHit(
linestart + wxPoint( 0, -100 ), busstart, busend, 0 ) )
{
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( -100, 0 ), true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( -100, 0 ) );
line->SetStartPoint( linestart + wxPoint( -100, 0 ) );
}
else if( TestSegmentHit(
linestart + wxPoint( 0, 100 ), busstart, busend, 0 ) )
{
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( -100, 0 ), false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( -100, 0 ) );
line->SetStartPoint( linestart + wxPoint( -100, 0 ) );
}
else
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
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
m_currentSheet->GetScreen()->Append( marker );
}
}
// else the wire end is to the right of the bus
// Wire is to the right of the bus
// |
// |----
// |
else
{
// test is bus exists above the wire
if( TestSegmentHit(
linestart + wxPoint( 0, -100 ), busstart, busend, 0 ) )
{
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( 0, -100 ), false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 100, 0 ) );
line->SetStartPoint( linestart + wxPoint( 100, 0 ) );
}
// test is bus exists below the wire
else if( TestSegmentHit(
linestart + wxPoint( 0, 100 ), busstart, busend, 0 ) )
{
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( 0, 100 ), true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 100, 0 ) );
line->SetStartPoint( linestart + wxPoint( 100, 0 ) );
}
else
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
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
m_currentSheet->GetScreen()->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
// Same thing but test end of the wire instead.
if( TestSegmentHit( lineend, busstart, busend, 0 ) )
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
// Wire end is on the vertical bus
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
// if the start of the wire is to the left of the bus
if( linestart.x < busstart.x )
{
// Test if bus exists above the wire
if( TestSegmentHit( lineend + wxPoint( 0, 100 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
// ___/|
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
lineend + wxPoint( -100, 0 ), false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, lineend + wxPoint( -100, 0 ) );
line->SetEndPoint( lineend + wxPoint( -100, 0 ) );
}
// Test if bus exists below the wire
else if( TestSegmentHit(
lineend + wxPoint( 0, -100 ), busstart, busend, 0 ) )
{
SCH_BUS_WIRE_ENTRY* busEntry =
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
new SCH_BUS_WIRE_ENTRY( lineend + wxPoint( -100, 0 ), true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, lineend + wxPoint( -100, 0 ) );
line->SetEndPoint( lineend + wxPoint( -100, 0 ) );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
else
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
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
m_currentSheet->GetScreen()->Append( marker );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
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
// else the start of the wire is to the right of the bus
// |
// |----
// |
else
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
// test if bus existed above the wire
if( TestSegmentHit(
lineend + wxPoint( 0, -100 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
lineend + wxPoint( 0, -100 ), false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, lineend + wxPoint( 100, 0 ) );
line->SetEndPoint( lineend + wxPoint( 100, 0 ) );
}
// test if bus existed below the wire
else if( TestSegmentHit(
lineend + wxPoint( 0, 100 ), busstart, busend, 0 ) )
{
SCH_BUS_WIRE_ENTRY* busEntry =
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
new SCH_BUS_WIRE_ENTRY( lineend + wxPoint( 0, 100 ), true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, lineend + wxPoint( 100, 0 ) );
line->SetEndPoint( lineend + wxPoint( 100, 0 ) );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
else
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
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
m_currentSheet->GetScreen()->Append( marker );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
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
}
} // if( linestart.y == lineend.y && busstart.x == busend.x)
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
// Test for horizontal wire and vertical bus
if( linestart.x == lineend.x && busstart.y == busend.y )
{
if( TestSegmentHit( linestart, busstart, busend, 0 ) )
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
// Wire start is on the bus
// If wire end is above the bus,
if( lineend.y < busstart.y )
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
// Test for bus existance to the left of the wire
if( TestSegmentHit(
linestart + wxPoint( -100, 0 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( -100, 0 ), true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 0, -100 ) );
line->SetStartPoint( linestart + wxPoint( 0, -100 ) );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
else if( TestSegmentHit(
linestart + wxPoint( 100, 0 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( 0, 100 ), false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 0, -100 ) );
line->SetStartPoint( linestart + wxPoint( 0, -100 ) );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
else
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
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
m_currentSheet->GetScreen()->Append( marker );
}
}
else // wire end is below the bus.
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
// Test for bus existance to the left of the wire
if( TestSegmentHit(
linestart + wxPoint( -100, 0 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( -100, 0 ), false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 0, 100 ) );
line->SetStartPoint( linestart + wxPoint( 0, 100 ) );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
else if( TestSegmentHit(
linestart + wxPoint( 100, 0 ), busstart, busend, 0 ) )
{
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
linestart + wxPoint( 100, 0 ), true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 0, 100 ) );
line->SetStartPoint( linestart + wxPoint( 0, 100 ) );
}
else
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
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
m_currentSheet->GetScreen()->Append( marker );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
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
if( TestSegmentHit( lineend, busstart, busend, 0 ) )
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
// Wire end is on the bus
// If wire start is above the bus,
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
if( linestart.y < busstart.y )
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
// Test for bus existance to the left of the wire
if( TestSegmentHit(
lineend + wxPoint( -100, 0 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
SCH_BUS_WIRE_ENTRY* busEntry =
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
new SCH_BUS_WIRE_ENTRY( lineend + wxPoint( -100, 0 ), true );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
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
moveLabels( line, lineend + wxPoint( 0, -100 ) );
line->SetEndPoint( lineend + wxPoint( 0, -100 ) );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
else if( TestSegmentHit(
lineend + wxPoint( 100, 0 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
lineend + wxPoint( 0, -100 ), false );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
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
moveLabels( line, lineend + wxPoint( 0, -100 ) );
line->SetEndPoint( lineend + wxPoint( 0, -100 ) );
}
else
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
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
m_currentSheet->GetScreen()->Append( marker );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
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
else // wire end is below the bus.
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
// Test for bus existance to the left of the wire
if( TestSegmentHit(
lineend + wxPoint( -100, 0 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY(
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
lineend + wxPoint( -100, 0 ), false );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
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
moveLabels( line, lineend + wxPoint( 0, 100 ) );
line->SetEndPoint( lineend + wxPoint( 0, 100 ) );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
else if( TestSegmentHit(
lineend + wxPoint( 100, 0 ), busstart, busend, 0 ) )
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48: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
SCH_BUS_WIRE_ENTRY* busEntry =
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
new SCH_BUS_WIRE_ENTRY( lineend + wxPoint( 0, 100 ), true );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
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
moveLabels( line, lineend + wxPoint( 0, 100 ) );
line->SetEndPoint( lineend + wxPoint( 0, 100 ) );
}
else
{
Migrate RC_ITEM to use shared_ptr
2020-08-11 13:33:16 +00:00
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
Lay some groundwork for adding distances to DRC errors. modified: eeschema/lib_rectangle.cpp
2020-04-24 13:36:10 +00:00
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
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
m_currentSheet->GetScreen()->Append( marker );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
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
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
linestart = line->GetStartPoint();
lineend = line->GetEndPoint();
busstart = bus->GetStartPoint();
busend = bus->GetEndPoint();
// bus entry wire isn't horizontal or vertical
if( TestSegmentHit( linestart, busstart, busend, 0 ) )
{
wxPoint wirevector = linestart - lineend;
if( wirevector.x > 0 )
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
if( wirevector.y > 0 )
{
wxPoint p = linestart + wxPoint( -100, -100 );
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
if( p == lineend ) // wire is overlapped by bus entry symbol
{
m_currentSheet->GetScreen()->DeleteItem( line );
line = nullptr;
}
else
{
line->SetStartPoint( p );
}
}
else
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
wxPoint p = linestart + wxPoint( -100, 100 );
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == lineend ) // wire is overlapped by bus entry symbol
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
m_currentSheet->GetScreen()->DeleteItem( line );
line = nullptr;
}
else
{
line->SetStartPoint( p );
}
}
}
else
{
if( wirevector.y > 0 )
{
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( linestart, true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
moveLabels( line, linestart + wxPoint( 100, -100 ) );
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
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
if( linestart + wxPoint( 100, -100 )
== lineend ) // wire is overlapped by bus entry symbol
{
m_currentSheet->GetScreen()->DeleteItem( line );
line = nullptr;
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
else
{
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
line->SetStartPoint( linestart + wxPoint( 100, -100 ) );
}
}
else
{
SCH_BUS_WIRE_ENTRY* busEntry =
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
new SCH_BUS_WIRE_ENTRY( linestart, false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 100, 100 ) );
if( linestart + wxPoint( 100, 100 )
== lineend ) // wire is overlapped by bus entry symbol
{
m_currentSheet->GetScreen()->DeleteItem( line );
line = nullptr;
}
else
{
line->SetStartPoint( linestart + wxPoint( 100, 100 ) );
}
}
}
}
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
if( line && TestSegmentHit( lineend, busstart, busend, 0 ) )
{
wxPoint wirevector = linestart - lineend;
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
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
if( wirevector.x > 0 )
{
if( wirevector.y > 0 )
{
wxPoint p = lineend + wxPoint( 100, 100 );
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( lineend, false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
{
m_currentSheet->GetScreen()->DeleteItem( line );
}
else
{
line->SetEndPoint( p );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
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
else
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
wxPoint p = lineend + wxPoint( 100, -100 );
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( lineend, true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +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
m_currentSheet->GetScreen()->DeleteItem( line );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
else
{
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
line->SetEndPoint( p );
}
}
}
else
{
if( wirevector.y > 0 )
{
wxPoint p = lineend + wxPoint( -100, 100 );
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, true );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
{
m_currentSheet->GetScreen()->DeleteItem( line );
}
else
{
line->SetEndPoint( p );
}
}
else
{
wxPoint p = lineend + wxPoint( -100, -100 );
Remove bus entry shape The shape isn't needed anymore, since bus entries can be rotated and mirrored like other items. Fixes https://gitlab.com/kicad/code/kicad/issues/4588
2020-06-30 01:08:33 +00:00
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, false );
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 );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
{
m_currentSheet->GetScreen()->DeleteItem( line );
}
else
{
line->SetEndPoint( p );
Eeschema Eagle Import: WIP Handle bus entry symbols for any direction.
2017-08-13 16:48:52 +00:00
}
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
}
} // for ( bus ..
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() );
for( const auto& seg : segs )
{
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
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
// TODO could be used to place junctions, instead of IsJunctionNeeded() (see SCH_EDIT_FRAME::importFile())
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
bool SCH_EAGLE_PLUGIN::checkConnections(
const SCH_COMPONENT* aComponent, 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
{
wxPoint pinPosition = aComponent->GetPinPhysicalPosition( aPin );
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
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;
wxASSERT( items.find( aPin ) != items.end() );
return items.size() > 1;
}
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
void SCH_EAGLE_PLUGIN::addImplicitConnections(
SCH_COMPONENT* aComponent, 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
{
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
wxCHECK( aComponent->GetPartRef(), /*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
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( aComponent->GetPartRef()->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;
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
int unit = aComponent->GetUnit();
const wxString reference = aComponent->GetField( REFERENCE )->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;
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
aComponent->GetPartRef()->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
for( const auto& pin : pins )
{
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
if( pinInUnit && !checkConnections( aComponent, pin ) )
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
{
// Create a net label to force the net name on the pin
SCH_GLOBALLABEL* netLabel = new SCH_GLOBALLABEL;
netLabel->SetPosition( aComponent->GetPinPhysicalPosition( pin ) );
netLabel->SetText( extractNetName( pin->GetName() ) );
eagle import: Convert to new eeschema units This adjusts most (hopefully all) of the eagle conversion hard-coded mil values into the new eeschema internal unit values
2020-01-05 19:11:15 +00:00
netLabel->SetTextSize( wxSize( Mils2iu( 10 ), Mils2iu( 10 ) ) );
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
netLabel->SetLabelSpinStyle( LABEL_SPIN_STYLE::LEFT );
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
aScreen->Append( netLabel );
}
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
else if( !pinInUnit && 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() );
}
}
}
if( aUpdateSet )
{
auto cmpIt = m_missingCmps.find( reference );
// Set the flag indicating this unit has been processed
if( cmpIt != m_missingCmps.end() )
cmpIt->second.units[unit] = false;
// Save the units that need later processing
else if( !missingUnits.empty() )
{
EAGLE_MISSING_CMP& entry = m_missingCmps[reference];
Formatting sch_eagle_plugin.cpp only No code changes, just adjusting to match code style
2020-01-06 14:39:20 +00:00
entry.cmp = aComponent;
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 )
entry.units.emplace( i, true );
}
}
}
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
wxString SCH_EAGLE_PLUGIN::fixSymbolName( const wxString& aName )
{
Fix LIB_ID illegal character tests. The '/' and ':' are reserved and cannot be used in symbol or footprint names. They will cause the LIB_ID parser and formatter to fail. While it seems like they should be legal in symbol alias names, they will trigger a symbol rescue the next time the schematic is loaded. Use ID_SCH as in the Eagle schematic plugin rather than ID_ALIAS to ensure symbol names do not need rescued the next time the schematic is opened. Remove ID_ALIAS since the rules for alias names are the same as the rules for symbol names. Otherwise, allowing '/' and ':' in alias names will force a symbol rescue on the next schematic load. Fixes lp:1795600 https://bugs.launchpad.net/kicad/+bug/1795600
2018-10-07 13:08:30 +00:00
wxString ret = LIB_ID::FixIllegalChars( aName, LIB_ID::ID_SCH );
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
return ret;
}
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;
wxString ret = "{";
wxStringTokenizer tokenizer( aEagleName, "," );
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 )
member << "!";
ret << member << " ";
}
ret.Trim( true );
ret << "}";
return ret;
}