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
1e68c5f8
Commit
1e68c5f8
authored
Apr 24, 2014
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comment fix, simplified unhandled IO_ERROR exception report in single_top.cpp.
parent
8f0a773b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
16 deletions
+15
-16
CMakeLists.txt
CMakeLists.txt
+12
-11
kiway.cpp
common/kiway.cpp
+2
-2
single_top.cpp
common/single_top.cpp
+1
-3
No files found.
CMakeLists.txt
View file @
1e68c5f8
...
@@ -621,7 +621,6 @@ add_subdirectory( 3d-viewer )
...
@@ -621,7 +621,6 @@ add_subdirectory( 3d-viewer )
add_subdirectory
(
cvpcb
)
add_subdirectory
(
cvpcb
)
add_subdirectory
(
eeschema
)
add_subdirectory
(
eeschema
)
add_subdirectory
(
gerbview
)
add_subdirectory
(
gerbview
)
add_subdirectory
(
kicad
)
add_subdirectory
(
lib_dxf
)
add_subdirectory
(
lib_dxf
)
add_subdirectory
(
pcbnew
)
add_subdirectory
(
pcbnew
)
add_subdirectory
(
polygon
)
add_subdirectory
(
polygon
)
...
@@ -629,9 +628,11 @@ add_subdirectory( pagelayout_editor )
...
@@ -629,9 +628,11 @@ add_subdirectory( pagelayout_editor )
add_subdirectory
(
potrace
)
add_subdirectory
(
potrace
)
add_subdirectory
(
bitmap2component
)
add_subdirectory
(
bitmap2component
)
add_subdirectory
(
pcb_calculator
)
add_subdirectory
(
pcb_calculator
)
add_subdirectory
(
kicad
)
# should follow pcbnew, eeschema
add_subdirectory
(
tools
)
add_subdirectory
(
tools
)
add_subdirectory
(
utils
)
add_subdirectory
(
utils
)
add_subdirectory
(
qa
)
add_subdirectory
(
qa
)
#add_subdirectory( new )
#add_subdirectory( new )
...
@@ -651,16 +652,16 @@ add_dependencies( pnsrouter boost )
...
@@ -651,16 +652,16 @@ add_dependencies( pnsrouter boost )
if
(
KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC
)
if
(
KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC
)
add_dependencies
(
pcbnew lib-dependencies
)
add_dependencies
(
pcbnew lib-dependencies
)
add_dependencies
(
eeschema lib-dependencies
)
add_dependencies
(
eeschema lib-dependencies
)
add_dependencies
(
cvpcb lib-dependencies
)
add_dependencies
(
cvpcb lib-dependencies
)
add_dependencies
(
common lib-dependencies
)
add_dependencies
(
common lib-dependencies
)
add_dependencies
(
gal lib-dependencies
)
add_dependencies
(
gal lib-dependencies
)
add_dependencies
(
pcbcommon lib-dependencies
)
add_dependencies
(
pcbcommon lib-dependencies
)
add_dependencies
(
3d-viewer lib-dependencies
)
add_dependencies
(
3d-viewer lib-dependencies
)
add_dependencies
(
pcad2kicadpcb lib-dependencies
)
add_dependencies
(
pcad2kicadpcb lib-dependencies
)
add_dependencies
(
pl_editor lib-dependencies
)
add_dependencies
(
pl_editor lib-dependencies
)
add_dependencies
(
pnsrouter lib-dependencies
)
add_dependencies
(
pnsrouter lib-dependencies
)
endif
()
endif
()
if
(
KICAD_BUILD_DYNAMIC
)
if
(
KICAD_BUILD_DYNAMIC
)
...
...
common/kiway.cpp
View file @
1e68c5f8
...
@@ -198,8 +198,8 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
...
@@ -198,8 +198,8 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
// This is a fatal error, one from which we cannot recover, nor do we want
// This is a fatal error, one from which we cannot recover, nor do we want
// to protect against in client code which would require numerous noisy
// to protect against in client code which would require numerous noisy
// tests in numerous places. So we inform the user that the installation
// tests in numerous places. So we inform the user that the installation
// is bad. This exception will likely not get caught until way up in
// is bad. This exception will likely not get caught until way up in
the
//
PGM_BASE or a
derivative, at which point the process will exit gracefully.
//
wxApp
derivative, at which point the process will exit gracefully.
THROW_IO_ERROR
(
msg
);
THROW_IO_ERROR
(
msg
);
}
}
...
...
common/single_top.cpp
View file @
1e68c5f8
...
@@ -176,9 +176,7 @@ struct APP_SINGLE_TOP : public wxApp
...
@@ -176,9 +176,7 @@ struct APP_SINGLE_TOP : public wxApp
}
}
catch
(
const
IO_ERROR
&
ioe
)
catch
(
const
IO_ERROR
&
ioe
)
{
{
wxLogError
(
wxT
(
"Unhandled exception class: %s what: %s"
),
wxLogError
(
GetChars
(
ioe
.
errorText
)
);
GetChars
(
FROM_UTF8
(
typeid
(
ioe
).
name
()
)
),
GetChars
(
ioe
.
errorText
)
);
}
}
catch
(...)
catch
(...)
{
{
...
...
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