3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

png export parameters routed to SLA print config. PngExportDialog disabled.

Browse Source
This commit is contained in:
tamasmeszaros 2018-08-28 14:55:40 +02:00
parent 057dfa56e3
commit 4796ef3fb2
3 changed files with 138 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
xs/src/slic3r/AppController.cpp
View File

@ -214,6 +214,35 @@ void PrintController::gen_support_material(PrintObject *pobj)
} }
} }
PrintController::PngExportData
PrintController::query_png_export_data(const DynamicPrintConfig& conf)
{
PngExportData ret;
auto zippath = query_destination_path("Output zip file", "*.zip", "out");
ret.zippath = zippath;
ret.width_mm = conf.opt_float("display_width");
ret.height_mm = conf.opt_float("display_height");
ret.width_px = conf.opt_int("display_pixels_x");
ret.height_px = conf.opt_int("display_pixels_y");
auto opt_corr = conf.opt<ConfigOptionFloats>("printer_correction");
if(opt_corr) {
ret.corr_x = opt_corr->values[0];
ret.corr_y = opt_corr->values[1];
ret.corr_z = opt_corr->values[2];
}
ret.exp_time_first_s = conf.opt_float("initial_exposure_time");
ret.exp_time_s = conf.opt_float("exposure_time");
return ret;
}
void PrintController::slice(AppControllerBoilerplate::ProgresIndicatorPtr pri) void PrintController::slice(AppControllerBoilerplate::ProgresIndicatorPtr pri)
{ {
auto st = pri->state(); auto st = pri->state();
@ -262,18 +291,23 @@ void PrintController::slice_to_png()
{ {
using Pointf3 = Vec3d; using Pointf3 = Vec3d;
auto exd = query_png_export_data();
if(exd.zippath.empty()) return;
auto presetbundle = GUI::get_preset_bundle(); auto presetbundle = GUI::get_preset_bundle();
assert(presetbundle); assert(presetbundle);
auto conf = presetbundle->full_config(); auto pt = presetbundle->printers.get_selected_preset().printer_technology();
if(pt != ptSLA) {
report_issue(IssueType::ERR, _("Printer technology is not SLA!"),
_("Error"));
return;
}
auto conf = presetbundle->full_config();
conf.validate(); conf.validate();
auto exd = query_png_export_data(conf);
if(exd.zippath.empty()) return;
try { try {
print_->apply_config(conf); print_->apply_config(conf);
print_->validate(); print_->validate();

2
xs/src/slic3r/AppController.hpp
View File

@ -190,7 +190,7 @@ protected:
}; };
// Should display a dialog with the input fields for printing to png // Should display a dialog with the input fields for printing to png
PngExportData query_png_export_data(); PngExportData query_png_export_data(const DynamicPrintConfig&);
// The previous export data, to pre-populate the dialog // The previous export data, to pre-populate the dialog
PngExportData prev_expdata_; PngExportData prev_expdata_;

196
xs/src/slic3r/AppControllerWx.cpp
View File

@ -309,120 +309,120 @@ void AppController::set_global_progress_indicator(
} }
} }
PrintController::PngExportData PrintController::query_png_export_data() //PrintController::PngExportData PrintController::collect_png_export_data()
{ //{
// Implement the logic of the PngExportDialog // // Implement the logic of the PngExportDialog
class PngExportView: public PngExportDialog { // class PngExportView: public PngExportDialog {
double ratio_, bs_ratio_; // double ratio_, bs_ratio_;
PrintController& ctl_; // PrintController& ctl_;
public: // public:
PngExportView(PrintController& ctl): // PngExportView(PrintController& ctl):
PngExportDialog(wxTheApp->GetTopWindow()), ctl_(ctl) // PngExportDialog(wxTheApp->GetTopWindow()), ctl_(ctl)
{ // {
ratio_ = double(spin_reso_width_->GetValue()) / // ratio_ = double(spin_reso_width_->GetValue()) /
spin_reso_height_->GetValue(); // spin_reso_height_->GetValue();
bs_ratio_ = bed_width_spin_->GetValue() / // bs_ratio_ = bed_width_spin_->GetValue() /
bed_height_spin_->GetValue(); // bed_height_spin_->GetValue();
} // }
PngExportData export_data() const { // PngExportData export_data() const {
PrintController::PngExportData ret; // PrintController::PngExportData ret;
ret.zippath = filepick_ctl_->GetPath(); // ret.zippath = filepick_ctl_->GetPath();
ret.width_px = spin_reso_width_->GetValue(); // ret.width_px = spin_reso_width_->GetValue();
ret.height_px = spin_reso_height_->GetValue(); // ret.height_px = spin_reso_height_->GetValue();
ret.width_mm = bed_width_spin_->GetValue(); // ret.width_mm = bed_width_spin_->GetValue();
ret.height_mm = bed_height_spin_->GetValue(); // ret.height_mm = bed_height_spin_->GetValue();
ret.exp_time_s = exptime_spin_->GetValue(); // ret.exp_time_s = exptime_spin_->GetValue();
ret.exp_time_first_s = exptime_first_spin_->GetValue(); // ret.exp_time_first_s = exptime_first_spin_->GetValue();
ret.corr_x = corr_spin_x_->GetValue(); // ret.corr_x = corr_spin_x_->GetValue();
ret.corr_y = corr_spin_y_->GetValue(); // ret.corr_y = corr_spin_y_->GetValue();
ret.corr_z = corr_spin_z_->GetValue(); // ret.corr_z = corr_spin_z_->GetValue();
return ret; // return ret;
} // }
void prefill(const PngExportData& data) { // void prefill(const PngExportData& data) {
filepick_ctl_->SetPath(data.zippath); // filepick_ctl_->SetPath(data.zippath);
spin_reso_width_->SetValue(data.width_px); // spin_reso_width_->SetValue(data.width_px);
spin_reso_height_->SetValue(data.height_px); // spin_reso_height_->SetValue(data.height_px);
bed_width_spin_->SetValue(data.width_mm); // bed_width_spin_->SetValue(data.width_mm);
bed_height_spin_->SetValue(data.height_mm); // bed_height_spin_->SetValue(data.height_mm);
exptime_spin_->SetValue(data.exp_time_s); // exptime_spin_->SetValue(data.exp_time_s);
exptime_first_spin_->SetValue(data.exp_time_first_s); // exptime_first_spin_->SetValue(data.exp_time_first_s);
corr_spin_x_->SetValue(data.corr_x); // corr_spin_x_->SetValue(data.corr_x);
corr_spin_y_->SetValue(data.corr_y); // corr_spin_y_->SetValue(data.corr_y);
corr_spin_z_->SetValue(data.corr_z); // corr_spin_z_->SetValue(data.corr_z);
if(data.zippath.empty()) export_btn_->Disable(); // if(data.zippath.empty()) export_btn_->Disable();
else export_btn_->Enable(); // else export_btn_->Enable();
} // }
virtual void ResoLock( wxCommandEvent& /*event*/ ) override { // virtual void ResoLock( wxCommandEvent& /*event*/ ) override {
ratio_ = double(spin_reso_width_->GetValue()) / // ratio_ = double(spin_reso_width_->GetValue()) /
double(spin_reso_height_->GetValue()); // double(spin_reso_height_->GetValue());
} // }
virtual void BedsizeLock( wxCommandEvent& /*event*/ ) override { // virtual void BedsizeLock( wxCommandEvent& /*event*/ ) override {
bs_ratio_ = bed_width_spin_->GetValue() / // bs_ratio_ = bed_width_spin_->GetValue() /
bed_height_spin_->GetValue(); // bed_height_spin_->GetValue();
} // }
virtual void EvalResoSpin( wxCommandEvent& event ) override { // virtual void EvalResoSpin( wxCommandEvent& event ) override {
if(reso_lock_btn_->GetValue()) { // if(reso_lock_btn_->GetValue()) {
if(event.GetId() == spin_reso_width_->GetId()) { // if(event.GetId() == spin_reso_width_->GetId()) {
spin_reso_height_->SetValue( // spin_reso_height_->SetValue(
std::round(spin_reso_width_->GetValue()/ratio_)); // std::round(spin_reso_width_->GetValue()/ratio_));
spin_reso_height_->Update(); // spin_reso_height_->Update();
} else { // } else {
spin_reso_width_->SetValue( // spin_reso_width_->SetValue(
std::round(spin_reso_height_->GetValue()*ratio_)); // std::round(spin_reso_height_->GetValue()*ratio_));
spin_reso_width_->Update(); // spin_reso_width_->Update();
} // }
} // }
} // }
virtual void EvalBedSpin( wxCommandEvent& event ) override { // virtual void EvalBedSpin( wxCommandEvent& event ) override {
if(bedsize_lock_btn_->GetValue()) { // if(bedsize_lock_btn_->GetValue()) {
if(event.GetId() == bed_width_spin_->GetId()) { // if(event.GetId() == bed_width_spin_->GetId()) {
bed_height_spin_->SetValue( // bed_height_spin_->SetValue(
std::round(bed_width_spin_->GetValue()/bs_ratio_)); // std::round(bed_width_spin_->GetValue()/bs_ratio_));
bed_height_spin_->Update(); // bed_height_spin_->Update();
} else { // } else {
bed_width_spin_->SetValue( // bed_width_spin_->SetValue(
std::round(bed_height_spin_->GetValue()*bs_ratio_)); // std::round(bed_height_spin_->GetValue()*bs_ratio_));
bed_width_spin_->Update(); // bed_width_spin_->Update();
} // }
} // }
} // }
virtual void onFileChanged( wxFileDirPickerEvent& event ) { // virtual void onFileChanged( wxFileDirPickerEvent& event ) {
if(filepick_ctl_->GetPath().IsEmpty()) export_btn_->Disable(); // if(filepick_ctl_->GetPath().IsEmpty()) export_btn_->Disable();
else export_btn_->Enable(); // else export_btn_->Enable();
} // }
virtual void Close( wxCommandEvent& /*event*/ ) { // virtual void Close( wxCommandEvent& /*event*/ ) {
auto ret = wxID_OK; // auto ret = wxID_OK;
if(wxFileName(filepick_ctl_->GetPath()).Exists()) // if(wxFileName(filepick_ctl_->GetPath()).Exists())
if(!ctl_.report_issue(PrintController::IssueType::WARN_Q, // if(!ctl_.report_issue(PrintController::IssueType::WARN_Q,
_(L("File already exists. Overwrite?")), // _(L("File already exists. Overwrite?")),
_(L("Warning")))) ret = wxID_CANCEL; // _(L("Warning")))) ret = wxID_CANCEL;
EndModal(ret); // EndModal(ret);
} // }
}; // };
PngExportView exdlg(*this); // PngExportView exdlg(*this);
exdlg.prefill(prev_expdata_); // exdlg.prefill(prev_expdata_);
auto r = exdlg.ShowModal(); // auto r = exdlg.ShowModal();
auto ret = exdlg.export_data(); // auto ret = exdlg.export_data();
prev_expdata_ = ret; // prev_expdata_ = ret;
if(r != wxID_OK) ret.zippath.clear(); // if(r != wxID_OK) ret.zippath.clear();
return ret; // return ret;
} //}
} }