Remove some more redundant tests, add sip subclassing

qgis · Jan 8, 2018 · d372799 · d372799
1 parent 56f1c20
commit d372799
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 285 deletions.
diff --git a/python/core/composer/qgslayoutmanager.sip b/python/core/composer/qgslayoutmanager.sip
@@ -139,13 +139,6 @@ Returns a DOM element representing the state of the manager.
 %Docstring
 Saves the composition with matching ``name`` in template format.
 Returns true if save was successful.
-%End
-
-    QgsComposition *duplicateComposition( const QString &name, const QString &newName );
-%Docstring
-Duplicates an existing composition from the manager. The new
-composition will automatically be stored in the manager.
-Returns new composition if duplication was successful.
 %End
 
     QgsMasterLayoutInterface *duplicateLayout( const QgsMasterLayoutInterface *layout, const QString &newName );

diff --git a/python/core/layout/qgsmasterlayoutinterface.sip b/python/core/layout/qgsmasterlayoutinterface.sip
@@ -7,6 +7,11 @@
  ************************************************************************/
 
 
+%ModuleHeaderCode
+#include "qgsprintlayout.h"
+#include "qgsreport.h"
+%End
+
 class QgsMasterLayoutInterface
 {
 %Docstring
@@ -17,6 +22,21 @@ class QgsMasterLayoutInterface
 
 %TypeHeaderCode
 #include "qgsmasterlayoutinterface.h"
+%End
+%ConvertToSubClassCode
+    switch ( sipCpp->layoutType() )
+    {
+      case QgsMasterLayoutInterface::PrintLayout:
+        sipType = sipType_QgsPrintLayout;
+        *sipCppRet = static_cast<QgsPrintLayout *>( sipCpp );
+        break;
+      case  QgsMasterLayoutInterface::Report:
+        *sipCppRet = static_cast<QgsReport *>( sipCpp );
+        sipType = sipType_QgsReport;
+        break;
+      default:
+        sipType = NULL;
+    }
 %End
   public:
 

diff --git a/src/core/composer/qgslayoutmanager.cpp b/src/core/composer/qgslayoutmanager.cpp
@@ -285,40 +285,11 @@ bool QgsLayoutManager::saveAsTemplate( const QString &name, QDomDocument &doc )
   return true;
 }
 
-QgsComposition *QgsLayoutManager::duplicateComposition( const QString &name, const QString &newName )
+QgsMasterLayoutInterface *QgsLayoutManager::duplicateLayout( const QgsMasterLayoutInterface *layout, const QString &newName )
 {
-  QDomDocument currentDoc;
-  if ( !saveAsTemplate( name, currentDoc ) )
-    return nullptr;
-
-  QDomElement compositionElem = currentDoc.documentElement().firstChildElement( QStringLiteral( "Composition" ) );
-  if ( compositionElem.isNull() )
-  {
-    QgsDebugMsg( "selected composer could not be stored as temporary template" );
-    return nullptr;
-  }
-
-  QgsComposition *newComposition( new QgsComposition( mProject ) );
-  if ( !newComposition->loadFromTemplate( currentDoc, nullptr, false, true ) )
-  {
-    delete newComposition;
-    return nullptr;
-  }
-
-  newComposition->setName( newName );
-  if ( !addComposition( newComposition ) )
-  {
-    delete newComposition;
+  if ( !layout )
     return nullptr;
-  }
-  else
-  {
-    return newComposition;
-  }
-}
 
-QgsMasterLayoutInterface *QgsLayoutManager::duplicateLayout( const QgsMasterLayoutInterface *layout, const QString &newName )
-{
   std::unique_ptr< QgsMasterLayoutInterface > newLayout( layout->clone() );
   if ( !newLayout )
   {

diff --git a/src/core/composer/qgslayoutmanager.h b/src/core/composer/qgslayoutmanager.h
@@ -140,13 +140,6 @@ class CORE_EXPORT QgsLayoutManager : public QObject
      */
     bool saveAsTemplate( const QString &name, QDomDocument &doc ) const;
 
-    /**
-     * Duplicates an existing composition from the manager. The new
-     * composition will automatically be stored in the manager.
-     * Returns new composition if duplication was successful.
-     */
-    QgsComposition *duplicateComposition( const QString &name, const QString &newName );
-
     /**
      * Duplicates an existing \a layout from the manager. The new
      * layout will automatically be stored in the manager.

diff --git a/src/core/layout/qgsmasterlayoutinterface.h b/src/core/layout/qgsmasterlayoutinterface.h
@@ -21,6 +21,13 @@
 #include <QString>
 #include <QIcon>
 
+#ifdef SIP_RUN
+% ModuleHeaderCode
+#include "qgsprintlayout.h"
+#include "qgsreport.h"
+% End
+#endif
+
 /**
  * \ingroup core
  * \class QgsMasterLayoutInterface
@@ -30,6 +37,24 @@
 class CORE_EXPORT QgsMasterLayoutInterface
 {
 
+#ifdef SIP_RUN
+    SIP_CONVERT_TO_SUBCLASS_CODE
+    switch ( sipCpp->layoutType() )
+    {
+      case QgsMasterLayoutInterface::PrintLayout:
+        sipType = sipType_QgsPrintLayout;
+        *sipCppRet = static_cast<QgsPrintLayout *>( sipCpp );
+        break;
+      case  QgsMasterLayoutInterface::Report:
+        *sipCppRet = static_cast<QgsReport *>( sipCpp );
+        sipType = sipType_QgsReport;
+        break;
+      default:
+        sipType = NULL;
+    }
+    SIP_END
+#endif
+
   public:
 
     //! Master layout type

diff --git a/tests/src/python/qgscompositionchecker.py b/tests/src/python/qgscompositionchecker.py