Skip to content

Commit 0423390

Browse files
author
brushtyler
committed
applied patch attached to #2932 to improve build overviews (gdaltools).
Thanks to Duarte! git-svn-id: http://svn.osgeo.org/qgis/trunk@14105 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 64e028b commit 0423390

File tree

3 files changed

+116
-4
lines changed

3 files changed

+116
-4
lines changed

‎python/plugins/GdalTools/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def name():
2222
def description():
2323
return "Integrate gdal tools into qgis"
2424
def version():
25-
return "Version 1.2.9"
25+
return "Version 1.2.10"
2626
def qgisMinimumVersion():
2727
return "1.0"
2828
def classFactory(iface):

‎python/plugins/GdalTools/tools/doOverview.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ def __init__( self, iface ):
3232
(self.inputLayerCombo, [SIGNAL("currentIndexChanged(int)"), SIGNAL("editTextChanged(const QString &)")] ),
3333
( self.algorithmCombo, SIGNAL( "currentIndexChanged( int )" ), self.algorithmCheck ),
3434
( self.levelsEdit, SIGNAL( "textChanged( const QString & )" ) ),
35-
( self.roModeCheck, SIGNAL( "stateChanged( int )" ) )
35+
( self.roModeCheck, SIGNAL( "stateChanged( int )" ) ),
36+
( self.rrdCheck, SIGNAL( "stateChanged(int)" ) ),
37+
( self.jpegQualitySpin, SIGNAL( "valueChanged (int)" ) ),
38+
( self.jpegQualityContainer, None, self.tiffjpegCheck),
39+
( self.jpegQualityContainer, None, None, "1.7.0"), #only show for GDAL >=1.7.0
40+
( self.cleanCheck, SIGNAL( "stateChanged(int)" ), None, "1.7.0" ) #only show for GDAL >=1.7.0
3641
]
3742
)
3843

@@ -96,6 +101,14 @@ def getArguments( self ):
96101
arguments << self.resampling_method[self.algorithmCombo.currentIndex()]
97102
if self.roModeCheck.isChecked():
98103
arguments << "-ro"
104+
if self.rrdCheck.isChecked():
105+
arguments << "--config" << "USE_RRD" << "YES"
106+
if self.tiffjpegCheck.isChecked():
107+
arguments << "--config" << "COMPRESS_OVERVIEW" << "JPEG" << "--config" << "PHOTOMETRIC_OVERVIEW" << "YCBCR" << "--config" << "INTERLEAVE_OVERVIEW" << "PIXEL"
108+
if self.jpegQualityContainer.isVisible():
109+
arguments << "--config" << "JPEG_QUALITY_OVERVIEW" << self.jpegQualitySpin.cleanText()
110+
if self.cleanCheck.isChecked():
111+
arguments << "-clean"
99112
if self.isBatchEnabled():
100113
return arguments
101114

‎python/plugins/GdalTools/tools/widgetOverview.ui

Lines changed: 101 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<x>0</x>
88
<y>0</y>
99
<width>376</width>
10-
<height>205</height>
10+
<height>323</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
14+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
@@ -119,13 +119,112 @@
119119
</item>
120120
</layout>
121121
</item>
122+
<item>
123+
<widget class="QCheckBox" name="cleanCheck">
124+
<property name="toolTip">
125+
<string>Remove all overviews.</string>
126+
</property>
127+
<property name="text">
128+
<string>Clean</string>
129+
</property>
130+
</widget>
131+
</item>
122132
<item>
123133
<widget class="QCheckBox" name="roModeCheck">
134+
<property name="toolTip">
135+
<string>In order to generate external overview (for GeoTIFF especially).</string>
136+
</property>
124137
<property name="text">
125138
<string>Open in read-only mode</string>
126139
</property>
127140
</widget>
128141
</item>
142+
<item>
143+
<widget class="QCheckBox" name="tiffjpegCheck">
144+
<property name="toolTip">
145+
<string>Create external overviews in TIFF format, compressed using JPEG.</string>
146+
</property>
147+
<property name="text">
148+
<string>Overviews in TIFF format with JPEG compression</string>
149+
</property>
150+
</widget>
151+
</item>
152+
<item>
153+
<widget class="QFrame" name="jpegQualityContainer">
154+
<property name="enabled">
155+
<bool>true</bool>
156+
</property>
157+
<property name="sizePolicy">
158+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
159+
<horstretch>0</horstretch>
160+
<verstretch>0</verstretch>
161+
</sizepolicy>
162+
</property>
163+
<property name="minimumSize">
164+
<size>
165+
<width>0</width>
166+
<height>25</height>
167+
</size>
168+
</property>
169+
<layout class="QHBoxLayout" name="horizontalLayout_2">
170+
<property name="leftMargin">
171+
<number>24</number>
172+
</property>
173+
<property name="topMargin">
174+
<number>0</number>
175+
</property>
176+
<property name="bottomMargin">
177+
<number>0</number>
178+
</property>
179+
<item>
180+
<widget class="QLabel" name="jpegQualityLabel">
181+
<property name="toolTip">
182+
<string>For JPEG compressed external overviews,
183+
the JPEG quality can be set.</string>
184+
</property>
185+
<property name="text">
186+
<string>JPEG Quality (1-100):</string>
187+
</property>
188+
</widget>
189+
</item>
190+
<item>
191+
<widget class="QSpinBox" name="jpegQualitySpin">
192+
<property name="enabled">
193+
<bool>true</bool>
194+
</property>
195+
<property name="sizePolicy">
196+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
197+
<horstretch>0</horstretch>
198+
<verstretch>0</verstretch>
199+
</sizepolicy>
200+
</property>
201+
<property name="toolTip">
202+
<string>For JPEG compressed external overviews,
203+
the JPEG quality can be set.</string>
204+
</property>
205+
<property name="maximum">
206+
<number>100</number>
207+
</property>
208+
<property name="value">
209+
<number>80</number>
210+
</property>
211+
</widget>
212+
</item>
213+
</layout>
214+
</widget>
215+
</item>
216+
<item>
217+
<widget class="QCheckBox" name="rrdCheck">
218+
<property name="toolTip">
219+
<string>Alternate overview format using Erdas Imagine format,
220+
placing the overviews in an associated .aux file
221+
suitable for direct use with Imagine,ArcGIS, GDAL.</string>
222+
</property>
223+
<property name="text">
224+
<string>Use Imagine format (.aux file)</string>
225+
</property>
226+
</widget>
227+
</item>
129228
<item>
130229
<widget class="QProgressBar" name="progressBar"/>
131230
</item>

0 commit comments

Comments
 (0)