Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
timlinux committed Oct 6, 2011
2 parents 7e059af + f09417d commit 81541031766e87355155e923dc480c033c072017
Showing with 202 additions and 124 deletions.
  1. +1 −0 debian/changelog
  2. +1 −0 debian/libqgis{QGIS_ABI}.install
  3. +1 −1 doc/INSTALL.t2t
  4. +2 −2 doc/changelog.t2t
  5. BIN doc/qgis-download-stats.ods
  6. +1 −1 resources/customization.xml
  7. +23 −0 scripts/make_gource_video.sh
  8. +6 −2 src/analysis/network/qgsarcproperter.h
  9. +1 −0 src/analysis/network/qgsdistancearcproperter.cpp
  10. +0 −10 src/analysis/network/qgsgraph.cpp
  11. +2 −4 src/analysis/network/qgsgraph.h
  12. +5 −5 src/analysis/network/qgsgraphanalyzer.cpp
  13. +14 −5 src/analysis/network/qgsgraphbuilderintr.h
  14. +8 −4 src/analysis/network/qgsgraphdirector.h
  15. +1 −1 src/analysis/network/qgslinevectorlayerdirector.h
  16. +7 −0 src/app/qgsbrowserdockwidget.cpp
  17. +1 −1 src/browser/qgsbrowser.cpp
  18. +3 −3 src/core/qgsapplication.cpp
  19. +58 −38 src/core/qgscoordinatereferencesystem.cpp
  20. +7 −1 src/core/qgscoordinatetransform.cpp
  21. +1 −1 src/core/qgsrasterprojector.cpp
  22. +1 −1 src/core/raster/qgsrasterlayer.h
  23. +2 −2 src/core/raster/qgsrastertransparency.cpp
  24. +4 −0 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  25. +4 −0 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  26. +2 −2 src/mapserver/qgsprojectparser.cpp
  27. +2 −2 src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp
  28. +1 −1 src/plugins/georeferencer/qgsgeorefplugingui.h
  29. +2 −2 src/plugins/globe/globe_plugin.h
  30. +0 −1 src/plugins/roadgraph/roadgraphplugin.h
  31. +34 −29 src/plugins/roadgraph/shortestpathwidget.cpp
  32. +4 −2 src/providers/ogr/qgsogrprovider.cpp
  33. +1 −1 src/providers/postgres/qgspostgresconnection.cpp
  34. +1 −1 src/providers/postgres/qgspostgresconnection.h
  35. +1 −1 src/ui/qgsrasterlayerpropertiesbase.ui
@@ -8,6 +8,7 @@ qgis (1.8.0) UNRELEASED; urgency=low
* include internal pyspatialite in python-qgis
* update watch
* drop abi postfix from sqlanywhere plugin
* include network analysis library

-- Jürgen E. Fischer <jef@norbit.de> Thu, 29 Sep 2011 21:44:50 +0000

@@ -1,3 +1,4 @@
usr/lib/libqgis_core.so.{QGIS_ABI}
usr/lib/libqgis_gui.so.{QGIS_ABI}
usr/lib/libqgis_analysis.so.{QGIS_ABI}
usr/lib/libqgis_networkanalysis.so.{QGIS_ABI}
@@ -33,7 +33,7 @@ Building QGIS from source - step by step
%! PostProc(tex): '\\section' '\\newpage\\section'
%! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
%! PostProc(tex): NEWPAGE '\\newpage'
% Give alternating table rows different colours and use a smaller font in tables (\tiny)
% Give alternating table rows different colors and use a smaller font in tables (\tiny)
%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
%! encoding: iso-8859-1

@@ -81,7 +81,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
- Reduce top and side margins for attribute table dialog
- Remove the (hopefully) last SVN reference
- More svn version removal
- Added missing colour accessor/mutator/member from composerlegenditem header
- Added missing color accessor/mutator/member from composerlegenditem header
- Get rid of svn version stuff from release branch.
- Other workaround for Qt#5114 (fixes #3250, #3028, #2598)
- Try to make the histogram smoother
@@ -216,7 +216,7 @@ changed so we will just provide a bullet list of key new features here.

- Support for icons of plugins in the plugin manager dialog.
- Removed quickprint plugin - use easyprint plugin rather from plugin repo.
- Removed ogr convertor plugin - use 'save as' context menu rather.
- Removed ogr converter plugin - use 'save as' context menu rather.
-

