Hookup initial marker item in registry

qgis · Aug 5, 2020 · fe5b423 · fe5b423
1 parent b0e2a8b
commit fe5b423
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 7 deletions.
diff --git a/python/core/auto_generated/annotations/qgsannotationitem.sip.in b/python/core/auto_generated/annotations/qgsannotationitem.sip.in
@@ -76,7 +76,8 @@ class QgsMarkerItem : QgsAnnotationItem
 
     virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
 
-    static QgsMarkerItem *create( QDomElement &element, const QgsReadWriteContext &context ) /Factory/;
+    static QgsMarkerItem *create() /Factory/;
+    static QgsMarkerItem *createFromElement( const QDomElement &element, const QgsReadWriteContext &context ) /Factory/;
 
     virtual QgsMarkerItem *clone() /Factory/;
 

diff --git a/python/core/auto_generated/qgsapplication.sip.in b/python/core/auto_generated/qgsapplication.sip.in
@@ -737,6 +737,13 @@ Returns the application's callout registry, used for managing callout types.
 Returns the application's layout item registry, used for layout item types.
 
 .. versionadded:: 3.0
+%End
+
+    static QgsAnnotationItemRegistry *annotationItemRegistry() /KeepReference/;
+%Docstring
+Returns the application's annotation item registry, used for annotation item types.
+
+.. versionadded:: 3.12
 %End
 
     static QgsGpsConnectionRegistry *gpsConnectionRegistry() /KeepReference/;

diff --git a/src/core/annotations/qgsannotationitem.cpp b/src/core/annotations/qgsannotationitem.cpp
@@ -72,7 +72,12 @@ bool QgsMarkerItem::writeXml( QDomElement &element, QDomDocument &document, cons
   return true;
 }
 
-QgsMarkerItem *QgsMarkerItem::create( QDomElement &element, const QgsReadWriteContext &context )
+QgsMarkerItem *QgsMarkerItem::create()
+{
+  return new QgsMarkerItem( QgsPointXY(), QgsCoordinateReferenceSystem() );
+}
+
+QgsMarkerItem *QgsMarkerItem::createFromElement( const QDomElement &element, const QgsReadWriteContext &context )
 {
   const double x = element.attribute( QStringLiteral( "x" ) ).toDouble();
   const double y = element.attribute( QStringLiteral( "y" ) ).toDouble();

diff --git a/src/core/annotations/qgsannotationitem.h b/src/core/annotations/qgsannotationitem.h
@@ -93,7 +93,8 @@ class CORE_EXPORT QgsMarkerItem : public QgsAnnotationItem
     QString type() const override;
     void render( QgsRenderContext &context, QgsFeedback *feedback ) override;
     bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const override;
-    static QgsMarkerItem *create( QDomElement &element, const QgsReadWriteContext &context ) SIP_FACTORY;
+    static QgsMarkerItem *create() SIP_FACTORY;
+    static QgsMarkerItem *createFromElement( const QDomElement &element, const QgsReadWriteContext &context ) SIP_FACTORY;
 
     QgsMarkerItem *clone() override SIP_FACTORY;
 

diff --git a/src/core/annotations/qgsannotationitemregistry.cpp b/src/core/annotations/qgsannotationitemregistry.cpp
@@ -15,6 +15,8 @@
  ***************************************************************************/
 
 #include "qgsannotationitemregistry.h"
+#include "qgsannotationitem.h"
+#include <QDomElement>
 
 QgsAnnotationItemRegistry::QgsAnnotationItemRegistry( QObject *parent )
   : QObject( parent )
@@ -31,6 +33,9 @@ bool QgsAnnotationItemRegistry::populate()
   if ( !mMetadata.isEmpty() )
     return false;
 
+  mMetadata.insert( QStringLiteral( "marker" ), new QgsAnnotationItemMetadata( QStringLiteral( "marker" ), QObject::tr( "Marker" ), QObject::tr( "Markers" ),
+                    QgsMarkerItem::create, QgsMarkerItem::createFromElement ) );
+
   return true;
 }
 
@@ -57,6 +62,15 @@ QgsAnnotationItem *QgsAnnotationItemRegistry::createItem( const QString &type )
   return mMetadata[type]->createItem();
 }
 
