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
2 changes: 1 addition & 1 deletion DFTFringe.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ QT += charts concurrent core datavisualization gui multimedia multimediawidgets

qtHaveModule(printsupport): QT += printsupport

QMAKE_CXXFLAGS += -std=c++11
QMAKE_CXXFLAGS += -std=c++14
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

omg! I tried to do this change a year ago to fix a bug releated to unicode characters in file names. I struggled with this and I couldn't get dftfringe to complile. QT did not like this change so I had to change it back. And you just change one character and it compiles fine! Okay this is one thing that sucks about qt creator.

This should fix the unicode character bug in file names issue as Dale's code uses stdlib file functions (fileInputStream or something like that).

Unfortunately I can't do this same change in qt creator unless there is a newer version of it that supports this.

I'm going to start the release process before this merge because I'm worried about what else might break when changing to a newer compiler and I wasn't planning on doing another multi-hour QA session.


# disable qDebug() in release
CONFIG( release, debug|release ) {
Expand Down
2 changes: 1 addition & 1 deletion astigstatsdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class RunningStat
{
public:
RunningStat() :
m_n(0), m_oldM(NAN), m_oldS(0.), m_min(DBL_MAX), m_max(DBL_MIN)
m_n(0), m_oldM(NAN), m_oldS(0.), m_newS(0.), m_min(DBL_MAX), m_max(DBL_MIN)
{}

void Push(double x)
Expand Down
2 changes: 1 addition & 1 deletion mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2074,7 +2074,7 @@ void MainWindow::on_actionastig_in_polar_triggered()
{
surfaceAnalysisTools *saTools = surfaceAnalysisTools::get_Instance();
QList<int> list = saTools->SelectedWaveFronts();
astigPolargraph * graph = new astigPolargraph( list);
astigPolargraph * graph = new astigPolargraph( list, this);
graph->resize(2000,1000);
graph->exec();
}
Expand Down
2 changes: 1 addition & 1 deletion percentcorrectiondlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ void percentCorrectionDlg::plot(){
if (surfs.length() < 2) {
// draw zone rectangles

double width;
double width= 0.;
for(int i = 0; i < percent.length(); ++i){

double y = percent[i].y();
Expand Down
2 changes: 1 addition & 1 deletion profileplot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ ProfilePlot::ProfilePlot(QWidget *parent , ContourTools *tools):
zoomed = false;
m_defocus_mode = false;
m_plot = new QwtPlot(this);
profilePlotPicker *picker = new profilePlotPicker(m_plot);
new profilePlotPicker(m_plot);
type = 0;
QHBoxLayout * l1 = new QHBoxLayout();
QVBoxLayout *v1 = new QVBoxLayout();
Expand Down
Loading