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

Minor changes (fix cvpcb build issue, wx2.8 compatibility, some other stuff).

This commit is contained in:
Maciej Suminski 2014-02-03 16:02:54 +01:00
parent 0c67e26e9c
commit 3f5c3d4349
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/CMakeLists.txt
View File

@ -219,6 +219,7 @@ set( PCB_COMMON_SRCS
../pcbnew/class_zone.cpp ../pcbnew/class_zone.cpp
../pcbnew/class_zone_settings.cpp ../pcbnew/class_zone_settings.cpp
../pcbnew/classpcb.cpp ../pcbnew/classpcb.cpp
../pcbnew/ratsnest_data.cpp
../pcbnew/collectors.cpp ../pcbnew/collectors.cpp
../pcbnew/netlist_reader.cpp ../pcbnew/netlist_reader.cpp
../pcbnew/legacy_netlist_reader.cpp ../pcbnew/legacy_netlist_reader.cpp

1
pcbnew/CMakeLists.txt
View File

@ -221,7 +221,6 @@ set( PCBNEW_CLASS_SRCS
print_board_functions.cpp print_board_functions.cpp
printout_controler.cpp printout_controler.cpp
ratsnest.cpp ratsnest.cpp
ratsnest_data.cpp
ratsnest_viewitem.cpp ratsnest_viewitem.cpp
# specctra.cpp #moved in pcbcommon lib # specctra.cpp #moved in pcbcommon lib
# specctra_export.cpp # specctra_export.cpp

3
pcbnew/pcb_painter.cpp
View File

@ -34,7 +34,6 @@
#include <class_marker_pcb.h> #include <class_marker_pcb.h>
#include <class_dimension.h> #include <class_dimension.h>
#include <class_mire.h> #include <class_mire.h>
#include <class_netinfo.h>
#include <pcbstruct.h> #include <pcbstruct.h>
#include <view/view.h> #include <view/view.h>
@ -281,7 +280,7 @@ void PCB_PAINTER::draw( const TRACK* aTrack, int aLayer )
if( !net ) if( !net )
return; return;
std::wstring netName = std::wstring( net->GetShortNetname().wc_str() ); const wxString& netName = aTrack->GetShortNetname();
VECTOR2D textPosition = start + line / 2.0; // center of the track VECTOR2D textPosition = start + line / 2.0; // center of the track
double textOrientation = -atan( line.y / line.x ); double textOrientation = -atan( line.y / line.x );
double textSize = std::min( static_cast<double>( width ), length / netName.length() ); double textSize = std::min( static_cast<double>( width ), length / netName.length() );

6
pcbnew/pcb_parser.cpp
View File

@ -2426,9 +2426,9 @@ ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER() throw( IO_ERROR, PARSE_ERROR )
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
if( m_board->FindNet( zone->GetNet() )->GetNetname() != FromUTF8() ) if( m_board->FindNet( zone->GetNet() )->GetNetname() != FromUTF8() )
{ {
DisplayError( NULL, wxString::Format( _( "There is a zone that belongs to a not " wxString msg = _( "There is a zone that belongs to a not "
"existing net (%s), you should verify it." ), "existing net (" ) + FromUTF8() + _("), you should verify it." );
FromUTF8() ) ); DisplayError( NULL, msg );
zone->SetNet( NETINFO_LIST::UNCONNECTED ); zone->SetNet( NETINFO_LIST::UNCONNECTED );
} }
NeedRIGHT(); NeedRIGHT();

1
pcbnew/router/pns_router.cpp
View File

@ -631,7 +631,6 @@ void PNS_ROUTER::commitRouting( PNS_NODE* aNode )
newBI->ClearFlags(); newBI->ClearFlags();
m_view->Add( newBI ); m_view->Add( newBI );
m_board->Add( newBI ); m_board->Add( newBI );
m_board->GetRatsnest()->Update( newBI );
m_undoBuffer.PushItem( ITEM_PICKER( newBI, UR_NEW ) ); m_undoBuffer.PushItem( ITEM_PICKER( newBI, UR_NEW ) );
newBI->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY ); newBI->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
} }