Skip to content

Commit

Permalink
merge from trunk r11050:11100
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11135 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Jul 21, 2009
1 parent c03425d commit 1e8cd68
Show file tree
Hide file tree
Showing 118 changed files with 2,172 additions and 1,292 deletions.
2 changes: 2 additions & 0 deletions DONORS
View file
Expand Up @@ -18,6 +18,7 @@ Albin Blaschka|http://www.albinblaschka.info/
Alessandro Pasotti|http://www.itopen.it/
Alessandro Sarretta
Alexandre Leroux
Andreas Neumann
Associazione Monte Porzio Cultura
Carl Nelson
D R Arbib
Expand All @@ -32,6 +33,7 @@ James Crone
Jaroslaw Kowalczyk
Jason Jorgenson
John C. Tull
John Dean
Kanton Solothurn SOGIS
Kevin Shook
Laura Burnette
Expand Down
341 changes: 189 additions & 152 deletions i18n/qgis_de.ts
View file

Large diffs are not rendered by default.

1,126 changes: 573 additions & 553 deletions i18n/qgis_fr.ts
View file

Large diffs are not rendered by default.

226 changes: 194 additions & 32 deletions mac/xcode/Qgis.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions python/core/qgsvectorlayer.sip
View file
Expand Up @@ -13,6 +13,9 @@ public:
Classification,
EditRange,
SliderRange
FileName,
Enumeration,
Immutable
};