+QgsAnnotationItem *QgsAnnotationItemRegistry::createItem( const QDomElement &element, const QgsReadWriteContext &context ) const
+{
+  const QString type = element.attribute( QStringLiteral( "type" ) );
+  if ( !mMetadata.contains( type ) )
+    return nullptr;
+
+  return mMetadata[type]->createItem( element, context );
+}
+
 QMap<QString, QString> QgsAnnotationItemRegistry::itemTypes() const
 {
   QMap<QString, QString> types;

diff --git a/src/core/annotations/qgsannotationlayer.cpp b/src/core/annotations/qgsannotationlayer.cpp
@@ -17,6 +17,8 @@
 #include "qgsannotationlayer.h"
 #include "qgsannotationlayerrenderer.h"
 #include "qgsannotationitem.h"
+#include "qgsannotationitemregistry.h"
+#include "qgsapplication.h"
 #include "qgslogger.h"
 #include <QUuid>
 
@@ -113,11 +115,10 @@ bool QgsAnnotationLayer::readXml( const QDomNode &layerNode, QgsReadWriteContext
   {
     QDomElement itemElement = items.at( i ).toElement();
     const QString id = itemElement.attribute( QStringLiteral( "id" ) );
-    const QString type = itemElement.attribute( QStringLiteral( "type" ) );
-    if ( type == "marker" )
+    std::unique_ptr< QgsAnnotationItem > item( QgsApplication::annotationItemRegistry()->createItem( itemElement, context ) );
+    if ( item )
     {
-      std::unique_ptr< QgsMarkerItem > marker( QgsMarkerItem::create( itemElement, context ) );
-      mItems.insert( id, marker.release() );
+      mItems.insert( id, item.release() );
     }
   }
 

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -19,6 +19,7 @@
 #include "qgsdataitemproviderregistry.h"
 #include "qgsexception.h"
 #include "qgsgeometry.h"
+#include "qgsannotationitemregistry.h"
 #include "qgslayoutitemregistry.h"
 #include "qgslogger.h"
 #include "qgsproject.h"
@@ -2172,6 +2173,11 @@ QgsLayoutItemRegistry *QgsApplication::layoutItemRegistry()
   return members()->mLayoutItemRegistry;
 }
 
+QgsAnnotationItemRegistry *QgsApplication::annotationItemRegistry()
+{
+  return members()->mAnnotationItemRegistry;
+}
+
 QgsGpsConnectionRegistry *QgsApplication::gpsConnectionRegistry()
 {
   return members()->mGpsConnectionRegistry;
@@ -2362,6 +2368,12 @@ QgsApplication::ApplicationMembers::ApplicationMembers()
     mAnnotationRegistry = new QgsAnnotationRegistry();
     profiler->end();
   }
+  {
+    profiler->start( tr( "Setup annotation item registry" ) );
+    mAnnotationItemRegistry = new QgsAnnotationItemRegistry();
+    mAnnotationItemRegistry->populate();
+    profiler->end();
+  }
   {
     profiler->start( tr( "Setup 3D symbol registry" ) );
     m3DSymbolRegistry = new Qgs3DSymbolRegistry();
@@ -2422,6 +2434,7 @@ QgsApplication::ApplicationMembers::~ApplicationMembers()
   delete mProcessingRegistry;
   delete mProjectStorageRegistry;
   delete mPageSizeRegistry;
+  delete mAnnotationItemRegistry;
   delete mLayoutItemRegistry;
   delete mRasterRendererRegistry;
   delete mRendererRegistry;

diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -26,6 +26,7 @@
 
 class Qgs3DRendererRegistry;
 class QgsActionScopeRegistry;
+class QgsAnnotationItemRegistry;
 class QgsRuntimeProfiler;
 class QgsTaskManager;
 class QgsFieldFormatterRegistry;
@@ -682,6 +683,12 @@ class CORE_EXPORT QgsApplication : public QApplication
      */
     static QgsLayoutItemRegistry *layoutItemRegistry() SIP_KEEPREFERENCE;
 
+    /**
+     * Returns the application's annotation item registry, used for annotation item types.
+     * \since QGIS 3.12
+     */
+    static QgsAnnotationItemRegistry *annotationItemRegistry() SIP_KEEPREFERENCE;
+
     /**
      * Returns the application's GPS connection registry, used for managing GPS connections.
      * \since QGIS 3.0
@@ -963,6 +970,7 @@ class CORE_EXPORT QgsApplication : public QApplication
       QgsCalloutRegistry *mCalloutRegistry = nullptr;
       QgsTaskManager *mTaskManager = nullptr;
       QgsLayoutItemRegistry *mLayoutItemRegistry = nullptr;
+      QgsAnnotationItemRegistry *mAnnotationItemRegistry = nullptr;
       QgsUserProfileManager *mUserConfigManager = nullptr;
       QgsBookmarkManager *mBookmarkManager = nullptr;
       QgsStyleModel *mStyleModel = nullptr;

diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
@@ -87,6 +87,7 @@ ENDMACRO (ADD_QGIS_TEST)
 
 SET(TESTS
  testqgs25drenderer.cpp
+ testqgsannotationitem.cpp
  testqgsapplication.cpp
  testqgsauthcrypto.cpp
  testqgsauthcertutils.cpp