sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,555 Commits 81 Branches 277 Tags
Commit Graph

22555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen E. Fischer
a343cb716b remove duplicate license 2014-04-02 23:50:20 +02:00
Martin Dobias
d3db42d91f Merge pull request #1287 from simonsonc/reset-model 
Use begin/endResetModel instead of reset
 2014-04-02 09:50:58 +02:00
Etienne Tourigny
bc40ab69c9 Merge pull request #1288 from simonsonc/qvariant-qcolor 
Use QColor instead of Qt::GlobalColor in item data
 2014-04-01 23:11:57 -03:00
Carl Simonson
6ebd9a8b10 Use QColor instead of Qt::GlobalColor in item data 
The QVariant constructor that takes a Qt::GlobalColor is removed in Qt 5.
It is actually a kind of special case in Qt 4 anyway. Fix the uses of this
by constructing a QColor and using that instead.
 2014-04-01 20:50:44 -05:00
Carl Simonson
29c8bc5375 Use begin/endResetModel instead of reset 
Qt 4.6 introduced a better way of resetting models with beginResetModel()/
endResetModel(). Call beginResetModel() before resetting internal data
structures, and then endResetModel() when finished. beginResetModel()
followed by endResetModel() is the same as calling reset().

Note: reset() is deprecated and is removed in Qt 5.
 2014-04-01 19:59:39 -05:00
