Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

ADDED: some individual flags for render jobs. 

Also fixes bug where error code wasn't returned.

Also fixes bug where user's preferences were being
overwritten with each job.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/20436

(cherry picked from commit d2b3f8ba28)
9.0
Jeff Young 7 months ago
parent
0619bb9179
commit
497a7983cb
8 changed files with 305 additions and 244 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      common/jobs/job_pcb_render.cpp
  2. 3
      common/jobs/job_pcb_render.h
  3. 43
      pcbnew/dialogs/dialog_render_job.cpp
  4. 3
      pcbnew/dialogs/dialog_render_job.h
  5. 107
      pcbnew/dialogs/dialog_render_job_base.cpp
  6. 252
      pcbnew/dialogs/dialog_render_job_base.fbp
  7. 11
      pcbnew/dialogs/dialog_render_job_base.h
  8. 127
      pcbnew/pcbnew_jobs_handler.cpp

3
common/jobs/job_pcb_render.cpp
View File

@ -91,6 +91,9 @@ JOB_PCB_RENDER::JOB_PCB_RENDER() :
m_params.emplace_back( new JOB_PARAM<double>( "zoom", &m_zoom, m_zoom ) );
m_params.emplace_back( new JOB_PARAM<bool>( "perspective", &m_perspective, m_perspective ) );
m_params.emplace_back( new JOB_PARAM<bool>( "floor", &m_floor, m_floor ) );
m_params.emplace_back( new JOB_PARAM<bool>( "anti_alias", &m_antiAlias, m_antiAlias ) );
m_params.emplace_back( new JOB_PARAM<bool>( "post_process", &m_postProcess, m_postProcess ) );
m_params.emplace_back( new JOB_PARAM<bool>( "procedural_textures", &m_proceduralTextures, m_proceduralTextures ) );
m_params.emplace_back( new JOB_PARAM<int>( "width", &m_width, m_width ) );
m_params.emplace_back( new JOB_PARAM<int>( "height", &m_height, m_height ) );

3
common/jobs/job_pcb_render.h
View File

@ -92,7 +92,10 @@ public:
VECTOR3D m_rotation;
VECTOR3D m_pan;
VECTOR3D m_pivot;
bool m_proceduralTextures = false;
bool m_floor = false;
bool m_antiAlias = true;
bool m_postProcess = false;
VECTOR3D m_lightTopIntensity;
VECTOR3D m_lightBottomIntensity;
VECTOR3D m_lightCameraIntensity;

43
pcbnew/dialogs/dialog_render_job.cpp
View File

