Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions astigpolargraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
#include "ui_astigpolargraph.h"
#include "surfacemanager.h"

void astigPolargraph::makeChart(){


astigPolargraph::astigPolargraph( QList<int>list, 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
Expand Down Expand Up @@ -78,21 +82,6 @@ void astigPolargraph::makeChart(){
angularAxis->setRange(0, 360);

ui->polarChart->setChart(chart);



}
astigPolargraph::astigPolargraph( QList<int>list, 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()
Expand Down
1 change: 0 additions & 1 deletion astigpolargraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class astigPolargraph : public QDialog
private:
Ui::astigPolargraph *ui;
QList<int> m_list; // list index of selected wave fronts in surface manager's list.
void makeChart();
};

#endif // ASTIGPOLARGRAPH_H
4 changes: 3 additions & 1 deletion main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
** along with DFTFringe. If not, see <http://www.gnu.org/licenses/>.

****************************************************************************/
#include "mainwindow.h"
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include <QtWidgets>
#include <iostream>
Expand Down Expand Up @@ -1698,7 +1698,7 @@
int cnt = 0;
QSettings set;
QString lastPath = set.value("lastPath",".").toString();
int memThreshold = set.value("lowMemoryThreshold",300).toInt();

Check warning on line 1701 in mainwindow.cpp

View workflow job for this annotation

GitHub Actions / build-linux (ubuntu-24.04)

unused variable ‘memThreshold’ [-Wunused-variable]

Check warning on line 1701 in mainwindow.cpp

View workflow job for this annotation

GitHub Actions / build-linux (ubuntu-22.04)

unused variable ‘memThreshold’ [-Wunused-variable]

Check warning on line 1701 in mainwindow.cpp

View workflow job for this annotation

GitHub Actions / build-DFTFringe

unused variable 'memThreshold' [-Wunused-variable]
QImage img = m_ogl->m_surface->render(1000,1000);

int width = img.width();
Expand Down Expand Up @@ -1796,7 +1796,7 @@
QApplication::setOverrideCursor(Qt::WaitCursor);
QProcess *proc = new QProcess;
connect(proc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
[=](int exitCode, QProcess::ExitStatus exitStatus){ qDebug() << "what" << exitStatus; });

Check warning on line 1799 in mainwindow.cpp

View workflow job for this annotation

GitHub Actions / build-linux (ubuntu-24.04)

unused parameter ‘exitCode’ [-Wunused-parameter]

Check warning on line 1799 in mainwindow.cpp

View workflow job for this annotation

GitHub Actions / build-linux (ubuntu-22.04)

unused parameter ‘exitCode’ [-Wunused-parameter]

Check warning on line 1799 in mainwindow.cpp

View workflow job for this annotation

GitHub Actions / build-DFTFringe

unused parameter 'exitCode' [-Wunused-parameter]

proc->setProcessChannelMode(QProcess::MergedChannels);
proc->setWorkingDirectory(dir);
Expand Down Expand Up @@ -1827,7 +1827,7 @@
}
catch(std::exception& e) {

qDebug() << "Exception writing video " << e.what();
qWarning() << "Exception writing video " << e.what();
}
if (astigWindow != NULL)
delete astigWindow;
Expand Down
Loading