Clone more members in vector layer

pblottiere · pblottiere · commit f92a38cf542b · 2017-05-18T11:09:42.000+02:00
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -507,6 +507,7 @@ Setup the coordinate system transformation for the layer
  :rtype: QgsActionManager
 %End
 
+
     int selectedFeatureCount() const;
 %Docstring
  The number of features that are selected in this layer
@@ -1429,6 +1430,11 @@ Assembles mUpdatedFields considering provider fields, joined fields and added fi
  :rtype: QgsFieldConstraints.Constraints
 %End
 
+    QMap< QgsFieldConstraints::Constraint, QgsFieldConstraints::ConstraintStrength> fieldConstraintsAndStrength( int fieldIndex ) const;
+%Docstring
+ :rtype: QMap< QgsFieldConstraints.Constraint, QgsFieldConstraints.ConstraintStrength>
+%End
+
     void setFieldConstraint( int index, QgsFieldConstraints::Constraint constraint, QgsFieldConstraints::ConstraintStrength strength = QgsFieldConstraints::ConstraintStrengthHard );
 %Docstring
  Sets a constraint for a specified field index. Any constraints inherited from the layer's
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -222,6 +222,12 @@ QgsVectorLayer *QgsVectorLayer::clone() const
   layer->setAttributeTableConfig( attributeTableConfig() );
   layer->setFeatureBlendMode( featureBlendMode() );
   layer->setLayerTransparency( layerTransparency() );
+  layer->setEditFormConfig( editFormConfig() );
+
+  Q_FOREACH ( QgsAction action, actions()->actions() )
+  {
+    layer->actions()->addAction( action );
+  }
 
   if ( renderer() )
   {
@@ -248,10 +254,16 @@ QgsVectorLayer *QgsVectorLayer::clone() const
   for ( int i = 0; i < fields().count(); i++ )
   {
     layer->setFieldAlias( i, attributeAlias( i ) );
-  }
+    layer->setEditorWidgetSetup( i, editorWidgetSetup( i ) );
+    layer->setConstraintExpression( i, constraintExpression( i ), constraintDescription( i ) );
+    layer->setDefaultValueExpression( i, defaultValueExpression( i ) );
+
+    QMap< QgsFieldConstraints::Constraint, QgsFieldConstraints::ConstraintStrength> constraints = fieldConstraintsAndStrength( i );
+    for ( QgsFieldConstraints::Constraint c : constraints.keys() )
+    {
+      layer->setFieldConstraint( i, c, constraints.value( c ) );
+    }
 
-  for ( int i = 0; i < fields().count(); i++ )
-  {
     if ( fields().fieldOrigin( i ) == QgsFields::OriginExpression )
     {
       layer->addExpressionField( expressionField( i ), fields().at( i ) );
@@ -4201,6 +4213,26 @@ QgsFieldConstraints::Constraints QgsVectorLayer::fieldConstraints( int fieldInde
   return constraints;
 }
 
+QMap< QgsFieldConstraints::Constraint, QgsFieldConstraints::ConstraintStrength> QgsVectorLayer::fieldConstraintsAndStrength( int fieldIndex ) const
+{
+  QMap< QgsFieldConstraints::Constraint, QgsFieldConstraints::ConstraintStrength > m;
+
+  if ( fieldIndex < 0 || fieldIndex >= mFields.count() )
+    return m;
+
+  QString name = mFields.at( fieldIndex ).name();
+
+  for ( QPair< QString, QgsFieldConstraints::Constraint > p : mFieldConstraintStrength.keys() )
+  {
+    if ( p.first == name )
+    {
+      m[ p.second ] = mFieldConstraintStrength.value( p );
+    }
+  }
+
+  return m;
+}
+
 void QgsVectorLayer::setFieldConstraint( int index, QgsFieldConstraints::Constraint constraint, QgsFieldConstraints::ConstraintStrength strength )
 {
   if ( index < 0 || index >= mFields.count() )
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -538,6 +538,13 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      */
     QgsActionManager *actions() { return mActions; }
 
+    /**
+     * Get all layer actions defined on this layer.
+     *
+     * The pointer which is returned is const.
+     */
+    const QgsActionManager *actions() const SIP_SKIP { return mActions; }
+
     /**
      * The number of features that are selected in this layer
      *
@@ -1340,6 +1347,8 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      */
     QgsFieldConstraints::Constraints fieldConstraints( int fieldIndex ) const;
 
+    QMap< QgsFieldConstraints::Constraint, QgsFieldConstraints::ConstraintStrength> fieldConstraintsAndStrength( int fieldIndex ) const;
+
     /**
      * Sets a constraint for a specified field index. Any constraints inherited from the layer's
      * data provider will be kept intact and cannot be modified. Ie, calling this method only allows for new