==Printing==
Binary file not shown.
@@ -1935,7 +1935,7 @@
<widget class="QLabel" label="&lt;p align=&quot;right&quot;&gt;Full&lt;/p&gt;" objectName="textLabel4"/>
</widget>
<widget class="QGroupBox" label="" objectName="gboxCustomTransparency">
<widget class="QLabel" label="Transparency band" objectName="lblTransarent"/>
<widget class="QLabel" label="Transparency band" objectName="lblTransparent"/>
<widget class="QComboBox" label="" objectName="cboxTransparencyBand"/>
<widget class="QLabel" label="Transparent pixel list" objectName="label_2"/>
</widget>
@@ -0,0 +1,23 @@
#!/bin/bash

echo "A script to generate a source video progression"
echo "see http://woostuff.wordpress.com/2011/01/03/generating-a-gource-source-commit-history-visualization-for-qgis-quantum-gis/"
echo "Run it from the root directory e.g. scripts/$0"

gource --title "Quantum GIS" --logo images/icons/qgis-icon.png \
--hide filenames \
--date-format "%d, %B %Y" \
--seconds-per-day 0.05 \
--highlight-all-users \
--auto-skip-seconds 0.5 \
--file-idle-time 0 \
--max-files 999999999 \
--multi-sampling \
--stop-at-end \
--elasticity 0.1 \
-b ffffff \
--disable-progress \
--user-friction .2 \
--output-ppm-stream - | \
ffmpeg -an -threads 4 -y -b 3000K -vb 8000000 -r 60 -f image2pipe \
-vcodec ppm -i - -vcodec libx264 -vpre libx264-medium qgis-history.mp4
@@ -48,7 +48,11 @@ class ANALYSIS_EXPORT QgsArcProperter
/**
* calculate and return adge property
*/
virtual QVariant property( double distance, const QgsFeature& f ) const
{ return QVariant(); }
virtual QVariant property( double distance, const QgsFeature &f ) const
{
Q_UNUSED( distance );
Q_UNUSED( f );
return QVariant();
}
};
#endif //QGSEDGEPROPERTYH
@@ -14,5 +14,6 @@

QVariant QgsDistanceArcProperter::property( double distance, const QgsFeature& f ) const
{
Q_UNUSED( f );
return QVariant( distance );
}
@@ -107,16 +107,6 @@ int QgsGraphArc::outVertex() const
return mOut;
}

int QgsGraphArc::in() const
{
return mIn;
}

int QgsGraphArc::out() const
{
return mOut;
}

QgsGraphVertex::QgsGraphVertex( const QgsPoint& point )
: mCoordinate( point )
{
@@ -18,7 +18,7 @@
* Vertex is identified by its geographic coordinates (but you can add two vertex
* with unique coordinate), no additional properties it can not be assigned.
* Count the number of properties not limited along the arc. Graph may
* be have intsedentnye arcs.
* be have incidence arcs.
*
* \file qgsgraph.h
*/
@@ -38,7 +38,7 @@ class QgsGraphVertex;

/**
* \ingroup networkanalysis
* \class QgsGraphEdge
* \class QgsGraphArc
* \brief This class implement a graph edge
*/
class ANALYSIS_EXPORT QgsGraphArc
@@ -60,13 +60,11 @@ class ANALYSIS_EXPORT QgsGraphArc
/**
* return index of outgoing vertex
*/
int out() const;
int outVertex() const;

/**
* return index of incoming vertex
*/
int in() const;
int inVertex() const;

private:
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
// C++ standart includes
// C++ standard includes
#include <limits>

// QT includes
@@ -63,10 +63,10 @@ void QgsGraphAnalyzer::shortestpath( const QgsGraph* source, int startPointIdx,
const QgsGraphArc& arc = source->arc( *arcIt );
double cost = arc.property( criterionNum ).toDouble() + curCost;

if ( cost < result[ arc.in()].first )
if ( cost < result[ arc.inVertex()].first )
{
result[ arc.in()] = QPair< double, int >( cost, *arcIt );
not_begin.insert( cost, arc.in() );
result[ arc.inVertex()] = QPair< double, int >( cost, *arcIt );
not_begin.insert( cost, arc.inVertex() );
}
}
}
@@ -90,7 +90,7 @@ void QgsGraphAnalyzer::shortestpath( const QgsGraph* source, int startPointIdx,
{
const QgsGraphArc& arc = source->arc( result[i].second );

treeResult->addArc( source2result[ arc.out()], source2result[ i ],
treeResult->addArc( source2result[ arc.outVertex()], source2result[ i ],
arc.properties() );
}
}
@@ -79,12 +79,15 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface

/**
* add vertex
* @param id vertex identyficator
* @param id vertex identifier
* @param pt vertex coordinate
* @note id and pt is a redundant interface. You can use coordinates or id for vertex identyfy
* @note id and pt are redundant. You can use pt or id to identify the vertex
*/
virtual void addVertex( int id, const QgsPoint& pt )
{ }
virtual void addVertex( int id, const QgsPoint &pt )
{
Q_UNUSED( id );
Q_UNUSED( pt );
}

/**
* add arc
@@ -96,7 +99,13 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
* @note pt1id, pt1 and pt2id, pt2 is a redundant interface. You can use vertex coordinates or their identificators.
*/
virtual void addArc( int pt1id, const QgsPoint& pt1, int pt2id, const QgsPoint& pt2, const QVector< QVariant >& properties )
{ }
{
Q_UNUSED( pt1id );
Q_UNUSED( pt1 );
Q_UNUSED( pt2id );
Q_UNUSED( pt2 );
Q_UNUSED( properties );
}

private:
QgsCoordinateReferenceSystem mCrs;
@@ -55,10 +55,14 @@ class ANALYSIS_EXPORT QgsGraphDirector : public QObject
*
* @note if tiedPoints[i]==QgsPoint(0.0,0.0) then tied failed.
*/
virtual void makeGraph( QgsGraphBuilderInterface* builder,
const QVector< QgsPoint >& additionalPoints,
QVector< QgsPoint>& tiedPoints ) const
{}
virtual void makeGraph( QgsGraphBuilderInterface *builder,
const QVector< QgsPoint > &additionalPoints,
QVector< QgsPoint > &tiedPoints ) const
{
Q_UNUSED( builder );
Q_UNUSED( additionalPoints );
Q_UNUSED( tiedPoints );
}

void addProperter( QgsArcProperter* prop )
{
@@ -31,7 +31,7 @@ class QgsVectorLayer;
* \class QgsLineVectorLayerDirector
* \brief Determine making the graph from vector line layer
*/
class QgsLineVectorLayerDirector : public QgsGraphDirector
class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
{
public:
/**
@@ -1,5 +1,6 @@
#include "qgsbrowserdockwidget.h"

#include <QHeaderView>
#include <QTreeView>
#include <QMenu>
#include <QSettings>
@@ -56,6 +57,7 @@ QgsBrowserDockWidget::QgsBrowserDockWidget( QWidget * parent ) :
connect( mBrowserView, SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showContextMenu( const QPoint & ) ) );
//connect( mBrowserView, SIGNAL( clicked( const QModelIndex& ) ), this, SLOT( itemClicked( const QModelIndex& ) ) );
connect( mBrowserView, SIGNAL( doubleClicked( const QModelIndex& ) ), this, SLOT( itemClicked( const QModelIndex& ) ) );

}

void QgsBrowserDockWidget::showEvent( QShowEvent * e )
@@ -65,6 +67,11 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
{
mModel = new QgsBrowserModel( mBrowserView );
mBrowserView->setModel( mModel );

// provide a horizontal scroll bar instead of using ellipse (...) for longer items
mBrowserView->setTextElideMode( Qt::ElideNone );
mBrowserView->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
mBrowserView->header()->setStretchLastSection( false );
}

QDockWidget::showEvent( e );
@@ -52,7 +52,7 @@ QgsBrowser::QgsBrowser( QWidget *parent, Qt::WFlags flags )
mModel = new QgsBrowserModel( treeView );
treeView->setModel( mModel );

// Last expanded is stored, dont cover whole height with file system
// Last expanded is stored, don't cover whole height with file system
//treeView->expand( mModel->index(0,0) );

connect( treeView, SIGNAL( clicked( const QModelIndex& ) ), this, SLOT( itemClicked( const QModelIndex& ) ) );
@@ -33,8 +33,8 @@

#include "qgsconfig.h"

#include <gdal.h>
#include <ogr_api.h>
#include <gdal_priv.h>
#include <cpl_conv.h> // for setting gdal options

QObject * QgsApplication::mFileOpenEventReceiver;
@@ -68,7 +68,7 @@ QStringList QgsApplication::mGdalSkipList;
QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled, QString customConfigPath )
: QApplication( argc, argv, GUIenabled )
{
init( customConfigPath ); //initi can also be called directly by e.g. unit tests that dont inherit QApplication.
init( customConfigPath ); // init can also be called directly by e.g. unit tests that don't inherit QApplication.
}
void QgsApplication::init( QString customConfigPath )
{
@@ -745,5 +745,5 @@ void QgsApplication::applyGdalSkippedDrivers()
QgsDebugMsg( "Gdal Skipped driver list set to:" );
QgsDebugMsg( myDriverList );
CPLSetConfigOption( "GDAL_SKIP", myDriverList.toUtf8() );
GetGDALDriverManager()->AutoSkipDrivers();
GDALAllRegister(); //to update driver list and skip missing ones
}

0 comments on commit 8154103

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