From: <tim...@us...> - 2005-12-05 14:27:06
|
Update of /cvsroot/qgis/plugins/openmodeller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21402 Modified Files: openmodellergui.cpp Log Message: Apply patch from Renato to fix some comparison logic Index: openmodellergui.cpp =================================================================== RCS file: /cvsroot/qgis/plugins/openmodeller/openmodellergui.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** openmodellergui.cpp 25 Nov 2005 12:49:48 -0000 1.82 --- openmodellergui.cpp 5 Dec 2005 14:26:49 -0000 1.83 *************** *** 360,363 **** --- 360,364 ---- QString myQString; QSettings settings; + if (thePageNameQString==tr("Step 1 of 9")) //we do this when arriving at the mode selection page { *************** *** 385,389 **** cboModelAlgorithm_highlighted(tr(myModelName)); } ! if (thePageNameQString==tr("Step 2 of 9")) { settings.writeEntry("/openmodeller/modelName",cboModelAlgorithm->currentText()); --- 386,390 ---- cboModelAlgorithm_highlighted(tr(myModelName)); } ! else if (thePageNameQString==tr("Step 2 of 9")) { settings.writeEntry("/openmodeller/modelName",cboModelAlgorithm->currentText()); *************** *** 406,410 **** } ! if (thePageNameQString==tr("Step 3 of 9")) { setNextEnabled(currentPage(),false); --- 407,411 ---- } ! else if (thePageNameQString==tr("Step 3 of 9")) { setNextEnabled(currentPage(),false); *************** *** 491,497 **** } ! ! ! if (thePageNameQString==tr("Step 4 of 9")) { //MODEL CREATION LAYERSET --- 492,496 ---- } ! else if (thePageNameQString==tr("Step 4 of 9")) { //MODEL CREATION LAYERSET *************** *** 545,549 **** } } ! if (thePageNameQString==tr("Step 5 of 9")) { //MODEL PROJECTION LAYERSET --- 544,548 ---- } } ! else if (thePageNameQString==tr("Step 5 of 9")) { //MODEL PROJECTION LAYERSET *************** *** 587,591 **** } ! if (thePageNameQString==tr("Step 6 of 9")) { //MASK AND FORMAT LAYERS --- 586,590 ---- } ! else if (thePageNameQString==tr("Step 6 of 9")) { //MASK AND FORMAT LAYERS *************** *** 599,603 **** { //loop through combo entries and check there is not already one for ! //the prefferred one - not that setDupliactesAllowed is only applicable to //editable combo boxes for (i=0; i <= cboInputMaskLayer->count(); i++) --- 598,602 ---- { //loop through combo entries and check there is not already one for ! //the preferred one - note that setDupliactesAllowed is only applicable to //editable combo boxes for (i=0; i <= cboInputMaskLayer->count(); i++) *************** *** 605,609 **** cboInputMaskLayer->setCurrentItem(i); ! if (cboInputMaskLayer->currentText().compare(myInputMask)) { myFlag=true; --- 604,608 ---- cboInputMaskLayer->setCurrentItem(i); ! if (cboInputMaskLayer->currentText().compare(myInputMask) == 0) { myFlag=true; *************** *** 620,624 **** { //loop through combo entries and check there is not already one for ! //the prefferred one - not that setDupliactesAllowed is only applicable to //editable combo boxes myFlag = false; --- 619,623 ---- { //loop through combo entries and check there is not already one for ! //the preferred one - note that setDupliactesAllowed is only applicable to //editable combo boxes myFlag = false; *************** *** 626,630 **** { cboOutputMaskLayer->setCurrentItem(i); ! if (cboOutputMaskLayer->currentText().compare(myOutputMask)) { myFlag=true; --- 625,629 ---- { cboOutputMaskLayer->setCurrentItem(i); ! if (cboOutputMaskLayer->currentText().compare(myOutputMask) == 0) { myFlag=true; *************** *** 641,645 **** { //loop through combo entries and check there is not already one for ! //the prefferred one - not that setDupliactesAllowed is only applicable to //editable combo boxes myFlag = false; --- 640,644 ---- { //loop through combo entries and check there is not already one for ! //the preferred one - note that setDupliactesAllowed is only applicable to //editable combo boxes myFlag = false; *************** *** 647,651 **** { cboOutputFormatLayer->setCurrentItem(i); ! if (cboOutputFormatLayer->currentText().compare(myOutputMask)) { myFlag=true; --- 646,650 ---- { cboOutputFormatLayer->setCurrentItem(i); ! if (cboOutputFormatLayer->currentText().compare(myOutputMask) == 0) { myFlag=true; *************** *** 660,671 **** } } ! ! if (thePageNameQString==tr("Step 8 of 9")) { - //persist values for masks and output format settings.writeEntry("/openmodeller/inputMaskFile",cboInputMaskLayer->currentText()); settings.writeEntry("/openmodeller/outputMaskFile",cboOutputMaskLayer->currentText()); settings.writeEntry("/openmodeller/outputFormatFile",cboOutputFormatLayer->currentText()); // // Extract parameters and their values from map and add to QStringList ready for reading --- 659,671 ---- } } ! else if (thePageNameQString==tr("Step 7 of 9")) { //persist values for masks and output format settings.writeEntry("/openmodeller/inputMaskFile",cboInputMaskLayer->currentText()); settings.writeEntry("/openmodeller/outputMaskFile",cboOutputMaskLayer->currentText()); settings.writeEntry("/openmodeller/outputFormatFile",cboOutputFormatLayer->currentText()); + } + else if (thePageNameQString==tr("Step 8 of 9")) + { // // Extract parameters and their values from map and add to QStringList ready for reading *************** *** 1463,1467 **** // //first build a regex to match text at the beginning of the line ! QRegExp myQRegExp( "^[^#][ a-zA-Z]*" ); //seconf caret means 'not' QStringList myTaxonQStringList;; QFile myQFile( theFileNameQString ); --- 1463,1467 ---- // //first build a regex to match text at the beginning of the line ! QRegExp myQRegExp( "^[^#][\t a-zA-Z]*" ); //seconf caret means 'not' QStringList myTaxonQStringList;; QFile myQFile( theFileNameQString ); |