sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't disable band combo when only one band is present

Browse Source
This commit is contained in:
Nyall Dawson 2017-05-09 19:45:19 +10:00
parent 872cd13675
commit ea4143bbdc
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/raster/qgsrasterbandcombobox.cpp
View File

@ -25,7 +25,6 @@ QgsRasterBandComboBox::QgsRasterBandComboBox( QWidget *parent )
{
emit bandChanged( currentIndex() >= 0 ? currentData().toInt() : -1 );
} );
setEnabled( false );
}
QgsRasterLayer *QgsRasterBandComboBox::layer() const
@ -63,7 +62,6 @@ void QgsRasterBandComboBox::setLayer( QgsMapLayer *layer )
}
}
}
setEnabled( count() > 1 );
if ( count() > 0 )
setCurrentIndex( findData( oldBand ) >= 0 ? findData( oldBand ) : 0 );

9
tests/src/python/test_qgsrasterbandcombobox.py
View File

@ -35,11 +35,9 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
combo = QgsRasterBandComboBox()
self.assertFalse(combo.layer())
self.assertEqual(combo.currentBand(), -1)
self.assertFalse(combo.isEnabled())
combo.setShowNotSetOption(True)
self.assertEqual(combo.currentBand(), -1)
self.assertFalse(combo.isEnabled())
combo.setBand(11111)
self.assertEqual(combo.currentBand(), -1)
@ -58,14 +56,11 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
combo.setLayer(layer)
self.assertEqual(combo.layer(), layer)
self.assertEqual(combo.currentBand(), 1)
# only one choice, should be disabled
self.assertEqual(combo.count(), 1)
self.assertFalse(combo.isEnabled())
combo.setShowNotSetOption(True)
self.assertEqual(combo.currentBand(), 1)
self.assertEqual(combo.count(), 2)
self.assertTrue(combo.isEnabled())
combo.setBand(-1)
self.assertEqual(combo.currentBand(), -1)
combo.setBand(1)
@ -74,7 +69,6 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
combo.setShowNotSetOption(False)
self.assertEqual(combo.currentBand(), 1)
self.assertEqual(combo.count(), 1)
self.assertFalse(combo.isEnabled())
def testMultiBandRaster(self):
path = os.path.join(unitTestDataPath('raster'),
@ -89,19 +83,16 @@ class TestQgsRasterBandComboBox(unittest.TestCase):
self.assertEqual(combo.layer(), layer)
self.assertEqual(combo.currentBand(), 1)
self.assertEqual(combo.count(), 3)
self.assertTrue(combo.isEnabled())
combo.setBand(2)
self.assertEqual(combo.currentBand(), 2)
combo.setShowNotSetOption(True)
self.assertEqual(combo.currentBand(), 2)
self.assertEqual(combo.count(), 4)
self.assertTrue(combo.isEnabled())
combo.setShowNotSetOption(False)
self.assertEqual(combo.currentBand(), 2)
self.assertEqual(combo.count(), 3)
self.assertTrue(combo.isEnabled())
def testSignals(self):
path = os.path.join(unitTestDataPath('raster'),