Python bindings for quickprint and change print method to printMap

timlinux · timlinux · commit 4c20f9cc4c01 · 2008-01-17T01:00:18.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7987 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -20,6 +20,7 @@
 %Include qgsmapoverviewcanvas.sip
 %Include qgsmessageviewer.sip
 %Include qgsprojectionselector.sip
+%Include qgsquickprint.sip
 %Include qgsrubberband.sip
 %Include qgsvertexmarker.sip
 
diff --git a/src/gui/qgsquickprint.cpp b/src/gui/qgsquickprint.cpp
@@ -98,7 +98,7 @@ void QgsQuickPrint::setMapCanvas(QgsMapCanvas * thepMapCanvas)
   mpMapCanvas=thepMapCanvas;
 }
 
-void QgsQuickPrint::print()
+void QgsQuickPrint::printMap()
 {
   if ( mOutputFileName.isEmpty() )
   {
diff --git a/src/gui/qgsquickprint.h b/src/gui/qgsquickprint.h
@@ -43,7 +43,7 @@ class GUI_EXPORT QgsQuickPrint:public QObject
   enum SymbolScalingType {ScaleUp, ScaleDown};
 
 public slots:
-  void print(); 
+  void printMap(); 
   void setTitle(QString theText);
   void setName(QString theText);
   void setCopyright(QString theText);
diff --git a/src/plugins/quick_print/quickprintgui.cpp b/src/plugins/quick_print/quickprintgui.cpp
@@ -105,7 +105,7 @@ void QuickPrintGui::on_buttonBox_accepted()
       myQuickPrint.setLogo1(QgsApplication::iconsPath() + "/qgis-icon.png");
       myQuickPrint.setNorthArrow(myNorthArrowFile);
       myQuickPrint.setOutputPdf(myOutputFileName);
-      myQuickPrint.print();
+      myQuickPrint.printMap();
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ void QgsQuickPrint::setMapCanvas(QgsMapCanvas * thepMapCanvas)`
`98`	`98`	`mpMapCanvas=thepMapCanvas;`
`99`	`99`	`}`
`100`	`100`
`101`		`-void QgsQuickPrint::print()`
	`101`	`+void QgsQuickPrint::printMap()`
`102`	`102`	`{`
`103`	`103`	`if ( mOutputFileName.isEmpty() )`
`104`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void QuickPrintGui::on_buttonBox_accepted()`
`105`	`105`	`myQuickPrint.setLogo1(QgsApplication::iconsPath() + "/qgis-icon.png");`
`106`	`106`	`myQuickPrint.setNorthArrow(myNorthArrowFile);`
`107`	`107`	`myQuickPrint.setOutputPdf(myOutputFileName);`
`108`		`- myQuickPrint.print();`
	`108`	`+ myQuickPrint.printMap();`
`109`	`109`	`}`
`110`	`110`	`else`
`111`	`111`	`{`