Skip to content
Permalink
Browse files

Update georeferencer from gislab SVN, which adds GCP table with error…

…s, new user interface

and raster properties configuration (thanks to Maxim Dubinin and Jack R at gis-lab). Part 2/2
of new georeferencer.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12945 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mmassing
mmassing committed Feb 14, 2010
1 parent 06ce53e commit ecd2aa916da598951b4c7cd8f7ee90892bcca427
Showing with 5,784 additions and 2,255 deletions.
  1. +37 −15 src/plugins/georeferencer/CMakeLists.txt
  2. +0 −22 src/plugins/georeferencer/add_point.xpm
  3. +21 −4 src/plugins/georeferencer/georeferencer.qrc
  4. BIN src/plugins/georeferencer/icons/mActionAbout.png
  5. BIN src/plugins/georeferencer/icons/mActionGDALScript.png
  6. BIN src/plugins/georeferencer/icons/mActionHelp.png
  7. BIN src/plugins/georeferencer/icons/mActionInfoTabWidget.png
  8. BIN src/plugins/georeferencer/icons/mActionLinkGeorefToQGis.png
  9. BIN src/plugins/georeferencer/icons/mActionLinkGeorefToQGis.xcf
  10. BIN src/plugins/georeferencer/icons/mActionLinkQGisToGeoref.png
  11. BIN src/plugins/georeferencer/icons/mActionLinkQGisToGeoref.xcf
  12. BIN src/plugins/georeferencer/icons/mActionLoadGCPpoints.png
  13. BIN src/plugins/georeferencer/icons/mActionMoveGCPPoint.png
  14. BIN src/plugins/georeferencer/icons/mActionOpenRaster.png
  15. BIN src/plugins/georeferencer/icons/mActionProjectProperties.png
  16. BIN src/plugins/georeferencer/icons/mActionSaveGCPpointsAs.png
  17. BIN src/plugins/georeferencer/icons/mActionSaveRasterAs.png
  18. BIN src/plugins/georeferencer/icons/mActionStartGeoref.png
  19. BIN src/plugins/georeferencer/icons/mActionTransformSettings.png
  20. BIN src/plugins/georeferencer/{georef.png → icons/mGeorefDescription.png}
  21. BIN src/plugins/georeferencer/{georeferencer.png → icons/mGeorefRun.png}
  22. BIN src/plugins/georeferencer/icons/mPushButtonClipboard.png
  23. BIN src/plugins/georeferencer/icons/mPushButtonEditPaste.png
  24. BIN src/plugins/georeferencer/icons/mPushButtonFileOpen.png
  25. BIN src/plugins/georeferencer/{pencil.png → icons/mPushButtonPencil.png}
  26. BIN src/plugins/georeferencer/icons/mPushButtonTargetSRSDisabled.png
  27. BIN src/plugins/georeferencer/icons/mPushButtonTargetSRSEnabled.png
  28. +703 −0 src/plugins/georeferencer/icons/qgis.xpm
  29. +0 −94 src/plugins/georeferencer/mapcoordsdialog.cpp
  30. +0 −55 src/plugins/georeferencer/mapcoordsdialog.h
  31. +0 −100 src/plugins/georeferencer/mapcoordsdialogbase.ui
  32. +112 −0 src/plugins/georeferencer/qgsgcpcanvasitem.cpp
  33. +58 −0 src/plugins/georeferencer/qgsgcpcanvasitem.h
  34. +85 −0 src/plugins/georeferencer/qgsgcplist.cpp
  35. +19 −2 src/plugins/georeferencer/qgsgcplist.h
  36. +99 −60 src/plugins/georeferencer/qgsgcplistmodel.cpp
  37. +14 −11 src/plugins/georeferencer/qgsgcplistmodel.h
  38. +165 −18 src/plugins/georeferencer/qgsgcplistwidget.cpp
  39. +43 −10 src/plugins/georeferencer/qgsgcplistwidget.h
  40. +0 −27 src/plugins/georeferencer/qgsgcplistwidgetbase.ui
  41. +64 −0 src/plugins/georeferencer/qgsgeorefconfigdialog.cpp
  42. +39 −0 src/plugins/georeferencer/qgsgeorefconfigdialog.h
  43. +57 −0 src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui
  44. +58 −49 src/plugins/georeferencer/qgsgeorefdatapoint.cpp
  45. +39 −16 src/plugins/georeferencer/qgsgeorefdatapoint.h
  46. +106 −0 src/plugins/georeferencer/qgsgeorefdelegates.cpp
  47. +74 −0 src/plugins/georeferencer/qgsgeorefdelegates.h
  48. +3 −2 src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp
  49. +3 −0 src/plugins/georeferencer/qgsgeorefdescriptiondialog.h
  50. +33 −33 src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui
  51. +67 −80 src/plugins/georeferencer/qgsgeorefplugin.cpp
  52. +8 −7 src/plugins/georeferencer/qgsgeorefplugin.h
  53. +1,466 −0 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  54. +211 −0 src/plugins/georeferencer/qgsgeorefplugingui.h
  55. +357 −0 src/plugins/georeferencer/qgsgeorefpluginguibase.ui
  56. +34 −0 src/plugins/georeferencer/qgsgeoreftooladdpoint.cpp
  57. +41 −0 src/plugins/georeferencer/qgsgeoreftooladdpoint.h
  58. +34 −0 src/plugins/georeferencer/qgsgeoreftooldeletepoint.cpp
  59. +41 −0 src/plugins/georeferencer/qgsgeoreftooldeletepoint.h
  60. +44 −0 src/plugins/georeferencer/qgsgeoreftoolmovepoint.cpp
  61. +50 −0 src/plugins/georeferencer/qgsgeoreftoolmovepoint.h
  62. +1 −1 src/plugins/georeferencer/qgsgeoreftransform.cpp
  63. +95 −0 src/plugins/georeferencer/qgsgeorefvalidators.cpp
  64. +29 −0 src/plugins/georeferencer/qgsgeorefvalidators.h
  65. +23 −32 src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.cpp
  66. +6 −15 src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.h
  67. +76 −12 src/plugins/georeferencer/qgsgeorefwarpoptionsdialogbase.ui
  68. +60 −18 src/plugins/georeferencer/qgsimagewarper.cpp
  69. +20 −10 src/plugins/georeferencer/qgsimagewarper.h
  70. +1 −1 src/plugins/georeferencer/qgsleastsquares.cpp
  71. +1 −1 src/plugins/georeferencer/qgsleastsquares.h
  72. +142 −0 src/plugins/georeferencer/qgsmapcoordsdialog.cpp
  73. +77 −0 src/plugins/georeferencer/qgsmapcoordsdialog.h
  74. +107 −0 src/plugins/georeferencer/qgsmapcoordsdialogbase.ui
  75. +165 −0 src/plugins/georeferencer/qgsopenrasterdialog.cpp
  76. +44 −0 src/plugins/georeferencer/qgsopenrasterdialog.h
  77. +142 −0 src/plugins/georeferencer/qgsopenrasterdialogbase.ui
  78. +0 −975 src/plugins/georeferencer/qgspointdialog.cpp
  79. +0 −144 src/plugins/georeferencer/qgspointdialog.h
  80. +0 −441 src/plugins/georeferencer/qgspointdialogbase.ui
  81. +219 −0 src/plugins/georeferencer/qgstransformsettingsdialog.cpp
  82. +58 −0 src/plugins/georeferencer/qgstransformsettingsdialog.h
  83. +226 −0 src/plugins/georeferencer/qgstransformsettingsdialogbase.ui
  84. +107 −0 src/plugins/georeferencer/qgstransformtypedialogbase.ui