@ -29,12 +29,6 @@ static std::map<JOB_PCB_RENDER::BG_STYLE, wxString> bgStyleMap = {
{ JOB_PCB_RENDER::BG_STYLE::TRANSPARENT, _HKI( "Transparent" ) }
};
static std::map<JOB_PCB_RENDER::QUALITY, wxString> qualityMap = {
{ JOB_PCB_RENDER::QUALITY::BASIC, _HKI( "Basic" ) },
{ JOB_PCB_RENDER::QUALITY::HIGH, _HKI( "High" ) },
{ JOB_PCB_RENDER::QUALITY::USER, _HKI( "User" ) }
};
static std::map<JOB_PCB_RENDER::SIDE, wxString> sideMap = {
{ JOB_PCB_RENDER::SIDE::BACK, _HKI( "Back" ) },
{ JOB_PCB_RENDER::SIDE::BOTTOM, _HKI( "Bottom" ) },
@ -55,9 +49,6 @@ DIALOG_RENDER_JOB::DIALOG_RENDER_JOB( wxWindow* aParent, JOB_PCB_RENDER* aJob )
for( const auto& [k, name] : bgStyleMap )
m_choiceBgStyle->Append( wxGetTranslation( name ) );
for( const auto& [k, name] : qualityMap )
m_choiceQuality->Append( wxGetTranslation( name ) );
for( const auto& [k, name] : sideMap )
m_choiceSide->Append( wxGetTranslation( name ) );
@ -107,27 +98,6 @@ void DIALOG_RENDER_JOB::setSelectedSide( JOB_PCB_RENDER::SIDE aSide )
}
JOB_PCB_RENDER::QUALITY DIALOG_RENDER_JOB::getSelectedQuality()
{
int selIndx = m_choiceQuality->GetSelection();
auto it = qualityMap.begin();
std::advance( it, selIndx );
return it->first;
}
void DIALOG_RENDER_JOB::setSelectedQuality( JOB_PCB_RENDER::QUALITY aQuality )
{
auto it = qualityMap.find( aQuality );
if( it != qualityMap.end() )
{
int idx = std::distance( qualityMap.begin(), it );
m_choiceQuality->SetSelection( idx );
}
}
JOB_PCB_RENDER::BG_STYLE DIALOG_RENDER_JOB::getSelectedBgStyle()
{
int selIndx = m_choiceBgStyle->GetSelection();
@ -154,11 +124,14 @@ bool DIALOG_RENDER_JOB::TransferDataFromWindow()
m_job->SetConfiguredOutputPath( m_textCtrlOutputFile->GetValue() );
m_job->m_format = getSelectedFormat();
m_job->m_quality = getSelectedQuality();
m_job->m_quality = JOB_PCB_RENDER::QUALITY::USER;
m_job->m_bgStyle = getSelectedBgStyle();
m_job->m_side = getSelectedSide();
m_job->m_zoom = m_spinCtrlZoom->GetValue();
m_job->m_floor = m_cbFloor->GetValue();
m_job->m_proceduralTextures = m_cbRaytracing_proceduralTextures->GetValue();
m_job->m_floor = m_cbRaytracing_addFloor->GetValue();
m_job->m_antiAlias = m_cbRaytracing_antiAliasing->GetValue();
m_job->m_postProcess = m_cbRaytracing_postProcessing->GetValue();
m_job->m_width = m_spinCtrlWidth->GetValue();
m_job->m_height = m_spinCtrlHeight->GetValue();
@ -195,11 +168,13 @@ bool DIALOG_RENDER_JOB::TransferDataToWindow()
setSelectedFormat( m_job->m_format );
setSelectedBgStyle( m_job->m_bgStyle );
setSelectedQuality( m_job->m_quality );
setSelectedSide( m_job->m_side );
m_spinCtrlZoom->SetValue( m_job->m_zoom );
m_radioProjection->SetSelection( m_job->m_perspective ? 0 : 1 );
m_cbFloor->SetValue( m_job->m_floor );
m_cbRaytracing_proceduralTextures->SetValue( m_job->m_proceduralTextures );
m_cbRaytracing_addFloor->SetValue( m_job->m_floor );
m_cbRaytracing_antiAliasing->SetValue( m_job->m_antiAlias );
m_cbRaytracing_postProcessing->SetValue( m_job->m_postProcess );
int width = m_job->m_width;
int height = m_job->m_height;

3
pcbnew/dialogs/dialog_render_job.h
View File

@ -37,9 +37,6 @@ public:
JOB_PCB_RENDER::SIDE getSelectedSide();
void setSelectedSide( JOB_PCB_RENDER::SIDE aSide );
JOB_PCB_RENDER::QUALITY getSelectedQuality();
void setSelectedQuality( JOB_PCB_RENDER::QUALITY aSide );
JOB_PCB_RENDER::BG_STYLE getSelectedBgStyle();
void setSelectedBgStyle( JOB_PCB_RENDER::BG_STYLE aBgStyle );

107
pcbnew/dialogs/dialog_render_job_base.cpp
View File

@ -17,22 +17,23 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
bSizerMain = new wxBoxSizer( wxVERTICAL );
wxFlexGridSizer* fgSizerTop;
fgSizerTop = new wxFlexGridSizer( 0, 2, 6, 5 );
fgSizerTop = new wxFlexGridSizer( 0, 2, 4, 5 );
fgSizerTop->AddGrowableCol( 1 );
fgSizerTop->SetFlexibleDirection( wxBOTH );
fgSizerTop->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_textOutputPath = new wxStaticText( this, wxID_ANY, _("Output file:"), wxDefaultPosition, wxDefaultSize, 0 );
m_textOutputPath->Wrap( -1 );
fgSizerTop->Add( m_textOutputPath, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
fgSizerTop->Add( m_textOutputPath, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_textCtrlOutputFile = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_textCtrlOutputFile->SetMinSize( wxSize( 350,-1 ) );
fgSizerTop->Add( m_textCtrlOutputFile, 0, 0, 5 );
fgSizerTop->Add( m_textCtrlOutputFile, 0, wxEXPAND, 5 );
m_formatLabel = new wxStaticText( this, wxID_ANY, _("Format:"), wxDefaultPosition, wxDefaultSize, 0 );
m_formatLabel->Wrap( -1 );
fgSizerTop->Add( m_formatLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
fgSizerTop->Add( m_formatLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
wxArrayString m_choiceFormatChoices;
m_choiceFormat = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceFormatChoices, 0 );
@ -41,7 +42,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_dimensionsLabel = new wxStaticText( this, wxID_ANY, _("Dimensions:"), wxDefaultPosition, wxDefaultSize, 0 );
m_dimensionsLabel->Wrap( -1 );
fgSizerTop->Add( m_dimensionsLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
fgSizerTop->Add( m_dimensionsLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxHORIZONTAL );
@ -67,34 +68,39 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
fgSizerTop->Add( bSizer3, 1, wxEXPAND, 5 );
m_qualityLabel = new wxStaticText( this, wxID_ANY, _("Quality preset:"), wxDefaultPosition, wxDefaultSize, 0 );
m_qualityLabel->Wrap( -1 );
fgSizerTop->Add( m_qualityLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
wxArrayString m_choiceQualityChoices;
m_choiceQuality = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceQualityChoices, 0 );
m_choiceQuality->SetSelection( 0 );
fgSizerTop->Add( m_choiceQuality, 0, 0, 5 );
m_backgroundStyleLabel = new wxStaticText( this, wxID_ANY, _("Background style:"), wxDefaultPosition, wxDefaultSize, 0 );
m_backgroundStyleLabel->Wrap( -1 );
fgSizerTop->Add( m_backgroundStyleLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
fgSizerTop->Add( m_backgroundStyleLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
wxArrayString m_choiceBgStyleChoices;
m_choiceBgStyle = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceBgStyleChoices, 0 );
m_choiceBgStyle->SetSelection( 0 );
fgSizerTop->Add( m_choiceBgStyle, 0, 0, 5 );
m_staticText15 = new wxStaticText( this, wxID_ANY, _("Zoom:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText15->Wrap( -1 );
fgSizerTop->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
m_spinCtrlZoom = new wxSpinCtrlDouble( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 1, 0.1 );
m_spinCtrlZoom->SetDigits( 2 );
fgSizerTop->Add( m_spinCtrlZoom, 0, 0, 5 );
bSizerMain->Add( fgSizerTop, 1, wxALL|wxEXPAND, 10 );
wxGridSizer* gSizer1;
gSizer1 = new wxGridSizer( 0, 1, 5, 0 );
m_cbRaytracing_proceduralTextures = new wxCheckBox( this, wxID_ANY, _("Procedural textures (slow)"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbRaytracing_proceduralTextures->SetValue(true);
gSizer1->Add( m_cbRaytracing_proceduralTextures, 0, wxRIGHT|wxLEFT, 5 );
m_cbRaytracing_addFloor = new wxCheckBox( this, wxID_ANY, _("Add floor (slow)"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbRaytracing_addFloor->SetValue(true);
gSizer1->Add( m_cbRaytracing_addFloor, 0, wxRIGHT|wxLEFT, 5 );
bSizerMain->Add( fgSizerTop, 1, wxALL|wxEXPAND, 5 );
m_cbRaytracing_antiAliasing = new wxCheckBox( this, wxID_ANY, _("Anti-aliasing (slow)"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbRaytracing_antiAliasing->SetValue(true);
gSizer1->Add( m_cbRaytracing_antiAliasing, 0, wxRIGHT|wxLEFT, 5 );
m_cbRaytracing_postProcessing = new wxCheckBox( this, wxID_ANY, _("Screen space ambient occlusions and global illumination reflections (slow)"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbRaytracing_postProcessing->SetValue(true);
gSizer1->Add( m_cbRaytracing_postProcessing, 0, wxRIGHT|wxLEFT, 5 );
bSizerMain->Add( gSizer1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
wxBoxSizer* bSizerViewProjection;
bSizerViewProjection = new wxBoxSizer( wxHORIZONTAL );
@ -116,11 +122,16 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_choiceSide->SetSelection( 0 );
gbSizer1->Add( m_choiceSide, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), 0, 5 );
m_cbFloor = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Add floor"), wxDefaultPosition, wxDefaultSize, 0 );
gbSizer1->Add( m_cbFloor, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), 0, 5 );
m_zoomLabel = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Zoom:"), wxDefaultPosition, wxDefaultSize, 0 );
m_zoomLabel->Wrap( -1 );
gbSizer1->Add( m_zoomLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_spinCtrlZoom = new wxSpinCtrlDouble( sbSizer1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 1, 0.1 );
m_spinCtrlZoom->SetDigits( 2 );
gbSizer1->Add( m_spinCtrlZoom, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
sbSizer1->Add( gbSizer1, 1, wxALL|wxEXPAND, 5 );
sbSizer1->Add( gbSizer1, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bSizerViewProjection->Add( sbSizer1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@ -132,7 +143,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
bSizerViewProjection->Add( m_radioProjection, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bSizerMain->Add( bSizerViewProjection, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
bSizerMain->Add( bSizerViewProjection, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
wxStaticBoxSizer* sbSizerPositioning;
sbSizerPositioning = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Positioning") ), wxVERTICAL );
@ -162,7 +173,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_labelxx = new wxStaticText( sbSizerPositioning->GetStaticBox(), wxID_ANY, _("Pivot:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelxx->Wrap( -1 );
fgSizer2->Add( m_labelxx, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
fgSizer2->Add( m_labelxx, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_spinCtrlPivotX = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlPivotX->SetDigits( 3 );
@ -170,11 +181,11 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_spinCtrlPivotY = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlPivotY->SetDigits( 3 );
fgSizer2->Add( m_spinCtrlPivotY, 0, wxALIGN_CENTER_VERTICAL, 5 );
fgSizer2->Add( m_spinCtrlPivotY, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_spinCtrlPivotZ = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlPivotZ->SetDigits( 3 );
fgSizer2->Add( m_spinCtrlPivotZ, 0, wxALIGN_CENTER_VERTICAL, 5 );
fgSizer2->Add( m_spinCtrlPivotZ, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_labelMM1 = new wxStaticText( sbSizerPositioning->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelMM1->Wrap( -1 );
@ -182,7 +193,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_labelxx2 = new wxStaticText( sbSizerPositioning->GetStaticBox(), wxID_ANY, _("Pan:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelxx2->Wrap( -1 );
fgSizer2->Add( m_labelxx2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
fgSizer2->Add( m_labelxx2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_spinCtrlPanX = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlPanX->SetDigits( 3 );
@ -190,11 +201,11 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_spinCtrlPanY = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlPanY->SetDigits( 3 );
fgSizer2->Add( m_spinCtrlPanY, 0, wxALIGN_CENTER_VERTICAL, 5 );
fgSizer2->Add( m_spinCtrlPanY, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_spinCtrlPanZ = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlPanZ->SetDigits( 3 );
fgSizer2->Add( m_spinCtrlPanZ, 0, wxALIGN_CENTER_VERTICAL, 5 );
fgSizer2->Add( m_spinCtrlPanZ, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_labelMM2 = new wxStaticText( sbSizerPositioning->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelMM2->Wrap( -1 );
@ -202,7 +213,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_labelxx21 = new wxStaticText( sbSizerPositioning->GetStaticBox(), wxID_ANY, _("Rotation:"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelxx21->Wrap( -1 );
fgSizer2->Add( m_labelxx21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
fgSizer2->Add( m_labelxx21, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_spinCtrlRotX = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlRotX->SetDigits( 3 );
@ -210,27 +221,27 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_spinCtrlRotY = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlRotY->SetDigits( 3 );
fgSizer2->Add( m_spinCtrlRotY, 0, wxALIGN_CENTER_VERTICAL, 5 );
fgSizer2->Add( m_spinCtrlRotY, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_spinCtrlRotZ = new wxSpinCtrlDouble( sbSizerPositioning->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0, 1 );
m_spinCtrlRotZ->SetDigits( 3 );
fgSizer2->Add( m_spinCtrlRotZ, 0, wxALIGN_CENTER_VERTICAL, 5 );
fgSizer2->Add( m_spinCtrlRotZ, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_labelDeg1 = new wxStaticText( sbSizerPositioning->GetStaticBox(), wxID_ANY, _("°"), wxDefaultPosition, wxDefaultSize, 0 );
m_labelDeg1->Wrap( -1 );
fgSizer2->Add( m_labelDeg1, 0, wxALIGN_CENTER_VERTICAL, 5 );
sbSizerPositioning->Add( fgSizer2, 1, wxALL|wxEXPAND, 5 );
sbSizerPositioning->Add( fgSizer2, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bSizerMain->Add( sbSizerPositioning, 0, wxALL|wxEXPAND, 5 );
bSizerMain->Add( sbSizerPositioning, 0, wxALL|wxEXPAND, 10 );
wxBoxSizer* bSizerLights;
bSizerLights = new wxBoxSizer( wxHORIZONTAL );
wxStaticBoxSizer* sbSizerLightsIntensity;
sbSizerLightsIntensity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Lights intensity") ), wxVERTICAL );
sbSizerLightsIntensity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Lights Intensity") ), wxVERTICAL );
wxGridBagSizer* gbSizer11;
gbSizer11 = new wxGridBagSizer( 5, 5 );
@ -239,7 +250,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_TopLabel = new wxStaticText( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, _("Top:"), wxDefaultPosition, wxDefaultSize, 0 );
m_TopLabel->Wrap( -1 );
gbSizer11->Add( m_TopLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
gbSizer11->Add( m_TopLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_spinCtrlLightsTop = new wxSpinCtrlDouble( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1, 0, 0.1 );
m_spinCtrlLightsTop->SetDigits( 2 );
@ -247,7 +258,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_bottomLabel = new wxStaticText( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, _("Bottom:"), wxDefaultPosition, wxDefaultSize, 0 );
m_bottomLabel->Wrap( -1 );
gbSizer11->Add( m_bottomLabel, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
gbSizer11->Add( m_bottomLabel, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
m_spinCtrlLightsBottom = new wxSpinCtrlDouble( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1, 0, 0.1 );
m_spinCtrlLightsBottom->SetDigits( 2 );
@ -255,7 +266,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_sidesLabel = new wxStaticText( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, _("Side:"), wxDefaultPosition, wxDefaultSize, 0 );
m_sidesLabel->Wrap( -1 );
gbSizer11->Add( m_sidesLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
gbSizer11->Add( m_sidesLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_spinCtrlLightsSides = new wxSpinCtrlDouble( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1, 0.5, 0.1 );
m_spinCtrlLightsSides->SetDigits( 2 );
@ -263,7 +274,7 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
m_cameraLabel = new wxStaticText( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, _("Camera:"), wxDefaultPosition, wxDefaultSize, 0 );
m_cameraLabel->Wrap( -1 );
gbSizer11->Add( m_cameraLabel, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
gbSizer11->Add( m_cameraLabel, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
m_spinCtrlLightsCamera = new wxSpinCtrlDouble( sbSizerLightsIntensity->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1, 0, 0.1 );
m_spinCtrlLightsCamera->SetDigits( 2 );
@ -273,13 +284,13 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
gbSizer11->AddGrowableCol( 1 );
gbSizer11->AddGrowableCol( 3 );
sbSizerLightsIntensity->Add( gbSizer11, 1, wxALL|wxEXPAND, 5 );
sbSizerLightsIntensity->Add( gbSizer11, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bSizerLights->Add( sbSizerLightsIntensity, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
wxStaticBoxSizer* sbSizerLightsPosition;
sbSizerLightsPosition = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Lights position") ), wxVERTICAL );
sbSizerLightsPosition = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Lights Position") ), wxVERTICAL );
wxFlexGridSizer* fgSizer3;
fgSizer3 = new wxFlexGridSizer( 0, 3, 5, 5 );
@ -299,13 +310,13 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
fgSizer3->Add( m_labelDegrees, 0, wxALIGN_CENTER_VERTICAL, 5 );
sbSizerLightsPosition->Add( fgSizer3, 1, wxALL|wxEXPAND, 5 );
sbSizerLightsPosition->Add( fgSizer3, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bSizerLights->Add( sbSizerLightsPosition, 1, wxEXPAND, 5 );
bSizerLights->Add( sbSizerLightsPosition, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bSizerMain->Add( bSizerLights, 0, wxEXPAND, 5 );
bSizerMain->Add( bSizerLights, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK );
@ -325,7 +336,6 @@ DIALOG_RENDER_JOB_BASE::DIALOG_RENDER_JOB_BASE( wxWindow* parent, wxWindowID id,
// Connect Events
m_choiceFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );
m_choiceQuality->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );
m_choiceBgStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );
m_choiceSide->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );
}
@ -334,7 +344,6 @@ DIALOG_RENDER_JOB_BASE::~DIALOG_RENDER_JOB_BASE()
{
// Disconnect Events
m_choiceFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );
m_choiceQuality->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );
m_choiceBgStyle->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );
m_choiceSide->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_RENDER_JOB_BASE::OnFormatChoice ), NULL, this );

252
pcbnew/dialogs/dialog_render_job_base.fbp
View File

@ -65,13 +65,13 @@
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="border">10</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="false">
<object class="wxFlexGridSizer" expanded="true">
<property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablecols">1</property>
<property name="growablerows"></property>
<property name="hgap">5</property>
<property name="minimum_size"></property>
@ -79,10 +79,10 @@
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
<property name="rows">0</property>
<property name="vgap">6</property>
<property name="vgap">4</property>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -144,7 +144,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag"></property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="false">
<property name="BottomDockable">1</property>
@ -209,7 +209,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -337,7 +337,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -722,7 +722,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -753,7 +753,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Quality preset:</property>
<property name="label">Background style:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -762,7 +762,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_qualityLabel</property>
<property name="name">m_backgroundStyleLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -823,7 +823,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_choiceQuality</property>
<property name="name">m_choiceBgStyle</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -848,11 +848,25 @@
<event name="OnChoice">OnFormatChoice</event>
</object>
</object>
<object class="sizeritem" expanded="false">
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">10</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxGridSizer" expanded="true">
<property name="cols">1</property>
<property name="hgap">0</property>
<property name="minimum_size"></property>
<property name="name">gSizer1</property>
<property name="permission">none</property>
<property name="rows">0</property>
<property name="vgap">5</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<object class="wxCheckBox" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -866,6 +880,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">1</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
@ -881,8 +896,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Background style:</property>
<property name="markup">0</property>
<property name="label">Procedural textures (slow)</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -890,7 +904,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_backgroundStyleLabel</property>
<property name="name">m_cbRaytracing_proceduralTextures</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -901,20 +915,23 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</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>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag"></property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxChoice" expanded="false">
<object class="wxCheckBox" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -928,7 +945,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices"></property>
<property name="checked">1</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
@ -944,6 +961,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Add floor (slow)</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -951,7 +969,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_choiceBgStyle</property>
<property name="name">m_cbRaytracing_addFloor</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -959,11 +977,10 @@
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selection">0</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -973,14 +990,13 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChoice">OnFormatChoice</event>
</object>
</object>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<object class="wxCheckBox" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -994,6 +1010,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">1</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
@ -1009,8 +1026,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Zoom:</property>
<property name="markup">0</property>
<property name="label">Anti-aliasing (slow)</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -1018,7 +1034,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText15</property>
<property name="name">m_cbRaytracing_antiAliasing</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -1029,20 +1045,23 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</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>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag"></property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="false">
<object class="wxCheckBox" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1056,11 +1075,11 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">1</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="digits">2</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
@ -1072,18 +1091,15 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="inc">0.1</property>
<property name="initial">1</property>
<property name="max">100</property>
<property name="label">Screen space ambient occlusions and global illumination reflections (slow)</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min">0</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_spinCtrlZoom</property>
<property name="name">m_cbRaytracing_postProcessing</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -1093,11 +1109,14 @@
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxSP_ARROW_KEYS</property>
<property name="subclass">; ; forward_declare</property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="value"></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>
@ -1107,7 +1126,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="false">
<property name="minimum_size"></property>
@ -1128,7 +1147,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxGridBagSizer" expanded="false">
<property name="empty_cell_size"></property>
@ -1275,14 +1294,14 @@
<event name="OnChoice">OnFormatChoice</event>
</object>
</object>
<object class="gbsizeritem" expanded="false">
<object class="gbsizeritem" expanded="true">
<property name="border">5</property>
<property name="colspan">2</property>
<property name="colspan">1</property>
<property name="column">0</property>
<property name="flag"></property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
<property name="row">1</property>
<property name="rowspan">1</property>
<object class="wxCheckBox" expanded="false">
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1296,7 +1315,6 @@
<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>
@ -1312,7 +1330,8 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Add floor</property>
<property name="label">Zoom:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -1320,7 +1339,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_cbFloor</property>
<property name="name">m_zoomLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
@ -1334,10 +1353,75 @@
<property name="subclass">; ; forward_declare</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>
<property name="wrap">-1</property>
</object>
</object>
<object class="gbsizeritem" expanded="true">
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">1</property>
<property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
<property name="row">1</property>
<property name="rowspan">1</property>
<object class="wxSpinCtrlDouble" expanded="false">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer">0</property>
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</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="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="digits">2</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="drag_accept_files">0</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="inc">0.1</property>
<property name="initial">1</property>
<property name="max">100</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min">0</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_spinCtrlZoom</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">wxSP_ARROW_KEYS</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@ -1417,7 +1501,7 @@
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="border">10</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="false">
@ -1430,7 +1514,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="false">
<property name="cols">5</property>
@ -1652,7 +1736,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -1779,7 +1863,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="false">
<property name="BottomDockable">1</property>
@ -1844,7 +1928,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="false">
<property name="BottomDockable">1</property>
@ -1971,7 +2055,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -2098,7 +2182,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="false">
<property name="BottomDockable">1</property>
@ -2163,7 +2247,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="false">
<property name="BottomDockable">1</property>
@ -2290,7 +2374,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -2417,7 +2501,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="false">
<property name="BottomDockable">1</property>
@ -2482,7 +2566,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="false">
<property name="BottomDockable">1</property>
@ -2613,7 +2697,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
@ -2626,7 +2710,7 @@
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="true">
<property name="id">wxID_ANY</property>
<property name="label">Lights intensity</property>
<property name="label">Lights Intensity</property>
<property name="minimum_size"></property>
<property name="name">sbSizerLightsIntensity</property>
<property name="orient">wxVERTICAL</property>
@ -2634,7 +2718,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxGridBagSizer" expanded="true">
<property name="empty_cell_size"></property>
@ -2651,7 +2735,7 @@
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="row">0</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="true">
@ -2781,10 +2865,10 @@
</object>
</object>
<object class="gbsizeritem" expanded="true">
<property name="border">5</property>
<property name="border">10</property>
<property name="colspan">1</property>
<property name="column">2</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="row">0</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="true">
@ -2917,7 +3001,7 @@
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<property name="row">1</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="true">
@ -3047,10 +3131,10 @@
</object>
</object>
<object class="gbsizeritem" expanded="true">
<property name="border">5</property>
<property name="border">10</property>
<property name="colspan">1</property>
<property name="column">2</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="row">1</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="true">
@ -3185,11 +3269,11 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="true">
<property name="id">wxID_ANY</property>
<property name="label">Lights position</property>
<property name="label">Lights Position</property>
<property name="minimum_size"></property>
<property name="name">sbSizerLightsPosition</property>
<property name="orient">wxVERTICAL</property>
@ -3197,7 +3281,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="true">
<property name="cols">3</property>

11
pcbnew/dialogs/dialog_render_job_base.h
View File

@ -48,15 +48,16 @@ class DIALOG_RENDER_JOB_BASE : public DIALOG_SHIM
wxStaticText* m_staticText19;
wxSpinCtrl* m_spinCtrlHeight;
wxStaticText* m_staticText182;
wxStaticText* m_qualityLabel;
wxChoice* m_choiceQuality;
wxStaticText* m_backgroundStyleLabel;
wxChoice* m_choiceBgStyle;
wxStaticText* m_staticText15;
wxSpinCtrlDouble* m_spinCtrlZoom;
wxCheckBox* m_cbRaytracing_proceduralTextures;
wxCheckBox* m_cbRaytracing_addFloor;
wxCheckBox* m_cbRaytracing_antiAliasing;
wxCheckBox* m_cbRaytracing_postProcessing;
wxStaticText* m_sideLabel;
wxChoice* m_choiceSide;
wxCheckBox* m_cbFloor;
wxStaticText* m_zoomLabel;
wxSpinCtrlDouble* m_spinCtrlZoom;
wxRadioBox* m_radioProjection;
wxStaticText* m_labelX;
wxStaticText* m_labelY;

127
pcbnew/pcbnew_jobs_handler.cpp
View File

@ -493,24 +493,12 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
switch( aStepJob->m_format )
{
case JOB_EXPORT_PCB_3D::FORMAT::STEP:
params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STEP;
break;
case JOB_EXPORT_PCB_3D::FORMAT::BREP:
params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::BREP;
break;
case JOB_EXPORT_PCB_3D::FORMAT::XAO:
params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::XAO;
break;
case JOB_EXPORT_PCB_3D::FORMAT::GLB:
params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::GLB;
break;
case JOB_EXPORT_PCB_3D::FORMAT::PLY:
params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::PLY;
break;
case JOB_EXPORT_PCB_3D::FORMAT::STL:
params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STL;
break;
case JOB_EXPORT_PCB_3D::FORMAT::STEP: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STEP; break;
case JOB_EXPORT_PCB_3D::FORMAT::BREP: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::BREP; break;
case JOB_EXPORT_PCB_3D::FORMAT::XAO: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::XAO; break;
case JOB_EXPORT_PCB_3D::FORMAT::GLB: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::GLB; break;
case JOB_EXPORT_PCB_3D::FORMAT::PLY: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::PLY; break;
case JOB_EXPORT_PCB_3D::FORMAT::STL: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STL; break;
default:
m_reporter->Report( _( "Unknown export format" ), RPT_SEVERITY_ERROR );
return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here
@ -586,81 +574,87 @@ int PCBNEW_JOBS_HANDLER::JobExportRender( JOB* aJob )
boardAdapter.m_IsBoardView = false;
boardAdapter.m_IsPreviewer = true; // Force display 3D models, regardless of 3D viewer options
SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager();
EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager();
EDA_3D_VIEWER_SETTINGS cfg;
if( EDA_3D_VIEWER_SETTINGS* userCfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" ) )
{
cfg.m_Render = userCfg->m_Render;
cfg.m_Camera = userCfg->m_Camera;
}
if( aRenderJob->m_quality == JOB_PCB_RENDER::QUALITY::BASIC )
{
// Silkscreen is pixelated without antialiasing
cfg->m_Render.raytrace_anti_aliasing = true;
cfg.m_Render.raytrace_anti_aliasing = true;
cfg->m_Render.raytrace_backfloor = false;
cfg->m_Render.raytrace_post_processing = false;
cfg.m_Render.raytrace_backfloor = aRenderJob->m_floor;
cfg.m_Render.raytrace_post_processing = aRenderJob->m_floor;
cfg->m_Render.raytrace_procedural_textures = false;
cfg->m_Render.raytrace_reflections = false;
cfg->m_Render.raytrace_shadows = false;
cfg.m_Render.raytrace_procedural_textures = false;
cfg.m_Render.raytrace_reflections = false;
cfg.m_Render.raytrace_shadows = aRenderJob->m_floor;
// Better colors
cfg->m_Render.differentiate_plated_copper = true;
cfg.m_Render.differentiate_plated_copper = true;
// Tracks below soldermask are not visible without refractions
cfg->m_Render.raytrace_refractions = true;
cfg->m_Render.raytrace_recursivelevel_refractions = 1;
cfg.m_Render.raytrace_refractions = true;
cfg.m_Render.raytrace_recursivelevel_refractions = 1;
}
else if( aRenderJob->m_quality == JOB_PCB_RENDER::QUALITY::HIGH )
{
cfg->m_Render.raytrace_anti_aliasing = true;
cfg->m_Render.raytrace_backfloor = true;
cfg->m_Render.raytrace_post_processing = true;
cfg->m_Render.raytrace_procedural_textures = true;
cfg->m_Render.raytrace_reflections = true;
cfg->m_Render.raytrace_shadows = true;
cfg->m_Render.raytrace_refractions = true;
cfg->m_Render.differentiate_plated_copper = true;
cfg.m_Render.raytrace_anti_aliasing = true;
cfg.m_Render.raytrace_backfloor = true;
cfg.m_Render.raytrace_post_processing = true;
cfg.m_Render.raytrace_procedural_textures = true;
cfg.m_Render.raytrace_reflections = true;
cfg.m_Render.raytrace_shadows = true;
cfg.m_Render.raytrace_refractions = true;
cfg.m_Render.differentiate_plated_copper = true;
}
if( aRenderJob->m_floor )
else
{
cfg->m_Render.raytrace_backfloor = true;
cfg->m_Render.raytrace_shadows = true;
cfg->m_Render.raytrace_post_processing = true;
cfg.m_Render.raytrace_anti_aliasing = aRenderJob->m_antiAlias;
cfg.m_Render.raytrace_backfloor = aRenderJob->m_floor;
cfg.m_Render.raytrace_post_processing = aRenderJob->m_postProcess;
cfg.m_Render.raytrace_procedural_textures = aRenderJob->m_proceduralTextures;
}
cfg->m_Render.raytrace_lightColorTop = COLOR4D(aRenderJob->m_lightTopIntensity.x,
cfg.m_Render.raytrace_lightColorTop = COLOR4D( aRenderJob->m_lightTopIntensity.x,
aRenderJob->m_lightTopIntensity.y,
aRenderJob->m_lightTopIntensity.z, 1.0);
aRenderJob->m_lightTopIntensity.z, 1.0 );
cfg->m_Render.raytrace_lightColorBottom = COLOR4D(aRenderJob->m_lightBottomIntensity.x,
cfg.m_Render.raytrace_lightColorBottom = COLOR4D( aRenderJob->m_lightBottomIntensity.x,
aRenderJob->m_lightBottomIntensity.y,
aRenderJob->m_lightBottomIntensity.z, 1.0);
aRenderJob->m_lightBottomIntensity.z, 1.0 );
cfg->m_Render.raytrace_lightColorCamera = COLOR4D( aRenderJob->m_lightCameraIntensity.x,
aRenderJob->m_lightCameraIntensity.y,
aRenderJob->m_lightCameraIntensity.z, 1.0 );
cfg.m_Render.raytrace_lightColorCamera = COLOR4D( aRenderJob->m_lightCameraIntensity.x,
aRenderJob->m_lightCameraIntensity.y,
aRenderJob->m_lightCameraIntensity.z, 1.0 );
COLOR4D lightColor( aRenderJob->m_lightSideIntensity.x,
aRenderJob->m_lightSideIntensity.y,
aRenderJob->m_lightSideIntensity.z, 1.0 );
cfg->m_Render.raytrace_lightColor = {
cfg.m_Render.raytrace_lightColor = {
lightColor, lightColor, lightColor, lightColor,
lightColor, lightColor, lightColor, lightColor,
};
int sideElevation = aRenderJob->m_lightSideElevation;
cfg->m_Render.raytrace_lightElevation = {
cfg.m_Render.raytrace_lightElevation = {
sideElevation, sideElevation, sideElevation, sideElevation,
-sideElevation, -sideElevation, -sideElevation, -sideElevation,
};
cfg->m_Render.raytrace_lightAzimuth = {
cfg.m_Render.raytrace_lightAzimuth = {
45, 135, 225, 315, 45, 135, 225, 315,
};
cfg->m_CurrentPreset = aRenderJob->m_colorPreset;
boardAdapter.m_Cfg = cfg;
cfg.m_CurrentPreset = aRenderJob->m_colorPreset;
boardAdapter.m_Cfg = &cfg;
if( aRenderJob->m_bgStyle == JOB_PCB_RENDER::BG_STYLE::TRANSPARENT
|| ( aRenderJob->m_bgStyle == JOB_PCB_RENDER::BG_STYLE::DEFAULT
@ -702,13 +696,11 @@ int PCBNEW_JOBS_HANDLER::JobExportRender( JOB* aJob )
// First redraw resets lookat point to the board center, so set up the camera here
camera.ViewCommand_T1( s_viewCmdMap[aRenderJob->m_side] );
camera.SetLookAtPos_T1(
camera.GetLookAtPos_T1()
+ SFVEC3F( aRenderJob->m_pivot.x, aRenderJob->m_pivot.y, aRenderJob->m_pivot.z )
* cmTo3D );
camera.SetLookAtPos_T1( camera.GetLookAtPos_T1() + SFVEC3F( aRenderJob->m_pivot.x,
aRenderJob->m_pivot.y,
aRenderJob->m_pivot.z ) * cmTo3D );
camera.Pan_T1(
SFVEC3F( aRenderJob->m_pan.x, aRenderJob->m_pan.y, aRenderJob->m_pan.z ) );
camera.Pan_T1( SFVEC3F( aRenderJob->m_pan.x, aRenderJob->m_pan.y, aRenderJob->m_pan.z ) );
camera.Zoom_T1( aRenderJob->m_zoom );
@ -758,23 +750,20 @@ int PCBNEW_JOBS_HANDLER::JobExportRender( JOB* aJob )
image = image.Mirror( false );
image.SetOption( wxIMAGE_OPTION_QUALITY, 90 );
image.SaveFile( outPath,
aRenderJob->m_format == JOB_PCB_RENDER::FORMAT::PNG ? wxBITMAP_TYPE_PNG
: wxBITMAP_TYPE_JPEG );
image.SaveFile( outPath, aRenderJob->m_format == JOB_PCB_RENDER::FORMAT::PNG ? wxBITMAP_TYPE_PNG
: wxBITMAP_TYPE_JPEG );
}
if( success )
{
m_reporter->Report( _( "Successfully created 3D render image" ) + wxS( "\n" ),
RPT_SEVERITY_INFO );
m_reporter->Report( _( "Successfully created 3D render image" ) + wxS( "\n" ), RPT_SEVERITY_INFO );
return CLI::EXIT_CODES::OK;
}
else
{
m_reporter->Report( _( "Error creating 3D render image" ) + wxS( "\n" ),
RPT_SEVERITY_ERROR );
m_reporter->Report( _( "Error creating 3D render image" ) + wxS( "\n" ), RPT_SEVERITY_ERROR );
return CLI::EXIT_CODES::ERR_UNKNOWN;
}
return CLI::EXIT_CODES::OK;
}

Write Preview
Loading…
Cancel
Save