Skip to content

fix forever loading cursor during batch processing #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atsju merged 3 commits into from
Aug 26, 2025
Merged

fix forever loading cursor during batch processing #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc78778
fix forever loading cursor during batch processing
atsju Aug 20, 2025
8a7dfa6
remove unused variable and mute false positive
atsju Aug 20, 2025
c9c4018
better fix
atsju Aug 20, 2025
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
4 changes: 3 additions & 1 deletion dftarea.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ DFTArea::DFTArea(QWidget *mparent, IgramArea *ip, DFTTools * tools, vortexDebug
QSettings set;
m_center_filter = set.value("DFT Center Filter", 10).toDouble();
qDebug() << "init center" << m_center_filter;
emit updateFilterSize(m_center_filter);
// TODO I muted clazy warning as this is a false positive.
// It might be good to find a different way to call setCenterFilterValue
emit updateFilterSize(m_center_filter); // clazy:exclude=incorrect-emit
installEventFilter(this);

/*
Expand Down
8 changes: 6 additions & 2 deletions mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ void MainWindow::batchProcess(QStringList fileList){
m_contourView->getPlot()->blockSignals(true);
QSettings settings;
bool shouldBeep = settings.value("RMSBeep>", true).toBool();
this->setCursor(Qt::WaitCursor);
QApplication::setOverrideCursor(Qt::WaitCursor);
batchIgramWizard::goPb->setEnabled(false);
batchIgramWizard::addFiles->setEnabled(false);
batchIgramWizard::skipFile->setEnabled(true);
Expand Down Expand Up @@ -1147,9 +1147,11 @@ void MainWindow::batchProcess(QStringList fileList){
//QObject().thread()->msleep(1000);
ui->SelectOutSideOutline->setChecked(true);
if (!batchIgramWizard::autoCb->isChecked()){
QApplication::restoreOverrideCursor();
while (m_inBatch && !m_OutlineDoneInBatch && !m_skipItem) {
QApplication::processEvents();
}
QApplication::setOverrideCursor(Qt::WaitCursor);
}
if (m_skipItem){
cnt++;
Expand All @@ -1165,9 +1167,11 @@ void MainWindow::batchProcess(QStringList fileList){

m_batchMakeSurfaceReady = false;
if (!batchIgramWizard::autoCb->isChecked() && !m_skipItem){
QApplication::restoreOverrideCursor();
while (m_inBatch && !m_batchMakeSurfaceReady && !m_skipItem) {
QApplication::processEvents();
}
QApplication::setOverrideCursor(Qt::WaitCursor);
}
if (m_skipItem){
m_skipItem = false;
Expand Down Expand Up @@ -1297,7 +1301,7 @@ void MainWindow::batchProcess(QStringList fileList){
batchIgramWizard::addFiles->setEnabled(true);
batchIgramWizard::skipFile->setEnabled(false);

this->setCursor(Qt::ArrowCursor);
QApplication::restoreOverrideCursor();
m_contourView->getPlot()->blockSignals(false);

}
Expand Down
1 change: 0 additions & 1 deletion outlinestatsdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ void outlineStatsDlg::on_pushButton_clicked()
break;
}
outside = readCircle(file);
CircleOutline sideLobe = readCircle(file);

if ((file.tellg() > 0) && (fsize > file.tellg())) {
if (file.peek() != 'P'){
Expand Down
9 changes: 7 additions & 2 deletions surfacemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,14 @@ void SurfaceManager::generateSurfacefromWavefront(wavefront * wf){
if (!m_ignoreInverse && (md->cc != 0.0) && md->cc * wf->InputZerns[8] < 0.){
bool reverse = false;
if (m_askAboutReverse){
if (QMessageBox::Yes == QMessageBox::question(0,"should invert?","Wavefront seems inverted. Do you want to invert it?"))
// Temporarily restore cursor so QMessageBox does not show waitCursor
// QGuiApplication::setOverrideCursor do stack so we will go back to previous state (any state)
QGuiApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
bool msgResult = (QMessageBox::Yes == QMessageBox::question(0,"should invert?","Wavefront seems inverted. Do you want to invert it?"));
QGuiApplication::restoreOverrideCursor();
if (msgResult)
{
reverse = true;
reverse = true;
m_askAboutReverse = false;
}else
{
Expand Down
Loading