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

Export vrml: fix Bug #1502550 (Pcbnew Messes Up File-Name and File-Path with Multiple Export WRL) and fix a not so good file name handling after loading an other board in a stand alone Pcbnew session.

This commit is contained in:
jean-pierre charras 2015-10-04 19:07:20 +02:00
parent 5591353871
commit 8e08baee10
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pcbnew/dialogs/dialog_export_vrml.cpp
View File

@ -111,7 +111,7 @@ public:
m_SubdirNameCtrl->SetValue( aDir ); m_SubdirNameCtrl->SetValue( aDir );
} }
wxString GetSubdir() wxString GetSubdir3Dshapes()
{ {
return m_SubdirNameCtrl->GetValue(); return m_SubdirNameCtrl->GetValue();
} }
@ -175,16 +175,18 @@ public:
void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event ) void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event )
{ {
static wxString mruPath; // These variables are static to keep info during the session.
static wxString subDirFor3Dshapes; static wxString subDirFor3Dshapes;
wxFileName fn; static wxString last_brdName; // the last board name used to build the vrml filename
wxString projectPath; static wxString last_vrmlName; // the last wrml file name built
if( !wxGetEnv( wxT( "KIPRJMOD" ), &projectPath ) ) // If the board name has changed since the last export,
projectPath = wxFileName::GetCwd(); // do not use the old path, initialized by an other board
if( last_brdName.IsEmpty() || last_brdName != GetBoard()->GetFileName() )
if( mruPath.IsEmpty() ) {
mruPath = projectPath; last_brdName = GetBoard()->GetFileName();
last_vrmlName = last_brdName;
}
if( subDirFor3Dshapes.IsEmpty() ) if( subDirFor3Dshapes.IsEmpty() )
{ {
@ -196,18 +198,14 @@ void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event )
// this is the mm to VRML scaling factor for mm, 0.1 inch, and inch // this is the mm to VRML scaling factor for mm, 0.1 inch, and inch
double scaleList[4] = { 1.0, 0.001, 10.0/25.4, 1.0/25.4 }; double scaleList[4] = { 1.0, 0.001, 10.0/25.4, 1.0/25.4 };
// Build default file name // Build default file name, to display in the file picker
fn = GetBoard()->GetFileName(); wxFileName fn = last_vrmlName;
fn.SetExt( wxT( "wrl" ) ); fn.SetExt( wxT( "wrl" ) );
fn.SetPath( mruPath );
DIALOG_EXPORT_3DFILE dlg( this ); DIALOG_EXPORT_3DFILE dlg( this );
dlg.FilePicker()->SetPath( fn.GetFullPath() ); dlg.FilePicker()->SetPath( fn.GetFullPath() );
dlg.SetSubdir( subDirFor3Dshapes ); dlg.SetSubdir( subDirFor3Dshapes );
if( dlg.ShowModal() != wxID_OK )
return;
double aXRef = dlg.GetXRef(); double aXRef = dlg.GetXRef();
double aYRef = dlg.GetYRef(); double aYRef = dlg.GetYRef();
@ -222,28 +220,27 @@ void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event )
bool export3DFiles = dlg.GetCopyFilesOption(); bool export3DFiles = dlg.GetCopyFilesOption();
bool useRelativePaths = dlg.GetUseRelativePathsOption(); bool useRelativePaths = dlg.GetUseRelativePathsOption();
bool usePlainPCB = dlg.GetUsePlainPCBOption(); bool usePlainPCB = dlg.GetUsePlainPCBOption();
wxString fullFilename = dlg.FilePicker()->GetPath();
wxFileName modelPath = fullFilename; if( dlg.ShowModal() != wxID_OK )
return;
last_vrmlName = dlg.FilePicker()->GetPath();
wxFileName modelPath = last_vrmlName;
wxBusyCursor dummy; wxBusyCursor dummy;
modelPath.AppendDir( dlg.GetSubdir() ); subDirFor3Dshapes = dlg.GetSubdir3Dshapes();
subDirFor3Dshapes = dlg.GetSubdir(); modelPath.AppendDir( subDirFor3Dshapes );
mruPath = dlg.FilePicker()->GetPath();
wxLogDebug( wxT( "Exporting enabled=%d to %s." ),
export3DFiles, GetChars( subDirFor3Dshapes ) );
if( export3DFiles && !modelPath.DirExists() ) if( export3DFiles && !modelPath.DirExists() )
{ {
modelPath.Mkdir(); modelPath.Mkdir();
} }
if( !ExportVRML_File( fullFilename, scale, export3DFiles, useRelativePaths, if( !ExportVRML_File( last_vrmlName, scale, export3DFiles, useRelativePaths,
usePlainPCB, modelPath.GetPath(), usePlainPCB, modelPath.GetPath(), aXRef, aYRef ) )
aXRef, aYRef ) )
{ {
wxString msg; wxString msg;
msg.Printf( _( "Unable to create file '%s'" ), GetChars( fullFilename ) ); msg.Printf( _( "Unable to create file '%s'" ), GetChars( last_vrmlName ) );
wxMessageBox( msg ); wxMessageBox( msg );
return; return;
} }