Skip to content

Commit ea4143b

Browse files
committed
Don't disable band combo when only one band is present
1 parent 872cd13 commit ea4143b

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

src/gui/raster/qgsrasterbandcombobox.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ QgsRasterBandComboBox::QgsRasterBandComboBox( QWidget *parent )
2525
{
2626
emit bandChanged( currentIndex() >= 0 ? currentData().toInt() : -1 );
2727
} );
28-
setEnabled( false );
2928
}
3029

3130
QgsRasterLayer *QgsRasterBandComboBox::layer() const
@@ -63,7 +62,6 @@ void QgsRasterBandComboBox::setLayer( QgsMapLayer *layer )
6362
}
6463
}
6564
}
66-
setEnabled( count() > 1 );
6765

6866
if ( count() > 0 )
6967
setCurrentIndex( findData( oldBand ) >= 0 ? findData( oldBand ) : 0 );

tests/src/python/test_qgsrasterbandcombobox.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ def testNoLayer(self):
3535
combo = QgsRasterBandComboBox()
3636
self.assertFalse(combo.layer())
3737
self.assertEqual(combo.currentBand(), -1)
38-
self.assertFalse(combo.isEnabled())
3938

4039
combo.setShowNotSetOption(True)
4140
self.assertEqual(combo.currentBand(), -1)
42-
self.assertFalse(combo.isEnabled())
4341

4442
combo.setBand(11111)
4543
self.assertEqual(combo.currentBand(), -1)
@@ -58,14 +56,11 @@ def testOneBandRaster(self):
5856
combo.setLayer(layer)
5957
self.assertEqual(combo.layer(), layer)
6058
self.assertEqual(combo.currentBand(), 1)
61-
# only one choice, should be disabled
6259
self.assertEqual(combo.count(), 1)
63-
self.assertFalse(combo.isEnabled())
6460

6561
combo.setShowNotSetOption(True)
6662
self.assertEqual(combo.currentBand(), 1)
6763
self.assertEqual(combo.count(), 2)
68-
self.assertTrue(combo.isEnabled())
6964
combo.setBand(-1)
7065
self.assertEqual(combo.currentBand(), -1)
7166
combo.setBand(1)
@@ -74,7 +69,6 @@ def testOneBandRaster(self):
7469
combo.setShowNotSetOption(False)
7570
self.assertEqual(combo.currentBand(), 1)
7671
self.assertEqual(combo.count(), 1)
77-
self.assertFalse(combo.isEnabled())
7872

7973
def testMultiBandRaster(self):
8074
path = os.path.join(unitTestDataPath('raster'),
@@ -89,19 +83,16 @@ def testMultiBandRaster(self):
8983
self.assertEqual(combo.layer(), layer)
9084
self.assertEqual(combo.currentBand(), 1)
9185
self.assertEqual(combo.count(), 3)
92-
self.assertTrue(combo.isEnabled())
9386
combo.setBand(2)
9487
self.assertEqual(combo.currentBand(), 2)
9588

9689
combo.setShowNotSetOption(True)
9790
self.assertEqual(combo.currentBand(), 2)
9891
self.assertEqual(combo.count(), 4)
99-
self.assertTrue(combo.isEnabled())
10092

10193
combo.setShowNotSetOption(False)
10294
self.assertEqual(combo.currentBand(), 2)
10395
self.assertEqual(combo.count(), 3)
104-
self.assertTrue(combo.isEnabled())
10596

10697
def testSignals(self):
10798
path = os.path.join(unitTestDataPath('raster'),

0 commit comments

Comments
 (0)