diff --git a/IsotropicRemesher.cc b/IsotropicRemesher.cc index 32f13ea70415e6d44f753e60575578f0efe0358a..f06b83ee94be6e16b1444e60db7ecfdcabaeeaba 100644 --- a/IsotropicRemesher.cc +++ b/IsotropicRemesher.cc @@ -67,7 +67,7 @@ void IsotropicRemesher::Remesh(Embedding* embedding, if (dataoutput) { output_file.resize(0); param_file.resize(0); - DataOutputParam(embedding, ¶m_file, target_length, iterations, alpha, beta, + DataOutputParam(embedding, ¶m_file, target_length, scale, iterations, alpha, beta, smtype, limitflips, strtype, corder); DataOutputHeader(embedding, &output_file); DataOutput(embedding, &output_file, 0.0, 0); @@ -1028,6 +1028,7 @@ void IsotropicRemesher::Straightening(Embedding *embedding, StraighteningType st void IsotropicRemesher::DataOutputParam(Embedding *embedding, QFile *file, double target_length, + double scale, uint iterations, double alpha, double beta, @@ -1038,6 +1039,7 @@ void IsotropicRemesher::DataOutputParam(Embedding *embedding, if(file->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { QTextStream tstream(file); QString target_length_str = QString::number(target_length); + QString target_length_adjusted_str = QString::number(target_length*scale); QString iterations_str = QString(iterations); QString alpha_str = QString::number(alpha); QString beta_str = QString::number(beta); @@ -1092,14 +1094,15 @@ void IsotropicRemesher::DataOutputParam(Embedding *embedding, } } - tstream << "Target edge length: " << target_length_str << endl - << "Iterations: " << iterations_str << endl - << "Alpha: " << alpha_str << endl - << "Beta: " << beta_str << endl - << "Smoothing type: " << smtype_str << endl - << "Limit Flips: " << limitflips_str << endl - << "Straightening Type: " << strtype_str << endl - << "Collapsing Order: " << corder_str << endl; + tstream << "Target edge length: " << target_length_str.toStdString().c_str() << endl + << "Adjusted length: " << target_length_adjusted_str.toStdString().c_str() << endl + << "Iterations: " << iterations_str.toStdString().c_str() << endl + << "Alpha: " << alpha_str.toStdString().c_str() << endl + << "Beta: " << beta_str.toStdString().c_str() << endl + << "Smoothing type: " << smtype_str.toStdString().c_str() << endl + << "Limit Flips: " << limitflips_str.toStdString().c_str() << endl + << "Straightening Type: " << strtype_str.toStdString().c_str() << endl + << "Collapsing Order: " << corder_str.toStdString().c_str(); file->close(); } } diff --git a/IsotropicRemesher.hh b/IsotropicRemesher.hh index 42b97a83ea476a346703b11e4c2525ef742b1fcd..84bea59788118eca37c66debbc406c0b05e6f3ad 100644 --- a/IsotropicRemesher.hh +++ b/IsotropicRemesher.hh @@ -65,6 +65,7 @@ private: void DataOutputParam(Embedding* embedding, QFile* file, double target_length, + double scale, uint iterations, double alpha, double beta,