Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
0f7e3580
Commit
0f7e3580
authored
Apr 08, 2015
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3D viewer: fix a bug introduced in rev 5579s. Remove a few useless wxBusyCursor. Minor other fixes.
parent
763290ad
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
19 deletions
+9
-19
vrml_aux.cpp
3d-viewer/vrml_aux.cpp
+1
-1
cvframe.cpp
cvpcb/cvframe.cpp
+0
-1
annotate.cpp
eeschema/annotate.cpp
+0
-2
netform.cpp
eeschema/netform.cpp
+0
-1
netlist.cpp
eeschema/netlist.cpp
+0
-2
schframe.cpp
eeschema/schframe.cpp
+2
-1
autorout.h
pcbnew/autorouter/autorout.h
+1
-1
queue.cpp
pcbnew/autorouter/queue.cpp
+5
-10
No files found.
3d-viewer/vrml_aux.cpp
View file @
0f7e3580
...
...
@@ -224,7 +224,7 @@ int ParseVertexList( FILE* File, std::vector<glm::vec3>& dst_vector )
glm
::
vec3
vertex
;
while
(
ParseVertex
(
File
,
vertex
)
==
3
)
while
(
ParseVertex
(
File
,
vertex
)
)
{
dst_vector
.
push_back
(
vertex
);
}
...
...
cvpcb/cvframe.cpp
View file @
0f7e3580
...
...
@@ -794,7 +794,6 @@ void CVPCB_MAINFRAME::SendMessageToEESCHEMA()
int
CVPCB_MAINFRAME
::
ReadSchematicNetlist
()
{
wxBusyCursor
dummy
;
// Shows an hourglass while loading.
NETLIST_READER
*
netlistReader
;
wxString
msg
;
wxString
compFootprintLinkFileName
;
...
...
eeschema/annotate.cpp
View file @
0f7e3580
...
...
@@ -68,8 +68,6 @@ void SCH_EDIT_FRAME::AnnotateComponents( bool aAnnotateSchematic,
{
SCH_REFERENCE_LIST
references
;
wxBusyCursor
dummy
;
SCH_SCREENS
screens
;
// Build the sheet list.
...
...
eeschema/netform.cpp
View file @
0f7e3580
...
...
@@ -50,7 +50,6 @@ bool SCH_EDIT_FRAME::WriteNetListFile( NETLIST_OBJECT_LIST * aConnectedItemsList
bool
executeCommandLine
=
false
;
wxString
fileName
=
aFullFileName
;
wxBusyCursor
Busy
;
NETLIST_EXPORTER
*
helper
;
switch
(
aFormat
)
...
...
eeschema/netlist.cpp
View file @
0f7e3580
...
...
@@ -136,8 +136,6 @@ void NETLIST_OBJECT_LIST::SortListbySheet()
NETLIST_OBJECT_LIST
*
SCH_EDIT_FRAME
::
BuildNetListBase
()
{
wxBusyCursor
Busy
;
// Creates the flattened sheet list:
SCH_SHEET_LIST
aSheets
;
...
...
eeschema/schframe.cpp
View file @
0f7e3580
...
...
@@ -985,9 +985,10 @@ void SCH_EDIT_FRAME::OnOpenCvpcb( wxCommandEvent& event )
if
(
!
player
)
{
player
=
Kiway
().
Player
(
FRAME_CVPCB
,
true
);
player
->
OpenProjectFiles
(
std
::
vector
<
wxString
>
(
1
,
fn
.
GetFullPath
()
)
);
player
->
Show
(
true
);
player
->
OpenProjectFiles
(
std
::
vector
<
wxString
>
(
1
,
fn
.
GetFullPath
()
)
);
}
player
->
Raise
();
}
}
...
...
pcbnew/autorouter/autorout.h
View file @
0f7e3580
...
...
@@ -218,7 +218,7 @@ void TraceFilledRectangle( int ux0, int uy0, int ux1, int uy1,
void
FreeQueue
();
void
InitQueue
();
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
);
/* WORK.CPP */
...
...
pcbnew/autorouter/queue.cpp
View file @
0f7e3580
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 201
2
Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
* Copyright (C) 201
5
Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
*
* Copyright (C) 1992-201
2
KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 1992-201
5
KiCad Developers, see change_log.txt for contributors.
*
* First copyright (C) Randy Nevin, 1989 (see PCBCA package)
*
...
...
@@ -56,12 +56,6 @@ static struct PcbQueue* Tail = NULL;
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 */
void
FreeQueue
()
{
...
...
@@ -123,7 +117,7 @@ void GetQueue( int* r, int* c, int* s, int* d, int* a )
* 1 - OK
* 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
;
int
i
,
j
;
...
...
@@ -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 */
/* 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
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment