Skip to content
Permalink
Browse files

[FEATURE] Remove dxf2shp converter plugin

This functionality is available in OGR and there is no longer
a need for a dedicated QGIS plugin to do this task

Marked as feature for documentation + changelog reminder
  • Loading branch information
nyalldawson committed Oct 24, 2016
1 parent 1367fd0 commit e75b572b6e08f141a927c62f710a67629a0dbe46
Showing with 5 additions and 15,783 deletions.
  1. +0 −23 debian/copyright
  2. +0 −1 debian/qgis.install
  3. +0 −1 ms-windows/osgeo4w/package.cmd
  4. +0 −1 ms-windows/plugins.nsh
  5. +0 −3 rpm/qgis.spec.template
  6. +1 −1 scripts/astyle.sh
  7. +1 −1 scripts/chkcopyrights.sh
  8. +1 −1 scripts/chkspelling.sh
  9. +1 −1 scripts/prepare-commit.sh
  10. +0 −1 scripts/sort_include.sh
  11. +1 −1 scripts/verify-indentation.sh
  12. +0 −1 src/plugins/CMakeLists.txt
  13. +0 −57 src/plugins/dxf2shp_converter/CMakeLists.txt
  14. +0 −27 src/plugins/dxf2shp_converter/README
  15. +0 −565 src/plugins/dxf2shp_converter/builder.cpp
  16. +0 −87 src/plugins/dxf2shp_converter/builder.h
  17. BIN src/plugins/dxf2shp_converter/dxf2shp_converter.png
  18. +0 −220 src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
  19. +0 −88 src/plugins/dxf2shp_converter/dxf2shpconverter.h
  20. +0 −5 src/plugins/dxf2shp_converter/dxf2shpconverter.qrc
  21. +0 −179 src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp
  22. +0 −50 src/plugins/dxf2shp_converter/dxf2shpconvertergui.h
  23. +0 −158 src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui
  24. +0 −237 src/plugins/dxf2shp_converter/dxflib/src/dl_attributes.h
  25. +0 −545 src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h
  26. +0 −137 src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h
  27. +0 −366 src/plugins/dxf2shp_converter/dxflib/src/dl_creationinterface.h
  28. +0 −5,239 src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp
  29. +0 −510 src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h
  30. +0 −1,724 src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
  31. +0 −144 src/plugins/dxf2shp_converter/dxflib/src/dl_extrusion.h
  32. +0 −38 src/plugins/dxf2shp_converter/dxflib/src/dl_global.h
  33. +0 −653 src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
  34. +0 −145 src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp
  35. +0 −74 src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h
  36. +0 −483 src/plugins/dxf2shp_converter/shapelib-1.2.10/LICENSE.LGPL
  37. +0 −1,502 src/plugins/dxf2shp_converter/shapelib-1.2.10/dbfopen.c
  38. +0 −486 src/plugins/dxf2shp_converter/shapelib-1.2.10/shapefil.h
  39. +0 −42 src/plugins/dxf2shp_converter/shapelib-1.2.10/shapelib.def
  40. +0 −1,878 src/plugins/dxf2shp_converter/shapelib-1.2.10/shpopen.c
  41. +0 −108 src/plugins/dxf2shp_converter/shapelib-1.2.10/shprewind.c
@@ -320,29 +320,6 @@ Files: src/gui/symbology-ng/characterwidget.cpp
Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies)
License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3

