Commit 0f7e3580 authored by jean-pierre charras's avatar jean-pierre charras

3D viewer: fix a bug introduced in rev 5579s. Remove a few useless wxBusyCursor. Minor other fixes.

parent 763290ad
...@@ -224,7 +224,7 @@ int ParseVertexList( FILE* File, std::vector<glm::vec3>& dst_vector ) ...@@ -224,7 +224,7 @@ int ParseVertexList( FILE* File, std::vector<glm::vec3>& dst_vector )
glm::vec3 vertex; glm::vec3 vertex;
while( ParseVertex( File, vertex ) == 3 ) while( ParseVertex( File, vertex ) )
{ {
dst_vector.push_back( vertex ); dst_vector.push_back( vertex );
} }
......
...@@ -794,7 +794,6 @@ void CVPCB_MAINFRAME::SendMessageToEESCHEMA() ...@@ -794,7 +794,6 @@ void CVPCB_MAINFRAME::SendMessageToEESCHEMA()
int CVPCB_MAINFRAME::ReadSchematicNetlist() int CVPCB_MAINFRAME::ReadSchematicNetlist()
{ {
wxBusyCursor dummy; // Shows an hourglass while loading.
NETLIST_READER* netlistReader; NETLIST_READER* netlistReader;
wxString msg; wxString msg;
wxString compFootprintLinkFileName; wxString compFootprintLinkFileName;
......
...@@ -68,8 +68,6 @@ void SCH_EDIT_FRAME::AnnotateComponents( bool aAnnotateSchematic, ...@@ -68,8 +68,6 @@ void SCH_EDIT_FRAME::AnnotateComponents( bool aAnnotateSchematic,
{ {
SCH_REFERENCE_LIST references; SCH_REFERENCE_LIST references;
wxBusyCursor dummy;
SCH_SCREENS screens; SCH_SCREENS screens;
// Build the sheet list. // Build the sheet list.
......
...@@ -50,7 +50,6 @@ bool SCH_EDIT_FRAME::WriteNetListFile( NETLIST_OBJECT_LIST * aConnectedItemsList ...@@ -50,7 +50,6 @@ bool SCH_EDIT_FRAME::WriteNetListFile( NETLIST_OBJECT_LIST * aConnectedItemsList
bool executeCommandLine = false; bool executeCommandLine = false;
wxString fileName = aFullFileName; wxString fileName = aFullFileName;
wxBusyCursor Busy;
NETLIST_EXPORTER *helper; NETLIST_EXPORTER *helper;
switch( aFormat ) switch( aFormat )
......
...@@ -136,8 +136,6 @@ void NETLIST_OBJECT_LIST::SortListbySheet() ...@@ -136,8 +136,6 @@ void NETLIST_OBJECT_LIST::SortListbySheet()
NETLIST_OBJECT_LIST * SCH_EDIT_FRAME::BuildNetListBase() NETLIST_OBJECT_LIST * SCH_EDIT_FRAME::BuildNetListBase()
{ {
wxBusyCursor Busy;
// Creates the flattened sheet list: // Creates the flattened sheet list:
SCH_SHEET_LIST aSheets; SCH_SHEET_LIST aSheets;
......
...@@ -985,9 +985,10 @@ void SCH_EDIT_FRAME::OnOpenCvpcb( wxCommandEvent& event ) ...@@ -985,9 +985,10 @@ void SCH_EDIT_FRAME::OnOpenCvpcb( wxCommandEvent& event )
if( !player ) if( !player )
{ {
player = Kiway().Player( FRAME_CVPCB, true ); player = Kiway().Player( FRAME_CVPCB, true );
player->OpenProjectFiles( std::vector<wxString>( 1, fn.GetFullPath() ) );
player->Show( true ); player->Show( true );
player->OpenProjectFiles( std::vector<wxString>( 1, fn.GetFullPath() ) );
} }
player->Raise(); player->Raise();
} }
} }
......
...@@ -218,7 +218,7 @@ void TraceFilledRectangle( int ux0, int uy0, int ux1, int uy1, ...@@ -218,7 +218,7 @@ void TraceFilledRectangle( int ux0, int uy0, int ux1, int uy1,
void FreeQueue(); void FreeQueue();
void InitQueue(); void InitQueue();
void GetQueue( int *, int *, int *, int *, int * ); void GetQueue( int *, int *, int *, int *, int * );
int SetQueue( int, int, int, int, int, int, int ); bool SetQueue( int, int, int, int, int, int, int );
void ReSetQueue( int, int, int, int, int, int, int ); void ReSetQueue( int, int, int, int, int, int, int );
/* WORK.CPP */ /* WORK.CPP */
......
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2015 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* *
* Copyright (C) 1992-2012 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2015 KiCad Developers, see change_log.txt for contributors.
* *
* First copyright (C) Randy Nevin, 1989 (see PCBCA package) * First copyright (C) Randy Nevin, 1989 (see PCBCA package)
* *
...@@ -56,12 +56,6 @@ static struct PcbQueue* Tail = NULL; ...@@ -56,12 +56,6 @@ static struct PcbQueue* Tail = NULL;
static struct PcbQueue* Save = NULL; /* hold empty queue structs */ static struct PcbQueue* Save = NULL; /* hold empty queue structs */
void InitQueue();
void GetQueue( int*, int*, int*, int*, int* );
int SetQueue( int, int, int, int, int, int, int );
void ReSetQueue( int, int, int, int, int, int, int );
/* Free the memory used for storing all the queue */ /* Free the memory used for storing all the queue */
void FreeQueue() void FreeQueue()
{ {
...@@ -123,7 +117,7 @@ void GetQueue( int* r, int* c, int* s, int* d, int* a ) ...@@ -123,7 +117,7 @@ void GetQueue( int* r, int* c, int* s, int* d, int* a )
* 1 - OK * 1 - OK
* 0 - Failed to allocate memory. * 0 - Failed to allocate memory.
*/ */
int SetQueue( int r, int c, int side, int d, int a, int r2, int c2 ) bool SetQueue( int r, int c, int side, int d, int a, int r2, int c2 )
{ {
struct PcbQueue* p, * q, * t; struct PcbQueue* p, * q, * t;
int i, j; int i, j;
...@@ -221,5 +215,6 @@ void ReSetQueue( int r, int c, int s, int d, int a, int r2, int c2 ) ...@@ -221,5 +215,6 @@ void ReSetQueue( int r, int c, int s, int d, int a, int r2, int c2 )
ClosNodes--; /* we will close it again, but just count once */ ClosNodes--; /* we will close it again, but just count once */
/* if it was there, it's gone now; insert it at the proper position */ /* if it was there, it's gone now; insert it at the proper position */
SetQueue( r, c, s, d, a, r2, c2 ); bool res = SetQueue( r, c, s, d, a, r2, c2 );
(void) res;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment