diff --git a/astigpolargraph.cpp b/astigpolargraph.cpp index ce49c900..ef88e2c8 100644 --- a/astigpolargraph.cpp +++ b/astigpolargraph.cpp @@ -2,9 +2,13 @@ #include "ui_astigpolargraph.h" #include "surfacemanager.h" -void astigPolargraph::makeChart(){ - +astigPolargraph::astigPolargraph( QListlist, QWidget *parent) : + QDialog(parent), + ui(new Ui::astigPolargraph), m_list(list) +{ + ui->setupUi(this); + QPolarChart *chart = new QPolarChart(); // process each wave front and place astig on the chart @@ -78,21 +82,6 @@ void astigPolargraph::makeChart(){ angularAxis->setRange(0, 360); ui->polarChart->setChart(chart); - - - -} -astigPolargraph::astigPolargraph( QListlist, QWidget *parent) : - QDialog(parent), - ui(new Ui::astigPolargraph), m_list(list) -{ - ui->setupUi(this); - //For some reason the original starter code of makeChart was in this function but it caused a crash. - // I could never figure out why because that code was taken from a working Qt example. When - // moved to inside another function it worked. So there you go. Exact same code with no changes worked there but not here. - makeChart(); - - } astigPolargraph::~astigPolargraph() diff --git a/astigpolargraph.h b/astigpolargraph.h index e8d3dbcb..ea8033aa 100644 --- a/astigpolargraph.h +++ b/astigpolargraph.h @@ -25,7 +25,6 @@ class astigPolargraph : public QDialog private: Ui::astigPolargraph *ui; QList m_list; // list index of selected wave fronts in surface manager's list. - void makeChart(); }; #endif // ASTIGPOLARGRAPH_H diff --git a/main.cpp b/main.cpp index e4df488b..64364207 100644 --- a/main.cpp +++ b/main.cpp @@ -101,8 +101,10 @@ int main(int argc, char *argv[]) // warning: only use if all your loggers are thread-safe ("_mt" loggers) spdlog::flush_every(std::chrono::seconds(3)); +#ifndef DALE_DO_NOT_LOG // Set the logging format - //spdlog::get("logger")->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%^%l%$] %v"); + spdlog::get("logger")->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%^%l%$] %v"); +#endif // Set logger level settingsDebug::setLogLevel(settingsDebug::getLogLevel()); diff --git a/mainwindow.cpp b/mainwindow.cpp index 758e184a..639458e4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -15,7 +15,7 @@ ** along with DFTFringe. If not, see . ****************************************************************************/ -#include "mainwindow.h" +#include "mainwindow.h" #include "ui_mainwindow.h" #include #include @@ -1827,7 +1827,7 @@ void MainWindow::on_actionCreate_Movie_of_wavefronts_triggered() } catch(std::exception& e) { - qDebug() << "Exception writing video " << e.what(); + qWarning() << "Exception writing video " << e.what(); } if (astigWindow != NULL) delete astigWindow;