Skip to content

Commit a07845d

Browse files
m-kuhnmhugent
m-kuhn
authored and
mhugent
committedOct 4, 2012
Merge pull request from Matthias Kuhn to remove old diagram GUI
·
ltr-3_40Before-merge-new_vector_api
1 parent 6cd3e7e commit a07845d

19 files changed

+7
-1648
lines changed
 

‎src/plugins/diagram_overlay/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,25 @@
22
# Files
33

44
SET (DIAGRAMOVERLAY_SRCS
5-
qgsdiagramdialog.cpp
65
qgsdiagramcategory.cpp
76
qgsdiagramfactory.cpp
87
qgswkndiagramfactory.cpp
9-
qgswkndiagramfactorywidget.cpp
108
qgsbardiagramfactory.cpp
119
qgspiediagramfactory.cpp
1210
qgssvgdiagramfactory.cpp
13-
qgssvgdiagramfactorywidget.cpp
14-
qgsdiagramfactorywidget.cpp
1511
qgsdiagramoverlay.cpp
1612
qgsdiagramoverlayplugin.cpp
1713
qgsdiagramrenderer.cpp
18-
qgsdiagramrendererwidget.cpp
19-
qgslinearlyscalingdialog.cpp
2014
)
2115

22-
SET (DIAGRAMOVERLAY_UIS qgsdiagramdialogbase.ui qgslinearlyscalingdialogbase.ui qgssvgdiagramfactorywidgetbase.ui qgswkndiagramfactorywidgetbase.ui)
23-
2416
SET (DIAGRAMOVERLAY_MOC_HDRS
2517
qgsdiagramoverlayplugin.h
26-
qgsdiagramdialog.h
27-
qgslinearlyscalingdialog.h
28-
qgssvgdiagramfactorywidget.h
29-
qgswkndiagramfactorywidget.h
3018
)
3119

3220

3321
########################################################
3422
# Build
3523

36-
QT4_WRAP_UI (DIAGRAMOVERLAY_UIS_H ${DIAGRAMOVERLAY_UIS})
37-
3824
QT4_WRAP_CPP (DIAGRAMOVERLAY_MOC_SRCS ${DIAGRAMOVERLAY_MOC_HDRS})
3925

4026
ADD_LIBRARY (diagramoverlay MODULE ${DIAGRAMOVERLAY_UIS_H} ${DIAGRAMOVERLAY_SRCS} ${DIAGRAMOVERLAY_MOC_SRCS})

‎src/plugins/diagram_overlay/qgsdiagramdialog.cpp

Lines changed: 0 additions & 348 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgsdiagramdialog.h

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgsdiagramdialogbase.ui

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgsdiagramfactorywidget.cpp

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgsdiagramfactorywidget.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,20 @@
1818
#include "qgsdiagramoverlayplugin.h"
1919
#include "qgisinterface.h"
2020
#include "qgslegendinterface.h"
21-
#include "qgsdiagramdialog.h"
2221
#include "qgsdiagramoverlay.h"
2322
#include "qgsmaplayerregistry.h"
2423
#include "qgsproject.h"
2524
#include "qgsvectorlayer.h"
2625
#include <QDomDocument>
2726
#include <QFile>
27+
#include <QWidget>
2828

29-
#ifdef WIN32
30-
#define QGISEXTERN extern "C" __declspec( dllexport )
31-
#else
32-
#define QGISEXTERN extern "C"
33-
#endif
34-
35-
static const QString pluginName = QObject::tr( "Diagram Overlay" );
29+
static const QString pluginName = QObject::tr( "Diagram Overlay (Legacy)" );
3630
static const QString pluginDescription = QObject::tr( "A plugin for placing diagrams on vector layers" );
3731
static const QString pluginCategory = QObject::tr( "Plugins" );
38-
static const QString pluginVersion = QObject::tr( "Version 0.0.1" );
32+
static const QString pluginVersion = QObject::tr( "Version 0.0.1 (Legacy)" );
3933

40-
QgsDiagramOverlayPlugin::QgsDiagramOverlayPlugin( QgisInterface* iface ): QObject(), QgsVectorOverlayPlugin( pluginName, pluginDescription, pluginCategory, pluginVersion ), mInterface( iface )
34+
QgsDiagramOverlayPlugin::QgsDiagramOverlayPlugin( QgisInterface* iface ): QObject(), QgisPlugin( pluginName, pluginDescription, pluginCategory, pluginVersion, VECTOR_OVERLAY ), mInterface( iface )
4135
{
4236
if ( iface && iface->mainWindow() )
4337
{
@@ -122,11 +116,6 @@ void QgsDiagramOverlayPlugin::projectRead()
122116
}
123117
}
124118

125-
QgsApplyDialog* QgsDiagramOverlayPlugin::dialog( QgsVectorLayer* vl ) const
126-
{
127-
return new QgsDiagramDialog( vl );
128-
}
129-
130119
QGISEXTERN QgisPlugin* classFactory( QgisInterface* iface )
131120
{
132121
return new QgsDiagramOverlayPlugin( iface );

‎src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,21 @@
1818
#ifndef QGSDIAGRAMOVERLAYPLUGIN_H
1919
#define QGSDIAGRAMOVERLAYPLUGIN_H
2020

21-
#include "qgsvectoroverlayplugin.h"
21+
#include "qgisplugin.h"
2222
#include <QObject>
2323

2424
class QgisInterface;
2525
class QgsApplyDialog;
2626

2727
/**A plugin for placing diagrams on vector layers. The plugin provides a widget that can be embedded into the
2828
vector layer properties dialog and is able to create and configure a diagram overlay layer*/
29-
class QgsDiagramOverlayPlugin: public QObject, public QgsVectorOverlayPlugin
29+
class QgsDiagramOverlayPlugin: public QObject, public QgisPlugin
3030
{
3131
Q_OBJECT
3232
public:
3333
QgsDiagramOverlayPlugin( QgisInterface* iface );
3434
~QgsDiagramOverlayPlugin();
35-
QgsApplyDialog* dialog( QgsVectorLayer* ) const;
36-
void initGui() {}
35+
void initGui() {};
3736
void unload() {}
3837

3938
public slots:

‎src/plugins/diagram_overlay/qgsdiagramrendererwidget.cpp

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgsdiagramrendererwidget.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgslinearlyscalingdialog.cpp

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgslinearlyscalingdialog.h

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp

Lines changed: 0 additions & 247 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.h

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgswkndiagramfactorywidget.cpp

Lines changed: 0 additions & 162 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgswkndiagramfactorywidget.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.