Files: src/plugins/dxf2shp_converter/builder.cpp
src/plugins/dxf2shp_converter/builder.h
Copyright: 1999, Frank Warmerdam <warmerda@pobox.com>
Comment: The code is heavily based on Christopher Michaelis' DXF to
Shapefile Converter (http://www.wanderingidea.com/content/view/12/25/),
released under GPL License
.
This code is based on two other products:
DXFLIB (http://www.ribbonsoft.com/dxflib.html)
This is a library for reading DXF files, also GPL.
SHAPELIB (http://shapelib.maptools.org/)
Used for the Shapefile functionality.
License: MIT

Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/*
Copyright: 1999, 2001-2002, Frank Warmerdam
License: MIT or LGPL-2+

Files: src/plugins/dxf2shp_converter/dxflib/src/*
Copyright: 2001-2013, RibbonSoft GmbH
2001, Robert J. Campbell Jr
License: GPL-2+ or dxflib-Commercial-License

Files: src/plugins/evis/*
Copyright: 2007, American Museum of Natural History
License: LGPL-2+
@@ -1,6 +1,5 @@
usr/lib/qgis/plugins/libgeorefplugin.so
usr/lib/qgis/plugins/libgpsimporterplugin.so
usr/lib/qgis/plugins/libdxf2shpconverterplugin.so
usr/lib/qgis/plugins/libinterpolationplugin.so
usr/lib/qgis/plugins/libcoordinatecaptureplugin.so
usr/lib/qgis/plugins/liboracleplugin.so
@@ -383,7 +383,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
"apps/%PACKAGENAME%/icons/" ^
"apps/%PACKAGENAME%/images/" ^
"apps/%PACKAGENAME%/plugins/coordinatecaptureplugin.dll" ^
"apps/%PACKAGENAME%/plugins/dxf2shpconverterplugin.dll" ^
"apps/%PACKAGENAME%/plugins/evis.dll" ^
"apps/%PACKAGENAME%/plugins/georefplugin.dll" ^
"apps/%PACKAGENAME%/plugins/gpsimporterplugin.dll" ^
@@ -9,7 +9,6 @@

WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "coordinatecaptureplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "diagramoverlay" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "dxf2shpconverterplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "evis" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "georefplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "globeplugin" "false"
@@ -190,9 +190,6 @@ rm -rf src/core/gps/qextserialport/
rm -rf src/core/gps/qextserialport/
rm -rf "python/ext-libs/!(CMakeLists.txt|tests)"

rm -rf src/plugins/dxf2shp_converter/
sed -i '/dxf2shp_converter/d' src/plugins/CMakeLists.txt

gzip ChangeLog


@@ -71,7 +71,7 @@ astyleit() {

for f in "$@"; do
case "$f" in
src/app/gps/qwtpolar-*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|python/ext-libs/*|*/ui_*.py)
src/app/gps/qwtpolar-*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|python/ext-libs/*|*/ui_*.py)
echo -ne "$f skipped $elcr"
continue
;;
@@ -16,5 +16,5 @@


licensecheck -r . |
egrep -v "\/debian\/|.\/src\/plugins\/dxf2shp_converter\/dxflib|\.\/python\/ext-libs|\.\/ms-windows\/osgeo4w\/untgz\/|\.\/src\/app\/gps\/qwtpolar-|\.\/src\/app\/gps\/qwtpolar-1.0|: BSD \(3 clause\)|: GPL \(v[23] or later\)$|: LGPL \(v2 or later\)$|: MIT\/X11 \(BSD like\)$|: Apache \(v2\.0\) GPL \(v2 or later\)$|: LGPL$|: Apache \(v2\.0\)$|: zlib\/libpng$|: GPL LGPL$|GENERATED FILE" |
egrep -v "\/debian\/|\.\/python\/ext-libs|\.\/ms-windows\/osgeo4w\/untgz\/|\.\/src\/app\/gps\/qwtpolar-|\.\/src\/app\/gps\/qwtpolar-1.0|: BSD \(3 clause\)|: GPL \(v[23] or later\)$|: LGPL \(v2 or later\)$|: MIT\/X11 \(BSD like\)$|: Apache \(v2\.0\) GPL \(v2 or later\)$|: LGPL$|: Apache \(v2\.0\)$|: zlib\/libpng$|: GPL LGPL$|GENERATED FILE" |
sed -e "s/:.*$//"
@@ -17,6 +17,6 @@


RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build.*|debian/.*/usr/|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs|i18n/"
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build.*|debian/.*/usr/|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-|python/ext-libs|i18n/"

egrep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api,pyc} --exclude-dir=.git --exclude-dir=debian/build* --color=always "$RE" -ir . | egrep -iv "$EX"
@@ -61,7 +61,7 @@ for f in $MODIFIED; do
(( i++ )) || true

case "$f" in
src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
echo $f skipped
continue
;;
@@ -36,7 +36,6 @@ for file in $(find . \
! -path "./src/astyle/*" \
! -path "./python/ext-libs/*" \
! -path "./src/providers/spatialite/qspatialite/*" \
! -path "./src/plugins/dxf2shp_converter/dxflib/src/*" \
! -path "./src/plugins/globe/osgEarthQt/*" \
! -path "./src/plugins/globe/osgEarthUtil/*" \
-regex "./src/\(.+/\)*.*\.\(h\|cpp\)" -type f \
@@ -38,7 +38,7 @@ do

echo "Checking $f" >>/tmp/ctest-important.log
case "$f" in
src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|scripts/customwidget_template*)
src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|scripts/customwidget_template*)
echo "$f skipped"
continue
;;
@@ -10,7 +10,6 @@ ADD_SUBDIRECTORY(interpolation)
ADD_SUBDIRECTORY(oracle_raster)
ADD_SUBDIRECTORY(raster_terrain_analysis)
ADD_SUBDIRECTORY(coordinate_capture)
ADD_SUBDIRECTORY(dxf2shp_converter)
ADD_SUBDIRECTORY(evis)
ADD_SUBDIRECTORY(spatialquery)
ADD_SUBDIRECTORY(roadgraph)

This file was deleted.

This file was deleted.

0 comments on commit e75b572

Please sign in to comment.
You can’t perform that action at this time.