Skip to content

Commit

Permalink
fixed lingering popup for v0.9.23
Browse files Browse the repository at this point in the history
  • Loading branch information
@rklasky
rklasky committed Jul 24, 2021
1 parent 4edd02e commit 385e14a
Showing 1 changed file with 93 additions and 33 deletions.
126 changes: 93 additions & 33 deletions MSSPM_GuiSetup/nmfSetupTab02.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 2 of 68: CompetitionAlpha
// 3 of 68: CompetitionAlphaMax
Expand All @@ -299,8 +301,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}


Expand All @@ -327,8 +331,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 8 of 68: CompetitionBetaGuilds
Expand All @@ -354,8 +360,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 11 of 68: CompetitionBetaGuildsGuilds
Expand All @@ -381,12 +389,12 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}



// 14 of 68: PredationExponent
// 15 of 68: PredationExponentMin
// 16 of 68: PredationExponentMax
Expand All @@ -409,8 +417,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 17 of 68: Catch
Expand Down Expand Up @@ -442,8 +452,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 23 of 68: BiomassRelativeScalar
Expand All @@ -463,8 +475,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 24 of 68: Covariate
fullTableName = db + ".Covariate";
Expand All @@ -480,8 +494,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 25 of 68: CovariateTS
fullTableName = db + ".CovariateTS";
Expand All @@ -497,8 +513,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 26 of 68: Guilds
fullTableName = db + ".Guilds";
Expand All @@ -522,8 +540,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 27 of 68: OutputBiomass
fullTableName = db + ".OutputBiomass";
Expand All @@ -545,8 +565,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 28 of 68: OutputCompetitionAlpha
// 29 of 68: OutputCompetitionBetaSpecies
Expand Down Expand Up @@ -576,8 +598,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 32 of 68: OutputCompetitionBetaGuilds
Expand All @@ -602,8 +626,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 33 of 68: OutputCompetitionBetaGuildsGuilds
Expand All @@ -628,8 +654,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 34 of 68: OutputCatchability
Expand Down Expand Up @@ -669,8 +697,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 43 of 68: SpatialOverlap
Expand All @@ -690,8 +720,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}


Expand Down Expand Up @@ -726,8 +758,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// // 39 of 68: TestData
Expand Down Expand Up @@ -781,8 +815,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 51 of 68: Forecasts
fullTableName = db + ".Forecasts";
Expand Down Expand Up @@ -812,8 +848,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 52 of 68: ForecastHarvestExploitation
// 53 of 68: ForecastHarvestEffort
Expand Down Expand Up @@ -841,8 +879,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 55 of 68: ForecastBiomass
Expand All @@ -866,8 +906,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 56 of 68: ForecastBiomassMonteCarlo
fullTableName = db + ".ForecastBiomassMonteCarlo";
Expand All @@ -891,8 +933,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 57 of 68: ForecastMonteCarloParameters
fullTableName = db + ".ForecastMonteCarloParameters";
Expand Down Expand Up @@ -924,8 +968,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 58 of 68: ForecastBiomassMultiScenario
fullTableName = db + ".ForecastBiomassMultiScenario";
Expand All @@ -945,8 +991,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 59 of 68: ForecastUncertainty
fullTableName = db + ".ForecastUncertainty";
Expand Down Expand Up @@ -979,8 +1027,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}

// 60 of 68: DiagnosticInitBiomass
// 61 of 68: DiagnosticGrowthRate
Expand Down Expand Up @@ -1013,8 +1063,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 65 of 68: DiagnosticSurface
Expand All @@ -1041,8 +1093,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}
/*
// 54 of 68: OutputBiomassMohnsRho
Expand Down Expand Up @@ -1133,8 +1187,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
}

// 67 of 68: Application (contains name of application - used to assure app is using correct database)
Expand All @@ -1152,8 +1208,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}
m_DatabasePtr->saveApplicationTable(Setup_Tabs,m_Logger,fullTableName);
}

Expand All @@ -1179,8 +1237,10 @@ nmfSetup_Tab2::createTables(QString databaseName)
} else {
nmfUtilsQt::updateProgressDlg(m_Logger,m_ProgressDlg,"Created table: "+fullTableName,pInc);
}
if (! okToCreateMoreTables)
if (! okToCreateMoreTables) {
m_ProgressDlg->close();
return;
}


m_ProgressDlg->close();
Expand Down

0 comments on commit 385e14a

Please sign in to comment.