@@ -2,36 +2,58 @@
# Files

SET (GEOREF_SRCS
qgsgcpcanvasitem.cpp
qgsgeorefconfigdialog.cpp
qgsgeorefdatapoint.cpp
qgsgeorefdelegates.cpp
qgsgeorefdescriptiondialog.cpp
qgsgeorefplugin.cpp
qgsgeorefplugingui.cpp
qgsgeoreftooladdpoint.cpp
qgsgeoreftooldeletepoint.cpp
qgsgeoreftoolmovepoint.cpp
qgsgeorefvalidators.cpp
qgsleastsquares.cpp
qgsmapcoordsdialog.cpp
qgstransformsettingsdialog.cpp

qgsgcplist.cpp
qgsgcplistmodel.cpp
qgsgeorefdatapoint.cpp
qgsimagewarper.cpp
qgsleastsquares.cpp
qgspointdialog.cpp
qgsgeorefdescriptiondialog.cpp
qgsgeorefwarpoptionsdialog.cpp
qgsgeoreftransform.cpp
mapcoordsdialog.cpp
qgsgcplistwidget.cpp
)

SET (GEOREF_UIS
qgspointdialogbase.ui
mapcoordsdialogbase.ui
qgsgeorefconfigdialogbase.ui
qgsgeorefdescriptiondialogbase.ui
qgsgeorefwarpoptionsdialogbase.ui
qgsgcplistwidgetbase.ui
qgsgeorefpluginguibase.ui
qgsmapcoordsdialogbase.ui
qgstransformsettingsdialogbase.ui
../../ui/qgsprojectionselectorbase.ui
../../ui/qgsrasterlayerpropertiesbase.ui
)

SET (GEOREF_MOC_HDRS
# qgsgcplistmodel.h
qgsgcpcanvasitem.h
qgsgeorefconfigdialog.h
qgsgeorefdatapoint.h
qgsgeorefdelegates.h
qgsgeorefdescriptiondialog.h
qgsgeorefplugin.h
qgspointdialog.h
mapcoordsdialog.h
qgsgeorefwarpoptionsdialog.h
qgsgeorefplugingui.h
qgsgeoreftooladdpoint.h
qgsgeoreftooldeletepoint.h
qgsgeoreftoolmovepoint.h
qgsgeorefvalidators.h
qgsleastsquares.h
qgsmapcoordsdialog.h
qgstransformsettingsdialog.h

qgsgcplist.h
qgsgcplistmodel.h
qgsgcplistwidget.h
)

SET (GEOREF_RCCS georeferencer.qrc)


This file was deleted.

@@ -1,7 +1,24 @@
<RCC>
<qresource prefix="/" >
<file>georef.png</file>
<file>georeferencer.png</file>
<file>pencil.png</file>
<qresource prefix="/">
<file>icons/mGeorefDescription.png</file>
<file>icons/mGeorefRun.png</file>
<file>icons/mPushButtonClipboard.png</file>
<file>icons/mPushButtonEditPaste.png</file>
<file>icons/mPushButtonFileOpen.png</file>
<file>icons/mPushButtonPencil.png</file>
<file>icons/mPushButtonTargetSRSEnabled.png</file>
<file>icons/mPushButtonTargetSRSDisabled.png</file>
<file>icons/mActionGDALScript.png</file>
<file>icons/mActionOpenRaster.png</file>
<file>icons/mActionSaveRasterAs.png</file>
<file>icons/mActionLinkGeorefToQGis.png</file>
<file>icons/mActionLinkQGisToGeoref.png</file>
<file>icons/mActionLoadGCPpoints.png</file>
<file>icons/mActionMoveGCPPoint.png</file>
<file>icons/mActionSaveGCPpointsAs.png</file>
<file>icons/mActionStartGeoref.png</file>
<file>icons/mActionTransformSettings.png</file>
<file>icons/mActionHelp.png</file>
<file>icons/mActionAbout.png</file>
</qresource>
</RCC>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file not shown.

0 comments on commit ecd2aa9

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