[QGIS Commit] r15360 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Mar 6 08:38:21 EST 2011
Author: timlinux
Date: 2011-03-06 05:38:20 -0800 (Sun, 06 Mar 2011)
New Revision: 15360
Modified:
trunk/qgis/src/app/qgsoptions.cpp
trunk/qgis/src/app/qgsoptions.h
trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
For global crs option show nice user friendly name instead of proj4 string
Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp 2011-03-06 11:33:22 UTC (rev 15359)
+++ trunk/qgis/src/app/qgsoptions.cpp 2011-03-06 13:38:20 UTC (rev 15360)
@@ -188,14 +188,17 @@
{
radUseGlobalProjection->setChecked( true );
}
- txtGlobalWkt->setText( settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString() );
+ QString myGlobalCrsString = settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString();
+ mGlobalCrs.createFromProj4( myGlobalCrsString );
+ //display the crs as friendly text rather than in wkt
+ leGlobalCRS->setText( mGlobalCrs.authid() + " - " + mGlobalCrs.description() );
+
//on the fly CRS transformation settings
grpOtfTransform->setChecked( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
- QString myDefaultSrsString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
- mDefaultCrs.createFromProj4( myDefaultSrsString );
+ QString myDefaultCrsString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
+ mDefaultCrs.createFromProj4( myDefaultCrsString );
//display the crs as friendly text rather than in wkt
- leGlobalOtfProjString->setText( mDefaultCrs.authid() + " - " +
- mDefaultCrs.description() );
+ leGlobalOtfProjString->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
// populate combo box with ellipsoids
getEllipsoidList();
@@ -635,7 +638,7 @@
settings.setValue( "/Projections/defaultBehaviour", "useGlobal" );
}
- settings.setValue( "/Projections/defaultProjectionString", txtGlobalWkt->toPlainText() );
+ settings.setValue( "/Projections/defaultProjectionString", mGlobalCrs.toProj4() );
// save 'on the fly' CRS transformation settings
settings.setValue( "/Projections/otfTransformEnabled", grpOtfTransform->isChecked() );
@@ -748,19 +751,15 @@
{
QSettings settings;
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
+ mySelector->setSelectedCrsId( mGlobalCrs.srsid() );
- //find out srs id of current proj4 string
- QgsCoordinateReferenceSystem refSys;
- if ( refSys.createFromProj4( txtGlobalWkt->toPlainText() ) )
- {
- mySelector->setSelectedCrsId( refSys.srsid() );
- }
-
if ( mySelector->exec() )
{
- //! @todo changes this control name in gui to txtGlobalProjString
- txtGlobalWkt->setText( mySelector->selectedProj4String() );
- QgsDebugMsg( QString( "------ Global Default Projection Selection set to ----------\n%1" ).arg( txtGlobalWkt->toPlainText() ) );
+ mGlobalCrs.createFromProj4( mySelector->selectedProj4String() );
+ leGlobalCRS->setText( mySelector->selectedProj4String() );
+ leGlobalCRS->setText( mGlobalCrs.authid() + " - " +
+ mGlobalCrs.description() );
+ QgsDebugMsg( QString( "------ Global Default Projection Selection set to ----------\n%1" ).arg( leGlobalCRS->text() ) );
}
else
{
@@ -774,8 +773,6 @@
{
QSettings settings;
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
-
- //find out srs id of current proj4 string
mySelector->setSelectedCrsId( mDefaultCrs.srsid() );
if ( mySelector->exec() )
Modified: trunk/qgis/src/app/qgsoptions.h
===================================================================
--- trunk/qgis/src/app/qgsoptions.h 2011-03-06 11:33:22 UTC (rev 15359)
+++ trunk/qgis/src/app/qgsoptions.h 2011-03-06 13:38:20 UTC (rev 15360)
@@ -131,6 +131,7 @@
private:
QStringList i18nList();
QgsCoordinateReferenceSystem mDefaultCrs;
+ QgsCoordinateReferenceSystem mGlobalCrs;
};
#endif // #ifndef QGSOPTIONS_H
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2011-03-06 11:33:22 UTC (rev 15359)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2011-03-06 13:38:20 UTC (rev 15360)
@@ -33,7 +33,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<property name="iconSize">
<size>
@@ -1354,87 +1354,106 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-59</y>
- <width>746</width>
- <height>516</height>
+ <y>0</y>
+ <width>762</width>
+ <height>457</height>
</rect>
</property>
- <layout class="QGridLayout" name="gridLayout_15">
+ <layout class="QGridLayout" name="gridLayout_22">
<item row="0" column="0">
<widget class="QGroupBox" name="grpProjectionBehaviour">
<property name="title">
<string>Default Coordinate Reference System</string>
</property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>11</number>
- </property>
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
- <string>When a new layer is created, or when a layer is loaded that has no coordinate reference system (CRS)</string>
+ <string>When a new layer is created, or when a layer is loaded that has no Coordinate Reference System (CRS)</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item>
+ <item row="1" column="0">
<widget class="QRadioButton" name="radPromptForProjection">
<property name="text">
<string>Prompt for CRS</string>
</property>
</widget>
</item>
- <item>
+ <item row="2" column="0">
<widget class="QRadioButton" name="radUseProjectProjection">
<property name="text">
<string>Project wide default CRS will be used</string>
</property>
</widget>
</item>
- <item>
+ <item row="3" column="0">
<widget class="QRadioButton" name="radUseGlobalProjection">
<property name="text">
<string>Global default CRS displa&yed below will be used</string>
</property>
</widget>
</item>
+ <item row="4" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <item>
+ <widget class="QLineEdit" name="leGlobalCRS">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pbnSelectProjection">
+ <property name="text">
+ <string>Select ...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
<item row="1" column="0">
- <widget class="QTextBrowser" name="txtGlobalWkt"/>
- </item>
- <item row="2" column="0">
- <widget class="QPushButton" name="pbnSelectProjection">
- <property name="text">
- <string>Select Global Default ...</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
<widget class="QGroupBox" name="grpOtfTransform">
<property name="title">
- <string>Always use 'on the fly' CRS transformation for new projects</string>
+ <string>Enable 'on the fly' reprojection by defaul</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QLineEdit" name="leGlobalOtfProjString">
- <property name="readOnly">
+ <layout class="QGridLayout" name="gridLayout_15">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_16">
+ <property name="text">
+ <string>When this opton is enabled, any new project you create will have 'on the fly' projection enabled by default and the CRS below will be used for the project.</string>
+ </property>
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="pbnSelectOtfProjection">
- <property name="text">
- <string>Select CRS for 'on the fly' transformation ...</string>
- </property>
- </widget>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_10">
+ <item>
+ <widget class="QLineEdit" name="leGlobalOtfProjString">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pbnSelectOtfProjection">
+ <property name="text">
+ <string>Select ...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -1828,7 +1847,6 @@
<tabstop>radPromptForProjection</tabstop>
<tabstop>radUseProjectProjection</tabstop>
<tabstop>radUseGlobalProjection</tabstop>
- <tabstop>txtGlobalWkt</tabstop>
<tabstop>pbnSelectProjection</tabstop>
<tabstop>grpLocale</tabstop>
<tabstop>cboLocale</tabstop>
More information about the QGIS-commit
mailing list