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@12945 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 14, 2010 · 38fbd11 · 38fbd11
1 parent 1309434
commit 38fbd11
Show file tree

Hide file tree

Showing 84 changed files with 5,784 additions and 2,255 deletions.
diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
@@ -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)
 
 

diff --git a/src/plugins/georeferencer/add_point.xpm b/src/plugins/georeferencer/add_point.xpm
diff --git a/src/plugins/georeferencer/georeferencer.qrc b/src/plugins/georeferencer/georeferencer.qrc
@@ -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>
diff --git a/src/plugins/georeferencer/icons/mActionAbout.png b/src/plugins/georeferencer/icons/mActionAbout.png
diff --git a/src/plugins/georeferencer/icons/mActionGDALScript.png b/src/plugins/georeferencer/icons/mActionGDALScript.png
diff --git a/src/plugins/georeferencer/icons/mActionHelp.png b/src/plugins/georeferencer/icons/mActionHelp.png
diff --git a/src/plugins/georeferencer/icons/mActionInfoTabWidget.png b/src/plugins/georeferencer/icons/mActionInfoTabWidget.png
diff --git a/src/plugins/georeferencer/icons/mActionLinkGeorefToQGis.png b/src/plugins/georeferencer/icons/mActionLinkGeorefToQGis.png
diff --git a/src/plugins/georeferencer/icons/mActionLinkGeorefToQGis.xcf b/src/plugins/georeferencer/icons/mActionLinkGeorefToQGis.xcf
diff --git a/src/plugins/georeferencer/icons/mActionLinkQGisToGeoref.png b/src/plugins/georeferencer/icons/mActionLinkQGisToGeoref.png
diff --git a/src/plugins/georeferencer/icons/mActionLinkQGisToGeoref.xcf b/src/plugins/georeferencer/icons/mActionLinkQGisToGeoref.xcf
diff --git a/src/plugins/georeferencer/icons/mActionLoadGCPpoints.png b/src/plugins/georeferencer/icons/mActionLoadGCPpoints.png
diff --git a/src/plugins/georeferencer/icons/mActionMoveGCPPoint.png b/src/plugins/georeferencer/icons/mActionMoveGCPPoint.png
diff --git a/src/plugins/georeferencer/icons/mActionOpenRaster.png b/src/plugins/georeferencer/icons/mActionOpenRaster.png
diff --git a/src/plugins/georeferencer/icons/mActionProjectProperties.png b/src/plugins/georeferencer/icons/mActionProjectProperties.png
diff --git a/src/plugins/georeferencer/icons/mActionSaveGCPpointsAs.png b/src/plugins/georeferencer/icons/mActionSaveGCPpointsAs.png
diff --git a/src/plugins/georeferencer/icons/mActionSaveRasterAs.png b/src/plugins/georeferencer/icons/mActionSaveRasterAs.png
diff --git a/src/plugins/georeferencer/icons/mActionStartGeoref.png b/src/plugins/georeferencer/icons/mActionStartGeoref.png
diff --git a/src/plugins/georeferencer/icons/mActionTransformSettings.png b/src/plugins/georeferencer/icons/mActionTransformSettings.png
diff --git a/src/plugins/georeferencer/georef.png → ...eoreferencer/icons/mGeorefDescription.png b/src/plugins/georeferencer/georef.png → ...eoreferencer/icons/mGeorefDescription.png
diff --git a/src/plugins/georeferencer/georeferencer.png → ...lugins/georeferencer/icons/mGeorefRun.png b/src/plugins/georeferencer/georeferencer.png → ...lugins/georeferencer/icons/mGeorefRun.png
diff --git a/src/plugins/georeferencer/icons/mPushButtonClipboard.png b/src/plugins/georeferencer/icons/mPushButtonClipboard.png
diff --git a/src/plugins/georeferencer/icons/mPushButtonEditPaste.png b/src/plugins/georeferencer/icons/mPushButtonEditPaste.png
diff --git a/src/plugins/georeferencer/icons/mPushButtonFileOpen.png b/src/plugins/georeferencer/icons/mPushButtonFileOpen.png
diff --git a/src/plugins/georeferencer/pencil.png → ...georeferencer/icons/mPushButtonPencil.png b/src/plugins/georeferencer/pencil.png → ...georeferencer/icons/mPushButtonPencil.png
diff --git a/src/plugins/georeferencer/icons/mPushButtonTargetSRSDisabled.png b/src/plugins/georeferencer/icons/mPushButtonTargetSRSDisabled.png
diff --git a/src/plugins/georeferencer/icons/mPushButtonTargetSRSEnabled.png b/src/plugins/georeferencer/icons/mPushButtonTargetSRSEnabled.png