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

Add option to VRML Export for Plain PCB (patch from Cirilo Bernardo)

This commit is contained in:
unknown 2014-12-20 17:13:51 +01:00 committed by jean-pierre charras
parent 41e044c0b4
commit 05073c15ed
6 changed files with 161 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wxPcbStruct.h
View File

@ -938,7 +938,7 @@ public:
* @todo Use mm inside the file. A general scale transform is applied to the whole * @todo Use mm inside the file. A general scale transform is applied to the whole
* file (1.0 to have the actual WRML unit im mm, 0.001 to have the actual WRML * file (1.0 to have the actual WRML unit im mm, 0.001 to have the actual WRML
* unit in meters. * unit in meters.
* @note For 3D models built by a 3D modeler, the unit is 0,1 inches. A specfic scale * @note For 3D models built by a 3D modeler, the unit is 0,1 inches. A specific scale
* is applied to 3D models to convert them to internal units. * is applied to 3D models to convert them to internal units.
* *
* @param aFullFileName = the full filename of the file to create * @param aFullFileName = the full filename of the file to create
@ -947,13 +947,16 @@ public:
* @param aExport3DFiles = true to copy 3D shapes in the subir a3D_Subdir * @param aExport3DFiles = true to copy 3D shapes in the subir a3D_Subdir
* @param aUseRelativePaths set to true to use relative paths instead of absolute paths * @param aUseRelativePaths set to true to use relative paths instead of absolute paths
* in the board VRML file URLs. * in the board VRML file URLs.
* @param aUsePlainPCB set to true to export a board with no copper or silkskreen;
* this is useful for generating a VRML file which can be
* converted to a STEP model.
* @param a3D_Subdir = sub directory where 3D shapes files are copied. This is only used * @param a3D_Subdir = sub directory where 3D shapes files are copied. This is only used
* when aExport3DFiles == true * when aExport3DFiles == true
* @return true if Ok. * @return true if Ok.
*/ */
bool ExportVRML_File( const wxString & aFullFileName, double aMMtoWRMLunit, bool ExportVRML_File( const wxString & aFullFileName, double aMMtoWRMLunit,
bool aExport3DFiles, bool aUseRelativePaths, bool aExport3DFiles, bool aUseRelativePaths,
const wxString & a3D_Subdir ); bool aUsePlainPCB, const wxString & a3D_Subdir );
/** /**
* Function ExportToIDF3 * Function ExportToIDF3

25
pcbnew/dialogs/dialog_export_vrml.cpp
View File

@ -41,6 +41,7 @@
#define OPTKEY_OUTPUT_UNIT wxT( "VrmlExportUnit" ) #define OPTKEY_OUTPUT_UNIT wxT( "VrmlExportUnit" )
#define OPTKEY_3DFILES_OPT wxT( "VrmlExportCopyFiles" ) #define OPTKEY_3DFILES_OPT wxT( "VrmlExportCopyFiles" )
#define OPTKEY_USE_RELATIVE_PATHS wxT( "VrmlUseRelativePaths" ) #define OPTKEY_USE_RELATIVE_PATHS wxT( "VrmlUseRelativePaths" )
#define OPTKEY_USE_PLAIN_PCB wxT( "VrmlUsePlainPCB" )
class DIALOG_EXPORT_3DFILE : public DIALOG_EXPORT_3DFILE_BASE class DIALOG_EXPORT_3DFILE : public DIALOG_EXPORT_3DFILE_BASE
@ -48,9 +49,10 @@ class DIALOG_EXPORT_3DFILE : public DIALOG_EXPORT_3DFILE_BASE
private: private:
PCB_EDIT_FRAME* m_parent; PCB_EDIT_FRAME* m_parent;
wxConfigBase* m_config; wxConfigBase* m_config;
int m_unitsOpt; // Remember last units option int m_unitsOpt; // Remember last units option
bool m_copy3DFilesOpt; // Remember last copy model files option bool m_copy3DFilesOpt; // Remember last copy model files option
bool m_useRelativePathsOpt; // Remember last use absolut paths option bool m_useRelativePathsOpt; // Remember last use absolut paths option
bool m_usePlainPCBOpt; // Remember last Plain Board option
public: public:
DIALOG_EXPORT_3DFILE( PCB_EDIT_FRAME* parent ) : DIALOG_EXPORT_3DFILE( PCB_EDIT_FRAME* parent ) :
@ -59,12 +61,14 @@ public:
m_parent = parent; m_parent = parent;
m_config = Kiface().KifaceSettings(); m_config = Kiface().KifaceSettings();
m_filePicker->SetFocus(); m_filePicker->SetFocus();
m_config->Read( OPTKEY_OUTPUT_UNIT, &m_unitsOpt ); m_config->Read( OPTKEY_OUTPUT_UNIT, &m_unitsOpt, 1 );
m_config->Read( OPTKEY_3DFILES_OPT, &m_copy3DFilesOpt ); m_config->Read( OPTKEY_3DFILES_OPT, &m_copy3DFilesOpt, false );
m_config->Read( OPTKEY_USE_RELATIVE_PATHS, &m_useRelativePathsOpt ); m_config->Read( OPTKEY_USE_RELATIVE_PATHS, &m_useRelativePathsOpt, false );
m_config->Read( OPTKEY_USE_PLAIN_PCB, &m_usePlainPCBOpt, false );
m_rbSelectUnits->SetSelection( m_unitsOpt ); m_rbSelectUnits->SetSelection( m_unitsOpt );
m_cbCopyFiles->SetValue( m_copy3DFilesOpt ); m_cbCopyFiles->SetValue( m_copy3DFilesOpt );
m_cbUseRelativePaths->SetValue( m_useRelativePathsOpt ); m_cbUseRelativePaths->SetValue( m_useRelativePathsOpt );
m_cbPlainPCB->SetValue( m_usePlainPCBOpt );
wxButton* okButton = (wxButton*) FindWindowByLabel( wxT( "OK" ) ); wxButton* okButton = (wxButton*) FindWindowByLabel( wxT( "OK" ) );
if( okButton ) if( okButton )
@ -84,6 +88,7 @@ public:
m_config->Write( OPTKEY_OUTPUT_UNIT, m_unitsOpt ); m_config->Write( OPTKEY_OUTPUT_UNIT, m_unitsOpt );
m_config->Write( OPTKEY_3DFILES_OPT, m_copy3DFilesOpt ); m_config->Write( OPTKEY_3DFILES_OPT, m_copy3DFilesOpt );
m_config->Write( OPTKEY_USE_RELATIVE_PATHS, m_useRelativePathsOpt ); m_config->Write( OPTKEY_USE_RELATIVE_PATHS, m_useRelativePathsOpt );
m_config->Write( OPTKEY_USE_PLAIN_PCB, m_usePlainPCBOpt );
}; };
void SetSubdir( const wxString & aDir ) void SetSubdir( const wxString & aDir )
@ -116,6 +121,11 @@ public:
return m_useRelativePathsOpt = m_cbUseRelativePaths->GetValue(); return m_useRelativePathsOpt = m_cbUseRelativePaths->GetValue();
} }
bool GetUsePlainPCBOption()
{
return m_usePlainPCBOpt = m_cbPlainPCB->GetValue();
}
void OnUpdateUseRelativePath( wxUpdateUIEvent& event ) void OnUpdateUseRelativePath( wxUpdateUIEvent& event )
{ {
// Making path relative or absolute has no meaning when VRML files are not copied. // Making path relative or absolute has no meaning when VRML files are not copied.
@ -158,6 +168,7 @@ void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event )
double scale = scaleList[dlg.GetUnits()]; // final scale export double scale = scaleList[dlg.GetUnits()]; // final scale export
bool export3DFiles = dlg.GetCopyFilesOption(); bool export3DFiles = dlg.GetCopyFilesOption();
bool useRelativePaths = dlg.GetUseRelativePathsOption(); bool useRelativePaths = dlg.GetUseRelativePathsOption();
bool usePlainPCB = dlg.GetUsePlainPCBOption();
wxString fullFilename = dlg.FilePicker()->GetPath(); wxString fullFilename = dlg.FilePicker()->GetPath();
wxFileName modelPath = fullFilename; wxFileName modelPath = fullFilename;
wxBusyCursor dummy; wxBusyCursor dummy;
@ -174,7 +185,7 @@ void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event )
} }
if( !ExportVRML_File( fullFilename, scale, export3DFiles, useRelativePaths, if( !ExportVRML_File( fullFilename, scale, export3DFiles, useRelativePaths,
modelPath.GetPath() ) ) usePlainPCB, modelPath.GetPath() ) )
{ {
wxString msg = _( "Unable to create " ) + fullFilename; wxString msg = _( "Unable to create " ) + fullFilename;
wxMessageBox( msg ); wxMessageBox( msg );

5
pcbnew/dialogs/dialog_export_vrml_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013) // C++ code generated with wxFormBuilder (version Aug 17 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -52,6 +52,9 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow
bSizer4->Add( m_cbUseRelativePaths, 0, wxALL, 5 ); bSizer4->Add( m_cbUseRelativePaths, 0, wxALL, 5 );
m_cbPlainPCB = new wxCheckBox( this, wxID_ANY, _("Plain PCB (no copper or silk)"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer4->Add( m_cbPlainPCB, 0, wxALL, 5 );
bLowerSizer->Add( bSizer4, 3, wxEXPAND, 5 ); bLowerSizer->Add( bSizer4, 3, wxEXPAND, 5 );

90
pcbnew/dialogs/dialog_export_vrml_base.fbp
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="11" /> <FileVersion major="1" minor="13" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration"></property> <property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
@ -644,6 +644,94 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Plain PCB (no copper or silk)</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_cbPlainPCB</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">

3
pcbnew/dialogs/dialog_export_vrml_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013) // C++ code generated with wxFormBuilder (version Aug 17 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -50,6 +50,7 @@ class DIALOG_EXPORT_3DFILE_BASE : public DIALOG_SHIM
wxTextCtrl* m_SubdirNameCtrl; wxTextCtrl* m_SubdirNameCtrl;
wxCheckBox* m_cbCopyFiles; wxCheckBox* m_cbCopyFiles;
wxCheckBox* m_cbUseRelativePaths; wxCheckBox* m_cbUseRelativePaths;
wxCheckBox* m_cbPlainPCB;
wxRadioBox* m_rbSelectUnits; wxRadioBox* m_rbSelectUnits;
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;

67
pcbnew/exporters/export_vrml.cpp
View File

@ -148,6 +148,8 @@ public:
VRML_LAYER bot_tin; VRML_LAYER bot_tin;
VRML_LAYER plated_holes; VRML_LAYER plated_holes;
bool plainPCB;
double scale; // board internal units to output scaling double scale; // board internal units to output scaling
double minLineWidth; // minimum width of a VRML line segment double minLineWidth; // minimum width of a VRML line segment
int precision; // precision of output units int precision; // precision of output units
@ -403,6 +405,9 @@ static void write_layers( MODEL_VRML& aModel, std::ofstream& output_file, BOARD*
write_triangle_bag( output_file, aModel.GetColor( VRML_COLOR_PCB ), write_triangle_bag( output_file, aModel.GetColor( VRML_COLOR_PCB ),
&aModel.board, false, false, brdz, -brdz, aModel.precision ); &aModel.board, false, false, brdz, -brdz, aModel.precision );
if( aModel.plainPCB )
return;
// VRML_LAYER top_copper; // VRML_LAYER top_copper;
aModel.top_copper.Tesselate( &aModel.holes ); aModel.top_copper.Tesselate( &aModel.holes );
write_triangle_bag( output_file, aModel.GetColor( VRML_COLOR_TRACK ), write_triangle_bag( output_file, aModel.GetColor( VRML_COLOR_TRACK ),
@ -791,6 +796,9 @@ static void export_round_padstack( MODEL_VRML& aModel, BOARD* pcb,
if( thru && hole > 0 ) if( thru && hole > 0 )
aModel.holes.AddCircle( x, -y, hole, true ); aModel.holes.AddCircle( x, -y, hole, true );
if( aModel.plainPCB )
return;
while( 1 ) while( 1 )
{ {
if( layer == B_Cu ) if( layer == B_Cu )
@ -846,7 +854,8 @@ static void export_vrml_tracks( MODEL_VRML& aModel, BOARD* pcb )
{ {
export_vrml_via( aModel, pcb, (const VIA*) track ); export_vrml_via( aModel, pcb, (const VIA*) track );
} }
else if( track->GetLayer() == B_Cu || track->GetLayer() == F_Cu ) else if( ( track->GetLayer() == B_Cu || track->GetLayer() == F_Cu )
&& !aModel.plainPCB )
export_vrml_line( aModel, track->GetLayer(), export_vrml_line( aModel, track->GetLayer(),
track->GetStart().x * aModel.scale, track->GetStart().x * aModel.scale,
track->GetStart().y * aModel.scale, track->GetStart().y * aModel.scale,
@ -1102,7 +1111,8 @@ static void export_vrml_pad( MODEL_VRML& aModel, BOARD* pcb, D_PAD* aPad )
{ {
bool pth = false; bool pth = false;
if( aPad->GetAttribute() != PAD_HOLE_NOT_PLATED ) if( ( aPad->GetAttribute() != PAD_HOLE_NOT_PLATED )
&& !aModel.plainPCB )
pth = true; pth = true;
if( aPad->GetDrillShape() == PAD_DRILL_OBLONG ) if( aPad->GetDrillShape() == PAD_DRILL_OBLONG )
@ -1127,6 +1137,9 @@ static void export_vrml_pad( MODEL_VRML& aModel, BOARD* pcb, D_PAD* aPad )
} }
} }
if( aModel.plainPCB )
return;
// The pad proper, on the selected layers // The pad proper, on the selected layers
LSET layer_mask = aPad->GetLayerSet(); LSET layer_mask = aPad->GetLayerSet();
@ -1188,29 +1201,32 @@ static void export_vrml_module( MODEL_VRML& aModel, BOARD* aPcb, MODULE* aModule
bool aExport3DFiles, bool aUseRelativePaths, bool aExport3DFiles, bool aUseRelativePaths,
const wxString& a3D_Subdir ) const wxString& a3D_Subdir )
{ {
// Reference and value if( !aModel.plainPCB )
if( aModule->Reference().IsVisible() )
export_vrml_text_module( &aModule->Reference() );
if( aModule->Value().IsVisible() )
export_vrml_text_module( &aModule->Value() );
// Export module edges
for( EDA_ITEM* item = aModule->GraphicalItems(); item; item = item->Next() )
{ {
switch( item->Type() ) // Reference and value
if( aModule->Reference().IsVisible() )
export_vrml_text_module( &aModule->Reference() );
if( aModule->Value().IsVisible() )
export_vrml_text_module( &aModule->Value() );
// Export module edges
for( EDA_ITEM* item = aModule->GraphicalItems(); item; item = item->Next() )
{ {
case PCB_MODULE_TEXT_T: switch( item->Type() )
export_vrml_text_module( static_cast<TEXTE_MODULE*>( item ) ); {
break; case PCB_MODULE_TEXT_T:
export_vrml_text_module( static_cast<TEXTE_MODULE*>( item ) );
break;
case PCB_MODULE_EDGE_T: case PCB_MODULE_EDGE_T:
export_vrml_edge_module( aModel, static_cast<EDGE_MODULE*>( item ), export_vrml_edge_module( aModel, static_cast<EDGE_MODULE*>( item ),
aModule->GetOrientation() ); aModule->GetOrientation() );
break; break;
default: default:
break; break;
}
} }
} }
@ -1340,13 +1356,14 @@ static void export_vrml_module( MODEL_VRML& aModel, BOARD* aPcb, MODULE* aModule
bool PCB_EDIT_FRAME::ExportVRML_File( const wxString& aFullFileName, double aMMtoWRMLunit, bool PCB_EDIT_FRAME::ExportVRML_File( const wxString& aFullFileName, double aMMtoWRMLunit,
bool aExport3DFiles, bool aUseRelativePaths, bool aExport3DFiles, bool aUseRelativePaths,
const wxString& a3D_Subdir ) bool aUsePlainPCB, const wxString& a3D_Subdir )
{ {
wxString msg; wxString msg;
BOARD* pcb = GetBoard(); BOARD* pcb = GetBoard();
bool ok = true; bool ok = true;
MODEL_VRML model3d; MODEL_VRML model3d;
model3d.plainPCB = aUsePlainPCB;
model_vrml = &model3d; model_vrml = &model3d;
std::ofstream output_file; std::ofstream output_file;
@ -1387,13 +1404,15 @@ bool PCB_EDIT_FRAME::ExportVRML_File( const wxString& aFullFileName, double aMMt
export_vrml_board( model3d, pcb ); export_vrml_board( model3d, pcb );
// Drawing and text on the board // Drawing and text on the board
export_vrml_drawings( model3d, pcb ); if( !aUsePlainPCB )
export_vrml_drawings( model3d, pcb );
// Export vias and trackage // Export vias and trackage
export_vrml_tracks( model3d, pcb ); export_vrml_tracks( model3d, pcb );
// Export zone fills // Export zone fills
export_vrml_zones( model3d, pcb); if( !aUsePlainPCB )
export_vrml_zones( model3d, pcb);
/* scaling factor to convert 3D models to board units (decimils) /* scaling factor to convert 3D models to board units (decimils)
* Usually we use Wings3D to create thems. * Usually we use Wings3D to create thems.