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
375310f2
Commit
375310f2
authored
Dec 27, 2011
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3D view: Fix Bug #908871
Eeschema: fix a minor issue.
parent
750dd6ee
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
3d_read_mesh.cpp
3d-viewer/3d_read_mesh.cpp
+10
-3
libedit.cpp
eeschema/libedit.cpp
+4
-2
No files found.
3d-viewer/3d_read_mesh.cpp
View file @
375310f2
...
@@ -49,13 +49,20 @@ int S3D_MASTER::ReadData()
...
@@ -49,13 +49,20 @@ int S3D_MASTER::ReadData()
return
1
;
return
1
;
}
}
if
(
wxFileName
::
FileExists
(
m_Shape3DName
)
)
wxString
shape3DNname
=
m_Shape3DName
;
#ifdef __WINDOWS__
shape3DNname
.
Replace
(
wxT
(
"/"
),
wxT
(
"
\\
"
)
);
#else
shape3DNname
.
Replace
(
wxT
(
"
\\
"
),
wxT
(
"/"
)
);
#endif
if
(
wxFileName
::
FileExists
(
shape3DNname
)
)
{
{
FullFilename
=
m_Shape3DN
ame
;
FullFilename
=
shape3DNn
ame
;
}
}
else
else
{
{
fn
=
m_Shape3DN
ame
;
fn
=
shape3DNn
ame
;
FullFilename
=
wxGetApp
().
FindLibraryPath
(
fn
);
FullFilename
=
wxGetApp
().
FindLibraryPath
(
fn
);
if
(
FullFilename
.
IsEmpty
()
)
if
(
FullFilename
.
IsEmpty
()
)
...
...
eeschema/libedit.cpp
View file @
375310f2
...
@@ -322,6 +322,7 @@ void LIB_EDIT_FRAME::SaveActiveLibrary( wxCommandEvent& event )
...
@@ -322,6 +322,7 @@ void LIB_EDIT_FRAME::SaveActiveLibrary( wxCommandEvent& event )
if
(
libFileName
.
FileExists
()
)
if
(
libFileName
.
FileExists
()
)
{
{
backupFileName
.
SetExt
(
wxT
(
"bak"
)
);
backupFileName
.
SetExt
(
wxT
(
"bak"
)
);
if
(
backupFileName
.
FileExists
()
)
wxRemoveFile
(
backupFileName
.
GetFullPath
()
);
wxRemoveFile
(
backupFileName
.
GetFullPath
()
);
if
(
!
wxRenameFile
(
libFileName
.
GetFullPath
(),
backupFileName
.
GetFullPath
()
)
)
if
(
!
wxRenameFile
(
libFileName
.
GetFullPath
(),
backupFileName
.
GetFullPath
()
)
)
...
@@ -361,6 +362,7 @@ void LIB_EDIT_FRAME::SaveActiveLibrary( wxCommandEvent& event )
...
@@ -361,6 +362,7 @@ void LIB_EDIT_FRAME::SaveActiveLibrary( wxCommandEvent& event )
if
(
docFileName
.
FileExists
()
)
if
(
docFileName
.
FileExists
()
)
{
{
backupFileName
.
SetExt
(
wxT
(
"bck"
)
);
backupFileName
.
SetExt
(
wxT
(
"bck"
)
);
if
(
backupFileName
.
FileExists
()
)
wxRemoveFile
(
backupFileName
.
GetFullPath
()
);
wxRemoveFile
(
backupFileName
.
GetFullPath
()
);
if
(
!
wxRenameFile
(
docFileName
.
GetFullPath
(),
backupFileName
.
GetFullPath
()
)
)
if
(
!
wxRenameFile
(
docFileName
.
GetFullPath
(),
backupFileName
.
GetFullPath
()
)
)
...
...
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