Made last commit non-C++11 compatible
This commit is contained in:
parent
5364a17c50
commit
f480791472
|
@ -195,7 +195,7 @@ static PyObject * exporter(PyObject *self, PyObject *args)
|
||||||
|
|
||||||
// If tolerance is specified via python interface, use that.
|
// If tolerance is specified via python interface, use that.
|
||||||
// If not, use the preference, if that exists, else default to 0.1mm.
|
// If not, use the preference, if that exists, else default to 0.1mm.
|
||||||
auto hGrp(App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Mesh") );
|
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Mesh");
|
||||||
float fTolerance = hGrp->GetFloat( "MaxDeviationExport", 0.1f );
|
float fTolerance = hGrp->GetFloat( "MaxDeviationExport", 0.1f );
|
||||||
|
|
||||||
if (!PyArg_ParseTuple(args, "Oet|f", &object, "utf-8", &Name, &fTolerance))
|
if (!PyArg_ParseTuple(args, "Oet|f", &object, "utf-8", &Name, &fTolerance))
|
||||||
|
|
|
@ -33,6 +33,11 @@ DlgSettingsImportExport::DlgSettingsImportExport(QWidget* parent)
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DlgSettingsImportExport::~DlgSettingsImportExport()
|
||||||
|
{
|
||||||
|
// no need to delete child widgets, Qt does it all for us
|
||||||
|
}
|
||||||
|
|
||||||
void DlgSettingsImportExport::saveSettings()
|
void DlgSettingsImportExport::saveSettings()
|
||||||
{
|
{
|
||||||
ui->maxDeviationExport->onSave();
|
ui->maxDeviationExport->onSave();
|
||||||
|
|
|
@ -38,8 +38,8 @@ class DlgSettingsImportExport : public Gui::Dialog::PreferencePage
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DlgSettingsImportExport(QWidget *parent=nullptr);
|
DlgSettingsImportExport(QWidget* parent = 0);
|
||||||
~DlgSettingsImportExport() = default;
|
~DlgSettingsImportExport();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void saveSettings();
|
void saveSettings();
|
||||||
|
@ -47,7 +47,7 @@ protected:
|
||||||
void changeEvent(QEvent *e);
|
void changeEvent(QEvent *e);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::auto_ptr<Ui_DlgSettingsImportExport> ui;
|
Ui_DlgSettingsImportExport* ui;
|
||||||
}; // end class DlgSettingsImportExport
|
}; // end class DlgSettingsImportExport
|
||||||
|
|
||||||
} // namespace MeshGui
|
} // namespace MeshGui
|
||||||
|
|
Loading…
Reference in New Issue
Block a user