Skip to content
Permalink
Browse files

do not use QgsCoordinateReferenceSystem internally

  • Loading branch information
leyan committed May 4, 2013
1 parent 60b4369 commit 6e3e89b867d66741a8ec3b34e9a8d584c823552c
Showing with 20 additions and 16 deletions.
  1. +17 −13 src/app/qgscustomprojectiondialog.cpp
  2. +3 −3 src/app/qgscustomprojectiondialog.h
@@ -65,7 +65,7 @@ QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget *parent, Qt::WFlag
if( !customCRSnames.empty() )
{
leName->setText( customCRSnames[0] );
teParameters->setPlainText( customCRSparameters[0].toProj4() );
teParameters->setPlainText( customCRSparameters[0] );
leNameList->setCurrentItem( leNameList->topLevelItem( 0 ) );
}

@@ -113,7 +113,7 @@ void QgsCustomProjectionDialog::populateList()

crs.createFromProj4( parameters );
existingCRSnames[id] = name;
existingCRSparameters[id] = crs;
existingCRSparameters[id] = crs.toProj4();

newItem = new QTreeWidgetItem( leNameList, QStringList( ) );
newItem->setText( QGIS_CRS_NAME_COLUMN, name );
@@ -241,6 +241,7 @@ bool QgsCustomProjectionDialog::saveCRS(QgsCoordinateReferenceSystem myCRS, QStr
int return_id;
QString myProjectionAcronym = myCRS.projectionAcronym();
QString myEllipsoidAcronym = myCRS.ellipsoidAcronym();
QgsDebugMsg( QString("Saving a CRS:%1, %2, %3").arg(myName).arg(myCRS.toProj4()).arg(newEntry) );
if( newEntry )
{
return_id=myCRS.saveAsUserCRS(myName);
@@ -287,7 +288,7 @@ bool QgsCustomProjectionDialog::saveCRS(QgsCoordinateReferenceSystem myCRS, QStr
if(myResult != SQLITE_OK)
return false;
}
existingCRSparameters[myId] = myCRS;
existingCRSparameters[myId] = myCRS.toProj4();
existingCRSnames[myId] = myName;

// If we have a projection acronym not in the user db previously, add it.
@@ -312,7 +313,7 @@ void QgsCustomProjectionDialog::on_pbnAdd_clicked()
newItem->setText( QGIS_CRS_PARAMETERS_COLUMN, parameters.toProj4());
customCRSnames.push_back( name );
customCRSids.push_back ( id);
customCRSparameters.push_back( parameters );
customCRSparameters.push_back( parameters.toProj4() );
leNameList->setCurrentItem( newItem );
}

@@ -342,7 +343,7 @@ void QgsCustomProjectionDialog::on_leNameList_currentItemChanged( QTreeWidgetIte
{
previousIndex = leNameList->indexOfTopLevelItem( previous );
customCRSnames[previousIndex] = leName->text();
customCRSparameters[previousIndex].createFromProj4( teParameters->toPlainText() );
customCRSparameters[previousIndex] = teParameters->toPlainText();
previous->setText( QGIS_CRS_NAME_COLUMN, leName->text() );
previous->setText( QGIS_CRS_PARAMETERS_COLUMN, teParameters->toPlainText() );
}
@@ -376,7 +377,7 @@ void QgsCustomProjectionDialog::on_pbnCopyCRS_clicked()
on_pbnAdd_clicked();
}
teParameters->setPlainText( srs.toProj4() );
customCRSparameters[leNameList->currentIndex().row()].createFromProj4( srs.toProj4() );
customCRSparameters[leNameList->currentIndex().row()] = srs.toProj4();
leNameList->currentItem()->setText( QGIS_CRS_PARAMETERS_COLUMN, srs.toProj4() );

}
@@ -391,35 +392,38 @@ void QgsCustomProjectionDialog::on_buttonBox_accepted()
if(i != -1)
{
customCRSnames[i] = leName->text();
customCRSparameters[i].createFromProj4( teParameters->toPlainText() );
customCRSparameters[i] = teParameters->toPlainText();
}

QgsDebugMsg( "We save the modified CRS." );

//Check if all CRS are valid:
QgsCoordinateReferenceSystem CRS;
for( size_t i = 0; i < customCRSids.size(); ++i )
{
if( customCRSparameters[i].isValid()==false )
CRS.createFromProj4(customCRSparameters[i]);
if( CRS.isValid()==false )
{
QMessageBox::information( this, tr( "QGIS Custom Projection" ),
tr( "The proj4 definition of '%1' is not valid." ).arg(customCRSnames[i]) );
return;
}
}
//Modify the CRS changed:
bool save_success;
bool save_success=true;
for( size_t i = 0; i < customCRSids.size(); ++i )
{
CRS.createFromProj4(customCRSparameters[i]);
//Test if we just added this CRS (if it has no existing ID)
if( customCRSids[i] == "" )
{
save_success = save_success && saveCRS( customCRSparameters[i],customCRSnames[i], "", true);
save_success = save_success && saveCRS( CRS,customCRSnames[i], "", true);
}
else
{
if ( existingCRSnames[customCRSids[i]]!=customCRSnames[i] || existingCRSparameters[customCRSids[i]].toProj4() != customCRSparameters[i].toProj4() )
if ( existingCRSnames[customCRSids[i]]!=customCRSnames[i] || existingCRSparameters[customCRSids[i]] != customCRSparameters[i] )
{
save_success = save_success && saveCRS(customCRSparameters[i], customCRSnames[i], customCRSids[i], false );
save_success = save_success && saveCRS(CRS, customCRSnames[i], customCRSids[i], false );
}
}
if( ! save_success )
@@ -433,7 +437,7 @@ void QgsCustomProjectionDialog::on_buttonBox_accepted()
save_success=save_success && deleteCRS( deletedCRSs[i] );
if( ! save_success )
{
QgsDebugMsg( QString( "Problem for layer %1" ).arg( customCRSparameters[i].toProj4() ));
QgsDebugMsg( QString( "Problem for layer '%1'" ).arg( customCRSparameters[i] ));
}
}
if( save_success )
@@ -55,14 +55,14 @@ class QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectio
bool saveCRS( QgsCoordinateReferenceSystem myParameters, QString myName, QString myId, bool newEntry );
void insertProjection( QString myProjectionAcronym );

//These two QMap store the value as it is on the database when loading
QMap <QString, QgsCoordinateReferenceSystem> existingCRSparameters;
//These two QMap store the values as they are on the database when loading
QMap <QString, QString> existingCRSparameters;
QMap <QString, QString> existingCRSnames;

//These three vectors store the value updated with the current modifications
std::vector<QString> customCRSnames;
std::vector<QString> customCRSids;
std::vector<QgsCoordinateReferenceSystem> customCRSparameters;
std::vector<QString> customCRSparameters;

//vector saving the CRS to be deleted
std::vector<QString> deletedCRSs;

0 comments on commit 6e3e89b

Please sign in to comment.
You can’t perform that action at this time.