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

Specctra import/export: fix some issues (tested only with FreeRouter): 

- Better handling of locked tracks than commit cbb6ca85
- Locked tracks are now exported with attribute "fix".
- Incorrect view cleaning
- Fix memory leak.
This commit is contained in:
jean-pierre charras 2022-03-16 12:31:45 +01:00
parent c16090cc42
commit 567fd5ba74
4 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/specctra_import_export/specctra.cpp
View File

@ -3,7 +3,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007-2011 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2007-2021 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2007-2021 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

6
pcbnew/specctra_import_export/specctra.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007-2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2007-2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2007-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -3962,13 +3962,13 @@ private:
/**
* Create a #TRACK form the #PATH and #BOARD info.
*/
PCB_TRACK* makeTRACK( PATH* aPath, int aPointIndex, int aNetcode );
PCB_TRACK* makeTRACK( WIRE* wire, PATH* aPath, int aPointIndex, int aNetcode );
/**
* Instantiate a KiCad #VIA on the heap and initializes it with internal
* values consistent with the given #PADSTACK, #POINT, and netcode.
*/
PCB_VIA* makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode,
PCB_VIA* makeVIA( WIRE_VIA*aVia, PADSTACK* aPadstack, const POINT& aPoint, int aNetCode,
int aViaDrillDefault );
//-----</FromSESSION>----------------------------------------------------

10
pcbnew/specctra_import_export/specctra_export.cpp
View File

@ -1695,7 +1695,10 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
wiring->wires.push_back( wire );
wire->net_id = netname;
wire->wire_type = T_protect; // @todo, this should be configurable
if( track->IsLocked() )
wire->wire_type = T_fix; // tracks with fix property are not returnned in .ses files
else
wire->wire_type = T_route; // could be T_protect
int kiLayer = track->GetLayer();
int pcbLayer = m_kicadLayer2pcb[kiLayer];
@ -1754,7 +1757,10 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
dsnVia->net_id = TO_UTF8( net->GetNetname() );
dsnVia->via_type = T_protect; // @todo, this should be configurable
if( via->IsLocked() )
dsnVia->via_type = T_fix; // vias with fix property are not returnned in .ses files
else
dsnVia->via_type = T_route; // could be T_protect
}
}

63
pcbnew/specctra_import_export/specctra_import.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007-2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2007-2022 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2007-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -57,6 +57,14 @@ bool PCB_EDIT_FRAME::ImportSpecctraSession( const wxString& fullFileName )
// todo: use undo/redo feature
ClearUndoRedoList();
// Remove existing tracks from view. They will be readded later after loading
// new tracks.
if( GetCanvas() ) // clear view:
{
for( PCB_TRACK* track : GetBoard()->Tracks() )
GetCanvas()->GetView()->Remove( track );
}
SPECCTRA_DB db;
LOCALE_IO toggle;
@ -157,7 +165,7 @@ static wxPoint mapPt( const POINT& aPoint, UNIT_RES* aResolution )
}
PCB_TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode )
PCB_TRACK* SPECCTRA_DB::makeTRACK( WIRE* wire, PATH* aPath, int aPointIndex, int aNetcode )
{
int layerNdx = findLayerName( aPath->layer_id );
@ -175,11 +183,19 @@ PCB_TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode )
track->SetWidth( scale( aPath->aperture_width, m_routeResolution ) );
track->SetNetCode( aNetcode );
// a track can be locked.
// However specctra as 4 types, none is exactly the same as our locked option
// wire->wire_type = T_fix, T_route, T_normal or T_protect
// fix and protect could be used as lock option
// but protect is returned for all tracks having initially the route or protect property
if( wire->wire_type == T_fix )
track->SetLocked( true );
return track;
}
PCB_VIA* SPECCTRA_DB::makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode,
PCB_VIA* SPECCTRA_DB::makeVIA( WIRE_VIA*aVia, PADSTACK* aPadstack, const POINT& aPoint, int aNetCode,
int aViaDrillDefault )
{
PCB_VIA* via = 0;
@ -311,6 +327,15 @@ PCB_VIA* SPECCTRA_DB::makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNe
wxASSERT( via );
via->SetNetCode( aNetCode );
// a via can be locked.
// However specctra as 4 types, none is exactly the same as our locked option
// aVia->via_type = T_fix, T_route, T_normal or T_protect
// fix and protect could be used as lock option
// but protect is returned for all tracks having initially the route or protect property
if( aVia->via_type == T_fix )
via->SetLocked( true );
return via;
}
@ -331,13 +356,32 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
if( !m_session->route->library )
THROW_IO_ERROR( _("Session file is missing the \"library_out\" section") );
// delete all the old tracks and vias
aBoard->Tracks().clear();
// delete all the old tracks and vias but save locked tracks/vias
// they will be re-added later
std::vector<PCB_TRACK*> locked;
while( !aBoard->Tracks().empty() )
{
PCB_TRACK* track = aBoard->Tracks().back();
aBoard->Tracks().pop_back();
if( track->IsLocked() )
locked.push_back( track );
else
delete track;
}
aBoard->DeleteMARKERs();
buildLayerMaps( aBoard );
// Add locked tracks: because they are exported as Fix tracks, they are not
// in .ses file.
for( PCB_TRACK* track: locked )
{
aBoard->Add( track );
}
if( m_session->placement )
{
// Walk the PLACEMENT object's COMPONENTs list, and for each PLACE within
@ -452,10 +496,9 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
{
PATH* path = (PATH*) wire->shape;
for( unsigned pt=0; pt<path->points.size()-1; ++pt )
for( unsigned pt=0; pt < path->points.size()-1; ++pt )
{
PCB_TRACK* track = makeTRACK( path, pt, netoutCode );
track->SetLocked( wire->wire_type == T_protect );
PCB_TRACK* track = makeTRACK( wire, path, pt, netoutCode );
aBoard->Add( track );
}
}
@ -507,9 +550,9 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
int via_drill_default = netclass->GetViaDrill();
for( unsigned v=0; v<wire_via->vertexes.size(); ++v )
for( unsigned v = 0; v < wire_via->vertexes.size(); ++v )
{
PCB_VIA* via = makeVIA( padstack, wire_via->vertexes[v], netCode,
PCB_VIA* via = makeVIA( wire_via, padstack, wire_via->vertexes[v], netCode,
via_drill_default );
aBoard->Add( via );
}