struct RangeData {
Expand Down
23 changes: 15 additions & 8 deletions src/app/qgslabeldialog.cpp
View file
Expand Up @@ -152,7 +152,7 @@ void QgsLabelDialog::init( )
mFont.setFamily( myLabelAttributes->family() );
if ( myLabelAttributes->sizeIsSet() )
{
mFont.setPointSize( static_cast<int>( myLabelAttributes->size() ) );
mFont.setPointSizeF( myLabelAttributes->size() );

int myTypeInt = myLabelAttributes->sizeType();
if ( myTypeInt == QgsLabelAttributes::PointUnits )
Expand All @@ -166,10 +166,12 @@ void QgsLabelDialog::init( )
}
else //defaults for when no size has been set
{
mFont.setPointSize( static_cast<int>( myLabelAttributes->size() ) );
mFont.setPointSizeF( myLabelAttributes->size() );
radioFontSizeUnitsPoints->setChecked( true );
}

spinFontSize->setValue( myLabelAttributes->size() );

if ( myLabelAttributes->boldIsSet() )
{
mFont.setBold( myLabelAttributes->bold() );
Expand Down Expand Up @@ -200,8 +202,8 @@ void QgsLabelDialog::init( )
{
radioOffsetUnitsMap->setChecked( true );
}
spinXOffset->setValue( static_cast<int>( myLabelAttributes->xOffset() ) );
spinYOffset->setValue( static_cast<int>( myLabelAttributes->yOffset() ) );
spinXOffset->setValue( myLabelAttributes->xOffset() );
spinYOffset->setValue( myLabelAttributes->yOffset() );
}
else //defaults for when no offset is defined
{
Expand Down Expand Up @@ -247,7 +249,7 @@ void QgsLabelDialog::init( )
{
radioBufferUnitsMap->setChecked( true );
}
spinBufferSize->setValue( static_cast<int>( myLabelAttributes->bufferSize() ) );
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
}
else //defaults for when no offset is defined
{
Expand All @@ -259,7 +261,7 @@ void QgsLabelDialog::init( )
chkUseBuffer->setChecked( myLabelAttributes->bufferEnabled() );

//NOTE: do we need this line too? TS
spinBufferSize->setValue( static_cast<int>( myLabelAttributes->bufferSize() ) );
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
//TODO - transparency attributes for buffers

listWidget->setItemSelected( listWidget->item( 0 ), true );
Expand All @@ -271,11 +273,16 @@ void QgsLabelDialog::changeFont( void )
{
QgsDebugMsg( "entering." );

qreal fontSize = mFont.pointSizeF();
bool resultFlag;
mFont = QFontDialog::getFont( &resultFlag, mFont, this );
if ( resultFlag )
{
// font is set to the font the user selected
if ( mFont.pointSizeF() != fontSize )
{
// font is set to the font the user selected
spinFontSize->setValue( mFont.pointSizeF() );
}
}
else
{
Expand Down Expand Up @@ -341,7 +348,7 @@ void QgsLabelDialog::apply()
{
myTypeInt = QgsLabelAttributes::MapUnits;
}
myLabelAttributes->setSize( mFont.pointSize(), myTypeInt );
myLabelAttributes->setSize( mFont.pointSizeF(), myTypeInt );
myLabelAttributes->setBold( mFont.bold() );
myLabelAttributes->setItalic( mFont.italic() );
myLabelAttributes->setUnderline( mFont.underline() );
Expand Down
4 changes: 3 additions & 1 deletion src/app/qgslabeldialog.h
View file
Expand Up @@ -74,8 +74,10 @@ class QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase

void on_cboLabelField_activated( int ) {emit labelSourceSet(); }

void on_spinFontSize_valueChanged( double d ) { mFont.setPointSizeF( d ); lblSample->setFont( mFont ); }

signals:
/* emitted when anitem in label source list is chosen */
/* emitted when an item in label source list is chosen */
void labelSourceSet();

protected:
Expand Down
8 changes: 4 additions & 4 deletions src/app/qgsmaptoolidentify.cpp
View file
Expand Up @@ -352,13 +352,13 @@ void QgsMapToolIdentify::identifyVectorLayer( const QgsPoint& point )
{
// Add the start and end points in as derived attributes
str.setNum( f_it->geometry()->asPolyline().first().x(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "startX", str );
mResults->addDerivedAttribute( featureNode, tr( "firstX", "attributes get sorted; translation for lastX should be lexically larger than this one" ), str );
str.setNum( f_it->geometry()->asPolyline().first().y(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "startY", str );
mResults->addDerivedAttribute( featureNode, tr( "firstY" ), str );
str.setNum( f_it->geometry()->asPolyline().last().x(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "endX", str );
mResults->addDerivedAttribute( featureNode, tr( "lastX", "attributes get sorted; translation for firstX should be lexically smaller than this one" ), str );
str.setNum( f_it->geometry()->asPolyline().last().y(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "endY", str );
mResults->addDerivedAttribute( featureNode, tr( "lastY" ), str );
}
}
else if ( layer->geometryType() == QGis::Polygon )
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgshttptransaction.cpp
View file
Expand Up @@ -133,9 +133,9 @@ bool QgsHttpTransaction::getSynchronously( QByteArray &respondedContent, int red
// http://www.address.bit:80), so remove that from the url before
// executing an http GET.

QString pathAndQuery = httpurl.remove( 0, httpurl.indexOf( qurl.path() ) );


//Path could be just '/' so we remove the 'http://' first
QString pathAndQuery = httpurl.remove( 0, httpurl.indexOf( qurl.host() ) );
pathAndQuery = httpurl.remove( 0, pathAndQuery.indexOf( qurl.path() ) );
if ( !postData ) //do request with HTTP GET
{
header.setRequest( "GET", pathAndQuery );
Expand Down
61 changes: 44 additions & 17 deletions src/plugins/grass/modules-6.3/default.qgc
View file
Expand Up @@ -12,51 +12,63 @@
<grass name="r.in.gdal.qgis.loc"/>
<grass name="r.in.gdal"/>
<grass name="r.in.gdal.loc"/>
<grass name="r.in.xyz"/>
<grass name="r.in.ascii"/>
<grass name="r.in.poly"/>
<grass name="r.in.bin"/>
<grass name="r.in.arc"/>
<grass name="r.in.gridatb"/>
<grass name="r.in.mat"/>
<grass name="i.in.spotvgt"/>
<grass name="r.in.srtm"/>
<grass name="r.in.aster"/>
<grass name="r.in.wms"/>
</section>
<section label="Import vector">
<section label="Import vector">
<grass name="v.in.ogr.qgis"/>
<grass name="v.in.ogr"/>
<grass name="v.in.ogr.qgis.loc"/>
<grass name="v.in.ogr.loc"/>
<grass name="v.in.ogr"/>
<grass name="v.in.ogr.loc"/>
<grass name="v.in.ogr.all"/>
<grass name="v.in.ogr.all.loc"/>
<grass name="v.in.dxf"/>
<grass name="v.in.e00"/>
<grass name="v.in.mapgen"/>
<grass name="v.in.db"/>
<grass name="v.in.garmin"/>
<grass name="v.in.gpsbabel"/>
</section>
<grass name="v.in.ogr.all.loc"/>
<grass name="v.in.dxf"/>
<grass name="v.in.e00"/>
<grass name="v.in.mapgen"/>
<grass name="v.in.db"/>
<grass name="v.in.garmin"/>
<grass name="v.in.gpsbabel"/>
</section>
</section>
<section label="Export">
<section label="Export raster">
<grass name="r.out.gdal.gtiff"/>
<grass name="r.out.gdal"/>
<grass name="r.out.ascii"/>
<grass name="r.out.xyz"/>
<grass name="r.out.arc"/>
<grass name="r.out.gridatb"/>
<grass name="r.out.mat"/>
<grass name="r.out.bin"/>
<grass name="r.out.mpeg"/>
<grass name="r.out.png"/>
<grass name="r.out.ppm"/>
<grass name="r.out.ppm3"/>
<grass name="r.out.pov"/>
<grass name="r.out.tiff"/>
<grass name="r.out.vrml"/>
<grass name="r.out.vtk"/>
</section>
<section label="Export vector">
<grass name="v.out.ogr"/>
<grass name="qgis.v.out.ogr.pg"/>
<grass name="v.out.ogr.gml"/>
<grass name="v.out.ogr.mapinfo"/>
<grass name="v.out.ogr.postgis"/>
<grass name="v.out.ascii"/>
<grass name="v.out.dxf"/>
<grass name="v.out.pov"/>
<grass name="v.out.svg"/>
<grass name="v.out.vtk"/>
</section>
</section>
<section label="Map type conversion">
Expand All @@ -79,15 +91,15 @@
<grass name="g.region.zoom"/>
<grass name="g.region.multiple.raster"/>
<grass name="g.region.multiple.vector"/>
</section>
</section>
<section label="Projection management">
<section label="Print projection information of the current location">
<grass name="g.proj.print"/>
</section>
<grass name="g.proj.print"/>
</section>
<section label="Print projection information from a georeferenced file">
<grass name="g.proj.geo"/>
<grass name="g.proj.geo"/>
<grass name="g.proj.ascii"/>
<grass name="g.proj.proj"/>
<grass name="g.proj.proj"/>
</section>
<section label="Print projection information from a georeferenced file and create a new location based on it">
<grass name="g.proj.geo.new"/>
Expand Down Expand Up @@ -161,6 +173,10 @@
<grass name="r.patch"/>
<grass name="r.statistics"/>
</section>
<section label="Solar and irradiation model">
<grass name="r.sunmask.position"/>
<grass name="r.sunmask.date.time"/>
</section>
<section label="Terrain analysis">
<grass name="r.cost"/>
<grass name="r.drain"/>
Expand Down Expand Up @@ -198,6 +214,9 @@
<grass name="r.rescale"/>
</section>
<section label="Surface management">
<section label="Concentric circles">
<grass name="r.circle"/>
</section>
<section label="Create random points">
<grass name="r.random"/>
<grass name="r.random.cells"/>
Expand All @@ -206,6 +225,7 @@
<grass name="v.kernel"/>
<grass name="r.surf.fractal"/>
<grass name="r.surf.gauss"/>
<grass name="r.plane"/>
<grass name="r.surf.random"/>
</section>
<section label="Generate vector contour lines">
Expand Down Expand Up @@ -272,6 +292,7 @@
<grass name="v.centroids"/>
<grass name="v.build.polylines"/>
<grass name="v.segment"/>
<grass name="v.split"/>
<grass name="v.to.points"/>
<grass name="v.parallel"/>
<grass name="v.dissolve"/>
Expand Down Expand Up @@ -308,8 +329,11 @@
<grass name="v.distance"/>
</section>
<section label="Network analysis">
<grass name="v.net.nodes"/>
<grass name="v.net.alloc"/>
<grass name="v.net"/>
<grass name="v.net.nodes"/>
<grass name="v.net.visibility"/>
<grass name="v.net.path"/>
<grass name="v.net.iso"/>
<grass name="v.net.salesman"/>
<grass name="v.net.steiner"/>
Expand Down Expand Up @@ -339,7 +363,9 @@
<grass name="v.mkgrid.region"/>
</section>
<section label="Create points">
<grass name="v.in.db"/>
<grass name="v.random"/>
<grass name="v.perturb"/>
</section>
<section label="Manage training dataset">
<grass name="v.kcv"/>
Expand Down Expand Up @@ -408,6 +434,7 @@
<grass name="db.in.ogr"/>
</section>
<section label="Tables management">
<grass name="db.copy"/>
<grass name="v.db.addtable"/>
<grass name="v.db.droptable"/>
</section>
Expand Down
0 ...ss/modules-common/v.out.ogr.postgis.1.png → ...grass/modules-6.3/v.out.ogr.postgis.1.png
View file
File renamed without changes
0 ...ss/modules-common/v.out.ogr.postgis.2.png → ...grass/modules-6.3/v.out.ogr.postgis.2.png
View file
File renamed without changes
0 ...rass/modules-common/v.out.ogr.postgis.qgm → ...s/grass/modules-6.3/v.out.ogr.postgis.qgm
View file
File renamed without changes.
0 ...les-common/qgis.db.connect-login.pg.1.png → ...ass/modules-6.4/db.connect-login.pg.1.png
View file
File renamed without changes
4 changes: 2 additions & 2 deletions ...dules-common/qgis.db.connect-login.pg.qgm → ...grass/modules-6.4/db.connect-login.pg.qgm
View file
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set PostgreSQL DB connection" module="qgis.db.connect-login.pg.py">
<qgisgrassmodule label="Set PostgreSQL DB connection" module="db.connect-login.pg.py" manual="db.connect">
<option key="database" />
<option key="schema" />
<option key="host" />
<option key="port"/>
<option key="port" answer="5432"/>
<option key="user"/>
<option key="password"/>
</qgisgrassmodule>
Binary file added src/plugins/grass/modules-6.4/db.out.ogr.1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules-6.4/db.out.ogr.2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/plugins/grass/modules-6.4/db.out.ogr.qgm
View file
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
<option key="input" />
<file key="dns" type="new" />
<option key="format" />
<option key="db_table" />
</qgisgrassmodule>

0 comments on commit 1e8cd68

Please sign in to comment.