feat(CMYK): Convert new color to project color model

qgis · Aug 20, 2024 · c7120cf · c7120cf
1 parent eac7f1a
commit c7120cf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -864,6 +864,16 @@ QgsSymbol *QgsSymbol::defaultSymbol( Qgis::GeometryType geomType )
     s->setColor( QgsApplication::colorSchemeRegistry()->fetchRandomStyleColor() );
   }
 
+  const bool isCmyk = QgsProject::instance()->styleSettings() && QgsProject::instance()->styleSettings()->colorModel() == Qgis::ColorModel::Cmyk;
+  if ( s->color().spec() == QColor::Spec::Rgb && isCmyk )
+  {
+    s->setColor( s->color().toCmyk() );
+  }
+  else if ( s->color().spec() == QColor::Spec::Cmyk && !isCmyk )
+  {
+    s->setColor( s->color().toRgb() );
+  }
+
   return s.release();
 }
 

diff --git a/tests/src/python/test_qgssymbol.py b/tests/src/python/test_qgssymbol.py
@@ -1772,6 +1772,15 @@ def renderGeometry(self, symbol, geom):
 
         return image
 
+    def testDefaultSymbolColor(self):
+        s1 = QgsSymbol.defaultSymbol(Qgis.GeometryType.Point)
+        self.assertEqual(s1.color().spec(), QColor.Spec.Rgb)
+
+        self.assertTrue(QgsProject.instance().styleSettings())
+        QgsProject.instance().styleSettings().setColorModel(Qgis.ColorModel.Cmyk)
+        s1 = QgsSymbol.defaultSymbol(Qgis.GeometryType.Point)
+        self.assertEqual(s1.color().spec(), QColor.Spec.Cmyk)
+
 
 if __name__ == '__main__':
     unittest.main()