Fix model setData implementation, allow renaming symbols through model

nyalldawson · nyalldawson · commit 010c2f455ce0 · 2018-09-12T16:22:44.000+10:00
diff --git a/src/core/symbology/qgsstylemodel.cpp b/src/core/symbology/qgsstylemodel.cpp
@@ -150,7 +150,9 @@ bool QgsStyleModel::setData( const QModelIndex &index, const QVariant &value, in
                            : mRampNames.at( index.row() - mSymbolNames.size() );
       const QString newName = value.toString();
 
-      return true;
+      return isColorRamp
+             ? mStyle->renameColorRamp( name, newName )
+             : mStyle->renameSymbol( name, newName );
     }
 
     case Tags:
diff --git a/tests/src/python/test_qgsstylemodel.py b/tests/src/python/test_qgsstylemodel.py
@@ -23,7 +23,7 @@
                        QgsStyle,
                        QgsStyleProxyModel)
 from qgis.testing import start_app, unittest
-from qgis.PyQt.QtCore import Qt, QSize
+from qgis.PyQt.QtCore import Qt, QSize, QModelIndex
 from qgis.PyQt.QtGui import QColor
 
 start_app()
@@ -758,6 +758,33 @@ def testIconSize(self):
             self.assertEqual(icon.actualSize(QSize(225, 225)), QSize(200, 180))
             model.setProperty('icon_sizes', None)
 
+    def testSetData(self):
+        """
+        Test model set data
+        """
+        style = QgsStyle()
+        style.createMemoryDatabase()
+
+        symbol_a = createMarkerSymbol()
+        symbol_a.setColor(QColor(255, 10, 10))
+        self.assertTrue(style.addSymbol('a', symbol_a, True))
+        ramp_a = QgsLimitedRandomColorRamp(5)
+        self.assertTrue(style.addColorRamp('ramp a', ramp_a, True))
+
+        model = QgsStyleModel(style)
+        self.assertEqual(model.rowCount(), 2)
+
+        self.assertEqual(style.symbolNames(), ['a'])
+
+        self.assertFalse(model.setData(QModelIndex(), 'b', Qt.EditRole))
+        self.assertFalse(model.setData(model.index(0, 1), 'b', Qt.EditRole))
+        self.assertTrue(model.setData(model.index(0, 0), 'new symbol name', Qt.EditRole))
+        self.assertEqual(model.data(model.index(0, 0), Qt.DisplayRole), 'new symbol name')
+        self.assertEqual(style.symbolNames(), ['new symbol name'])
+        self.assertTrue(model.setData(model.index(1, 0), 'ramp new name', Qt.EditRole))
+        self.assertEqual(model.data(model.index(1, 0), Qt.DisplayRole), 'ramp new name')
+        self.assertEqual(style.colorRampNames(), ['ramp new name'])
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,9 @@ bool QgsStyleModel::setData( const QModelIndex &index, const QVariant &value, in`
`150`	`150`	`: mRampNames.at( index.row() - mSymbolNames.size() );`
`151`	`151`	`const QString newName = value.toString();`
`152`	`152`
`153`		`- return true;`
	`153`	`+ return isColorRamp`
	`154`	`+ ? mStyle->renameColorRamp( name, newName )`
	`155`	`+ : mStyle->renameSymbol( name, newName );`
`154`	`156`	`}`
`155`	`157`
`156`	`158`	`case Tags:`