dxf export: add method to update model

jef-n · jef-n · commit ac10e692b54f · 2014-12-15T11:24:39.000+01:00
diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp
@@ -69,7 +69,7 @@ void FieldSelectorDelegate::setEditorData( QWidget *editor, const QModelIndex &i
   if ( !fcb )
     return;
 
-  int idx = m->mAttributeIdx.value( vl, -1 );
+  int idx = m->attributeIndex( vl );
   if ( vl->pendingFields().exists( idx ) )
     fcb->setField( vl->pendingFields()[ idx ].name() );
 }
@@ -127,6 +127,11 @@ QgsVectorLayer *QgsVectorLayerAndAttributeModel::vectorLayer( const QModelIndex
   return dynamic_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( n )->layer() );
 }
 
+int QgsVectorLayerAndAttributeModel::attributeIndex( const QgsVectorLayer *vl ) const
+{
+  return mAttributeIdx.value( vl, -1 );
+}
+
 QVariant QgsVectorLayerAndAttributeModel::data( const QModelIndex& idx, int role ) const
 {
   if ( idx.column() == 0 )
diff --git a/src/app/qgsdxfexportdialog.h b/src/app/qgsdxfexportdialog.h
@@ -56,16 +56,15 @@ class QgsVectorLayerAndAttributeModel : public QgsLayerTreeModel
     QList< QPair<QgsVectorLayer *, int> > layers() const;
 
     QgsVectorLayer *vectorLayer( const QModelIndex &index ) const;
+    int attributeIndex( const QgsVectorLayer *vl ) const;
 
     void applyVisibilityPreset( const QString &name );
 
   private:
-    QHash<QgsVectorLayer *, int> mAttributeIdx;
+    QHash<const QgsVectorLayer *, int> mAttributeIdx;
     QModelIndexList mCheckedIndexes;
 
     void applyVisibility( QSet<QString> &visibleLayers, QgsLayerTreeNode *node );
-
-    friend FieldSelectorDelegate;
 };
 
 
diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
@@ -139,19 +139,6 @@ class CORE_EXPORT QgsDxfExport
     void writeSymbolLayerLinetype( const QgsSymbolLayerV2* symbolLayer );
     void writeLinetype( const QString& styleName, const QVector<qreal>& pattern, QgsSymbolV2::OutputUnit u );
 
-#if 0
-    //AC1018
-    void writeHeaderAC1018( QTextStream& stream );
-    void writeTablesAC1018( QTextStream& stream );
-    void writeEntitiesAC1018( QTextStream& stream );
-    void writeEntitiesSymbolLevelsAC1018( QTextStream& stream, QgsVectorLayer* layer );
-    void writeSymbolLayerLinetypeAC1018( QTextStream& stream, const QgsSymbolLayerV2* symbolLayer );
-    void writeLinetypeAC1018( QTextStream& stream, const QString& styleName, const QVector<qreal>& pattern, QgsSymbolV2::OutputUnit u );
-    void writeVertexAC1018( QTextStream& stream, const QgsPoint& pt );
-    void writePolylineAC1018( QTextStream& stream, const QgsPolyline& line, const QString& layer, const QString& lineStyleName, QColor color,
-                              double width = -1, bool polygon = false );
-#endif
-
     QgsRectangle dxfExtent() const;
 
     void addFeature( const QgsSymbolV2RenderContext& ctx, const QString& layer, const QgsSymbolLayerV2* symbolLayer, const QgsSymbolV2* symbol );

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ void FieldSelectorDelegate::setEditorData( QWidget *editor, const QModelIndex &i`
`69`	`69`	`if ( !fcb )`
`70`	`70`	`return;`
`71`	`71`
`72`		`- int idx = m->mAttributeIdx.value( vl, -1 );`
	`72`	`+ int idx = m->attributeIndex( vl );`
`73`	`73`	`if ( vl->pendingFields().exists( idx ) )`
`74`	`74`	`fcb->setField( vl->pendingFields()[ idx ].name() );`
`75`	`75`	`}`
`@@ -127,6 +127,11 @@ QgsVectorLayer *QgsVectorLayerAndAttributeModel::vectorLayer( const QModelIndex`
`127`	`127`	`return dynamic_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( n )->layer() );`
`128`	`128`	`}`
`129`	`129`
	`130`	`+int QgsVectorLayerAndAttributeModel::attributeIndex( const QgsVectorLayer *vl ) const`
	`131`	`+{`
	`132`	`+ return mAttributeIdx.value( vl, -1 );`
	`133`	`+}`
	`134`	`+`
`130`	`135`	`QVariant QgsVectorLayerAndAttributeModel::data( const QModelIndex& idx, int role ) const`
`131`	`136`	`{`
`132`	`137`	`if ( idx.column() == 0 )`