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

Fix bug: MSWin to UNIX file separator conversion was in the wrong place, leading to wrong separator shown in GUI

This commit is contained in:
Cirilo Bernardo 2016-01-18 08:33:39 +11:00
parent e185b29baa
commit 5d82d9348d
2 changed files with 61 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
View File

@ -518,21 +518,6 @@ void DIALOG_MODULE_BOARD_EDITOR::Edit3DShapeFileName()
prj.SetRString( PROJECT::VIEWER_3D_PATH, initialpath );
sidx = wxString::Format( wxT( "%i" ), filter );
prj.SetRString( PROJECT::VIEWER_3D_FILTER_INDEX, sidx );
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatPosition = m_Shapes3D_list[idx]->m_MatPosition;
new3DShape->m_MatRotation = m_Shapes3D_list[idx]->m_MatRotation;
new3DShape->m_MatScale = m_Shapes3D_list[idx]->m_MatScale;
delete m_Shapes3D_list[idx];
m_Shapes3D_list[idx] = new3DShape;
wxString alias;
wxString shortPath;
S3D_FILENAME_RESOLVER* res = Prj().Get3DCacheManager()->GetResolver();
@ -547,6 +532,19 @@ void DIALOG_MODULE_BOARD_EDITOR::Edit3DShapeFileName()
m_3D_ShapeNameListBox->SetString( idx, oldPath );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatPosition = m_Shapes3D_list[idx]->m_MatPosition;
new3DShape->m_MatRotation = m_Shapes3D_list[idx]->m_MatRotation;
new3DShape->m_MatScale = m_Shapes3D_list[idx]->m_MatScale;
delete m_Shapes3D_list[idx];
m_Shapes3D_list[idx] = new3DShape;
Transfert3DValuesToDisplay( m_Shapes3D_list[idx] );
return;
@ -580,27 +578,6 @@ void DIALOG_MODULE_BOARD_EDITOR::BrowseAndAdd3DShapeFile()
prj.SetRString( PROJECT::VIEWER_3D_PATH, initialpath );
sidx = wxString::Format( wxT( "%i" ), filter );
prj.SetRString( PROJECT::VIEWER_3D_FILTER_INDEX, sidx );
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatScale.x = model.scale.x;
new3DShape->m_MatScale.y = model.scale.y;
new3DShape->m_MatScale.z = model.scale.z;
new3DShape->m_MatRotation.x = model.rotation.x;
new3DShape->m_MatRotation.y = model.rotation.y;
new3DShape->m_MatRotation.z = model.rotation.z;
new3DShape->m_MatPosition.x = model.offset.x;
new3DShape->m_MatPosition.y = model.offset.y;
new3DShape->m_MatPosition.z = model.offset.z;
m_Shapes3D_list.push_back( new3DShape );
wxString origPath = model.filename;
wxString alias;
wxString shortPath;
@ -615,6 +592,24 @@ void DIALOG_MODULE_BOARD_EDITOR::BrowseAndAdd3DShapeFile()
m_3D_ShapeNameListBox->Append( origPath );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatScale.x = model.scale.x;
new3DShape->m_MatScale.y = model.scale.y;
new3DShape->m_MatScale.z = model.scale.z;
new3DShape->m_MatRotation.x = model.rotation.x;
new3DShape->m_MatRotation.y = model.rotation.y;
new3DShape->m_MatRotation.z = model.rotation.z;
new3DShape->m_MatPosition.x = model.offset.x;
new3DShape->m_MatPosition.y = model.offset.y;
new3DShape->m_MatPosition.z = model.offset.z;
m_Shapes3D_list.push_back( new3DShape );
m_LastSelected3DShapeIndex = m_3D_ShapeNameListBox->GetCount() - 1;
m_3D_ShapeNameListBox->SetSelection( m_LastSelected3DShapeIndex );
Transfert3DValuesToDisplay( m_Shapes3D_list[m_LastSelected3DShapeIndex] );

