Don't try to load missing cpt ramps, part 2

qgis · Jul 20, 2022 · a49f487 · a49f487
1 parent 51abf19
commit a49f487
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/python/core/auto_generated/qgscolorrampimpl.sip.in b/python/core/auto_generated/qgscolorrampimpl.sip.in
@@ -826,6 +826,7 @@ Returns the string identifier for QgsCptCityColorRamp.
     void loadPalette();
     bool hasMultiStops() const;
 
+
     QString fileName() const;
     bool loadFile();
     bool fileLoaded() const;

diff --git a/src/core/qgscolorrampimpl.cpp b/src/core/qgscolorrampimpl.cpp
@@ -1016,6 +1016,10 @@ QVariantMap QgsCptCityColorRamp::properties() const
   return map;
 }
 
+QString QgsCptCityColorRamp::fileNameForVariant( const QString &schema, const QString &variant )
+{
+  return QgsCptCityArchive::defaultBaseDir() + QDir::separator() + schema + variant + ".svg";
+}
 
 QString QgsCptCityColorRamp::fileName() const
 {

diff --git a/src/core/qgscolorrampimpl.h b/src/core/qgscolorrampimpl.h
@@ -773,6 +773,14 @@ class CORE_EXPORT QgsCptCityColorRamp : public QgsGradientColorRamp
     void loadPalette() { loadFile(); }
     bool hasMultiStops() const { return mMultiStops; }
 
+    /**
+     * Returns the source file name for a CPT \a schema and \a variant.
+     *
+     * \note Not available in Python bindings
+     * \since QGIS 3.28
+     */
+    static QString fileNameForVariant( const QString &schema, const QString &variant ) SIP_SKIP;
+
     QString fileName() const;
     bool loadFile();
     bool fileLoaded() const { return mFileLoaded; }

diff --git a/src/core/symbology/qgscptcityarchive.cpp b/src/core/symbology/qgscptcityarchive.cpp
@@ -1190,7 +1190,12 @@ QVector<QgsCptCityDataItem *> QgsCptCitySelectionItem::createChildren()
     }
     else
     {
-      // init item to test if is valid after loading file
+      const QString fileName = QgsCptCityColorRamp::fileNameForVariant( childPath, QString() );
+      if ( !QFile::exists( fileName ) )
+      {
+        continue;
+      }
+
       item = new QgsCptCityColorRampItem( this, childPath, childPath, QString(), true );
       if ( item->isValid() )
         children << item;