Nyall Dawson
2b3108f9ae Fix high cpu usage with win32 builds when using shapes in composer (fix #9933, #9957, #9734) 2014-04-02 11:24:40 +11:00
Borys Jurgiel
d3985601b3 Merge branch 'pluginmanager_votes' 2014-04-01 16:54:09 +02:00
Marco Hugentobler
9eb4bb6b5b [FEATURE:] Consider maptip in GetFeatureInfo 2014-04-01 16:41:57 +02:00
Borys Jurgiel
3b198d9000 [FEATURE] [Plugin Manager] Voting for plugins from Plugin Manager 2014-04-01 16:35:28 +02:00
Borys Jurgiel
298b1d5882 [Plugin Manager] Switch the plugin details browser from QTextBrowser to QWebView 2014-04-01 16:35:28 +02:00
Martin Dobias
1c3b5e4d6d Decoration grid: fix symbol sizes + default cross size 2014-04-01 13:38:11 +02:00
Martin Dobias
1b4c8b66af Do not render grid annotation if the lines/markers would be extremely dense 
Otherwise drawing of huge amount of lines/markers can lock GUI
 2014-04-01 13:27:28 +02:00
Martin Dobias
434574eeb0 Merge pull request #1283 from simonsonc/rename-accept-hover-events 
Rename setAcceptsHoverEvents
 2014-04-01 11:35:55 +02:00
Carl Simonson
d969fb385c Rename setAcceptsHoverEvents 
setAcceptsHoverEvents was obsoleted in place of setAcceptHoverEvent in
Qt 4.4. They behave the same.
 2014-03-31 20:14:58 -05:00
Martin Dobias
b60794e0d1 Fix #9923 (broken arrow symbol) 2014-03-31 23:55:09 +02:00
volaya
7e209b9b96 Merge pull request #1279 from pka/grass7 
[FEATURE] (Processing) Initial Grass 7 support
 2014-03-31 23:47:06 +02:00
Victor Olaya
6852f9e3c0 [processing] added new script example (contributed by Michael Douchin) 2014-03-31 23:43:03 +02:00
Victor Olaya
8792bdcf12 [processing] disable excesive info reporting from otb provider 2014-03-31 23:43:02 +02:00
Juergen E. Fischer
4619246f54 fix regression992 test 2014-03-31 23:07:12 +02:00
Alexander Bruy
1c27ee3198 [processing] handle same memory error in another algorithm 2014-03-31 19:18:58 +03:00
alexbruy
d3b4a8f5de Merge pull request #1280 from anitagraser/patch-1 
[processing] added error handling for too big rasters
 2014-03-31 19:16:05 +03:00
Werner Macho
a191d5bcb6 Merge pull request #1281 from marcelosoaressouza/translation_pt_BR 
New Translations to pt_BR
 2014-03-31 16:10:04 +02:00
Martin Dobias
3aedeff087 Merge pull request #1277 from simonsonc/mime-format 
Replace deprecated provides() with hasFormat()
 2014-03-31 16:04:04 +02:00
Marcelo Soares Souza
45ac9f9340 New Translations to pt_BR 2014-03-31 10:53:36 -03:00
anitagraser
9ef91a222c added error handling for too big rasters 
I ran into memory problems with big rasters. Now the error message points the user to this potential error source.
 2014-03-31 15:45:26 +02:00
Werner Macho
04d7169e0e [TRANSUP] nb by James 
Signed-off-by: Werner Macho <werner.macho@gmail.com>
 2014-03-31 14:57:12 +02:00
mhugent
8f938dd20a Merge pull request #1267 from mwa/fix_8298_crs_select 
Fix #8298 ignored first selection in projection selector
 2014-03-31 08:03:12 +02:00
Juergen E. Fischer
528d70fbc6 globe: switch back to QgsMapRenderer 2014-03-30 22:54:23 +02:00
Markus Neteler
72457b331f [FEATURE] (Processing) Initial Grass 7 support 2014-03-30 20:58:11 +02:00
Juergen E. Fischer
c4996bb18c fix debian packaging 2014-03-30 12:34:52 +02:00
Werner Macho
3dc2d8c0ea typo in assigning values, fixes #9597 
Signed-off-by: Werner Macho <werner.macho@gmail.com>
 2014-03-29 23:02:36 +01:00
Juergen E. Fischer
0693fe93ee fix some tests crashes, fix some tests and some mtr updates 2014-03-29 17:55:29 +01:00
Juergen E. Fischer
480ae45f94 remove QgsMapCanvas.useImageToRender in db_manager (fixes #9942) 2014-03-29 15:40:13 +01:00
Juergen E. Fischer
3e4e9e13d9 fix redirected wms capabilities requests 2014-03-29 14:31:36 +01:00
Carl Simonson
3e3f30a304 Replace deprecated provides() with hasFormat() 
QDropEvent::provides() has been deprecated from the move from Qt 3 to Qt 4.
Replace this instance with the hasFormat() method on the mimeData instance.
 2014-03-28 23:24:34 -05:00
Martin Dobias
fe39578eae Added python bindings for QgsMapRendererJob + subclasses and QgsMapRendererCache 2014-03-28 15:35:43 +01:00
Martin Dobias
530b5fd5ce Fix #9918 (enable add symbol layer also when selection is not on symbol) 2014-03-28 14:37:21 +01:00
Radim Blazek
748ff8b2b9 missing python plugins menu/actions objectName 2014-03-28 13:31:41 +01:00
Martin Dobias
5a31481635 Merge pull request #1276 from anitagraser/master 
new master splash from #viennacodesprint14
 2014-03-28 12:33:41 +01:00
Jürgen Fischer
c324895cc1 Merge pull request #1275 from sebastic/arm 
Support building QGIS on ARM (#9917)
 2014-03-28 12:06:32 +01:00
Martin Dobias
a82aeb030c Fix #9916 (inconsistent step size) 2014-03-28 12:03:06 +01:00
anitagraser
7b7ffb2784 new master splash from #viennacodesprint14 2014-03-28 11:43:28 +01:00
Alexander Bruy
d19ccb7d6c [processing] don't close dialog if execution fails (fix #9893) 2014-03-28 12:33:11 +02:00
Martin Dobias
4ff930e775 Merge pull request #1274 from simonsonc/explicit-link 
Be explicit with Qt link libraries
 2014-03-28 11:17:04 +01:00
Alexander Bruy
2b458e8895 [processing] show alforithm and help authors in Help tab (fix #8917) 2014-03-28 12:12:18 +02:00
Alexander Bruy
cd9aae70b6 fix error when copying gdalinfo output to clipboard (fix #9882) 2014-03-28 12:12:18 +02:00
Alexander Bruy
8c97462b08 add option to load result to canvas in Heatmap plugin (fix #6645) 2014-03-28 12:12:18 +02:00
Martin Dobias
e846a8986e Merge remote-tracking branch 'simonsonc/rename-subtract' 2014-03-28 10:48:59 +01:00
Bas Couwenberg
3d44c5934a Disable features on ARM. 
Building QGIS on ARM produces the error:

sip: qgis/python/core/qgsclipper.sip:44: \
QgsClipper::trimFeature() unsupported function argument type - provide %MethodCode and a C++ signature

For the Android builds this was fixed in commit 2cc684793ceb29d8600d71564fb38f92c998f588.

This patch adapts the Android fix, by disabling the SIP features on all ARM systems.

Bug-Debian: http://bugs.debian.org/737814
 2014-03-28 10:41:22 +01:00
Bas Couwenberg
7db6ae5412 Fix qreal vs double. 
In qt4 on arm architectures qreal is defined as float while on other
architectures it is defined as double. This can cause problems if qreal
and double are carelessly mixed.

In this particular case the problem is that qMin/qMax are templates defined
to take two parameters of the same type. If two different types are passed
in then C++ can't resolve what type the template parameter should be and
bails out. The fix is simple, typecast one of the parameters so they
match.

Author: Peter Michael Green <plugwash@debian.org>
Bug-Debian: http://bugs.debian.org/737814
 2014-03-28 10:39:35 +01:00