68
pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
View File

@ -385,22 +385,6 @@ void DIALOG_MODULE_MODULE_EDITOR::Edit3DShapeFileName()
prj.SetRString( PROJECT::VIEWER_3D_PATH, initialpath );
sidx = wxString::Format( wxT( "%i" ), filter );
prj.SetRString( PROJECT::VIEWER_3D_FILTER_INDEX, sidx );
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatPosition = m_shapes3D_list[idx]->m_MatPosition;
new3DShape->m_MatRotation = m_shapes3D_list[idx]->m_MatRotation;
new3DShape->m_MatScale = m_shapes3D_list[idx]->m_MatScale;
delete m_shapes3D_list[idx];
m_shapes3D_list[idx] = new3DShape;
wxString alias;
wxString shortPath;
S3D_FILENAME_RESOLVER* res = Prj().Get3DCacheManager()->GetResolver();
@ -415,6 +399,18 @@ void DIALOG_MODULE_MODULE_EDITOR::Edit3DShapeFileName()
m_3D_ShapeNameListBox->SetString( idx, oldPath );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatPosition = m_shapes3D_list[idx]->m_MatPosition;
new3DShape->m_MatRotation = m_shapes3D_list[idx]->m_MatRotation;
new3DShape->m_MatScale = m_shapes3D_list[idx]->m_MatScale;
delete m_shapes3D_list[idx];
m_shapes3D_list[idx] = new3DShape;
Transfert3DValuesToDisplay( m_shapes3D_list[idx] );
return;
@ -448,28 +444,6 @@ void DIALOG_MODULE_MODULE_EDITOR::BrowseAndAdd3DShapeFile()
prj.SetRString( PROJECT::VIEWER_3D_PATH, initialpath );
sidx = wxString::Format( wxT( "%i" ), filter );
prj.SetRString( PROJECT::VIEWER_3D_FILTER_INDEX, sidx );
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatScale.x = model.scale.x;
new3DShape->m_MatScale.y = model.scale.y;
new3DShape->m_MatScale.z = model.scale.z;
new3DShape->m_MatRotation.x = model.rotation.x;
new3DShape->m_MatRotation.y = model.rotation.y;
new3DShape->m_MatRotation.z = model.rotation.z;
new3DShape->m_MatPosition.x = model.offset.x;
new3DShape->m_MatPosition.y = model.offset.y;
new3DShape->m_MatPosition.z = model.offset.z;
m_shapes3D_list.push_back( new3DShape );
wxString origPath = model.filename;
wxString alias;
wxString shortPath;
@ -484,6 +458,24 @@ void DIALOG_MODULE_MODULE_EDITOR::BrowseAndAdd3DShapeFile()
m_3D_ShapeNameListBox->Append( origPath );
#ifdef __WINDOWS__
// In Kicad files, filenames and paths are stored using Unix notation
model.filename.Replace( wxT( "\\" ), wxT( "/" ) );
#endif
S3D_MASTER* new3DShape = new S3D_MASTER( NULL );
new3DShape->SetShape3DName( model.filename );
new3DShape->m_MatScale.x = model.scale.x;
new3DShape->m_MatScale.y = model.scale.y;
new3DShape->m_MatScale.z = model.scale.z;
new3DShape->m_MatRotation.x = model.rotation.x;
new3DShape->m_MatRotation.y = model.rotation.y;
new3DShape->m_MatRotation.z = model.rotation.z;
new3DShape->m_MatPosition.x = model.offset.x;
new3DShape->m_MatPosition.y = model.offset.y;
new3DShape->m_MatPosition.z = model.offset.z;
m_shapes3D_list.push_back( new3DShape );
m_lastSelected3DShapeIndex = m_3D_ShapeNameListBox->GetCount() - 1;
m_3D_ShapeNameListBox->SetSelection( m_lastSelected3DShapeIndex );
Transfert3DValuesToDisplay( m_shapes3D_list[m_lastSelected3DShapeIndex] );