sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

changes related to mapserver export

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@299 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2003-11-12 04:44:37 +00:00
parent 2f34dd345e
commit 81e070be7a
4 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile.am
View File

@ -67,7 +67,9 @@ qgis_MOC = qgisappbase.moc.cpp \
qgsmessageviewer.moc.cpp\ qgsmessageviewer.moc.cpp\
qgspluginmanagerbase.moc.cpp\ qgspluginmanagerbase.moc.cpp\
qgsrasterlayer.moc.cpp\ qgsrasterlayer.moc.cpp\
qgsshapefilelayer.moc.cpp qgsshapefilelayer.moc.cpp \
qgsmapserverexportbase.moc.cpp \
qgsmapserverexport.moc.cpp
qgis_UI = qgisappbase.h\ qgis_UI = qgisappbase.h\
qgisappbase.cpp\ qgisappbase.cpp\
qgslegenditembase.h\ qgslegenditembase.h\
@ -83,7 +85,8 @@ qgis_UI = qgisappbase.h\
qgspluginmanagerbase.h\ qgspluginmanagerbase.h\
qgspluginmanagerbase.cpp\ qgspluginmanagerbase.cpp\
qgsmessageviewer.h\ qgsmessageviewer.h\
qgsmessageviewer.cpp qgsmessageviewer.cpp \
qgsmapserverexportbase.cpp
# UI dependencies # UI dependencies
qgisappbase.h: qgisappbase.ui qgisappbase.h: qgisappbase.ui

41
src/Makefile.in
View File

@ -209,7 +209,9 @@ qgis_MOC = qgisappbase.moc.cpp \
qgsmessageviewer.moc.cpp\ qgsmessageviewer.moc.cpp\
qgspluginmanagerbase.moc.cpp\ qgspluginmanagerbase.moc.cpp\
qgsrasterlayer.moc.cpp\ qgsrasterlayer.moc.cpp\
qgsshapefilelayer.moc.cpp\ qgsshapefilelayer.moc.cpp \
qgsmapserverexportbase.moc.cpp \
qgsmapserverexport.moc.cpp\
$(am__append_3) $(am__append_3)
qgis_UI = qgisappbase.h\ qgis_UI = qgisappbase.h\
qgisappbase.cpp\ qgisappbase.cpp\
@ -226,7 +228,8 @@ qgis_UI = qgisappbase.h\
qgspluginmanagerbase.h\ qgspluginmanagerbase.h\
qgspluginmanagerbase.cpp\ qgspluginmanagerbase.cpp\
qgsmessageviewer.h\ qgsmessageviewer.h\
qgsmessageviewer.cpp\ qgsmessageviewer.cpp \
qgsmapserverexportbase.cpp\
$(am__append_2) $(am__append_2)
#PostgreSQL files #PostgreSQL files
@ -275,18 +278,19 @@ am__qgis_SOURCES_DIST = qgisapp.cpp main.cpp qgisiface.cpp \
qgsidentifyresultsbase.cpp qgsattributetablebase.h \ qgsidentifyresultsbase.cpp qgsattributetablebase.h \
qgsattributetablebase.cpp qgspluginmanagerbase.h \ qgsattributetablebase.cpp qgspluginmanagerbase.h \
qgspluginmanagerbase.cpp qgsmessageviewer.h \ qgspluginmanagerbase.cpp qgsmessageviewer.h \
qgsmessageviewer.cpp qgsdbsourceselectbase.h \ qgsmessageviewer.cpp qgsmapserverexportbase.cpp \
qgsdbsourceselectbase.cpp qgsnewconnectionbase.h \ qgsdbsourceselectbase.h qgsdbsourceselectbase.cpp \
qgsnewconnectionbase.cpp qgisappbase.moc.cpp qgisapp.moc.cpp \ qgsnewconnectionbase.h qgsnewconnectionbase.cpp \
qgisinterface.moc.cpp qgsabout.moc.cpp \ qgisappbase.moc.cpp qgisapp.moc.cpp qgisinterface.moc.cpp \
qgsattributetablebase.moc.cpp qgsattributetable.moc.cpp \ qgsabout.moc.cpp qgsattributetablebase.moc.cpp \
qgsidentifyresultsbase.moc.cpp qgslayerpropertiesbase.moc.cpp \ qgsattributetable.moc.cpp qgsidentifyresultsbase.moc.cpp \
qgslegend.moc.cpp qgslegenditembase.moc.cpp \ qgslayerpropertiesbase.moc.cpp qgslegend.moc.cpp \
qgslegenditem.moc.cpp qgslegendview.moc.cpp \ qgslegenditembase.moc.cpp qgslegenditem.moc.cpp \
qgsmapcanvas.moc.cpp qgsmaplayer.moc.cpp \ qgslegendview.moc.cpp qgsmapcanvas.moc.cpp qgsmaplayer.moc.cpp \
qgsmaplayerinterface.moc.cpp qgsmessageviewer.moc.cpp \ qgsmaplayerinterface.moc.cpp qgsmessageviewer.moc.cpp \
qgspluginmanagerbase.moc.cpp qgsrasterlayer.moc.cpp \ qgspluginmanagerbase.moc.cpp qgsrasterlayer.moc.cpp \
qgsshapefilelayer.moc.cpp qgsdbsourceselectbase.moc.cpp \ qgsshapefilelayer.moc.cpp qgsmapserverexportbase.moc.cpp \
qgsmapserverexport.moc.cpp qgsdbsourceselectbase.moc.cpp \
qgsdatabaselayer.moc.cpp qgsdbsourceselect.moc.cpp \ qgsdatabaselayer.moc.cpp qgsdbsourceselect.moc.cpp \
qgsnewconnection.moc.cpp qgsnewconnectionbase.moc.cpp \ qgsnewconnection.moc.cpp qgsnewconnectionbase.moc.cpp \
qgsdbsourceselect.cpp qgsnewconnection.cpp qgsdatabaselayer.cpp qgsdbsourceselect.cpp qgsnewconnection.cpp qgsdatabaselayer.cpp
@ -297,7 +301,8 @@ am__objects_3 = qgisappbase.$(OBJEXT) qgslegenditembase.$(OBJEXT) \
qgsabout.$(OBJEXT) qgslayerpropertiesbase.$(OBJEXT) \ qgsabout.$(OBJEXT) qgslayerpropertiesbase.$(OBJEXT) \
qgsidentifyresultsbase.$(OBJEXT) \ qgsidentifyresultsbase.$(OBJEXT) \
qgsattributetablebase.$(OBJEXT) qgspluginmanagerbase.$(OBJEXT) \ qgsattributetablebase.$(OBJEXT) qgspluginmanagerbase.$(OBJEXT) \
qgsmessageviewer.$(OBJEXT) $(am__objects_2) qgsmessageviewer.$(OBJEXT) qgsmapserverexportbase.$(OBJEXT) \
$(am__objects_2)
am__objects_4 = qgsdbsourceselectbase.moc.$(OBJEXT) \ am__objects_4 = qgsdbsourceselectbase.moc.$(OBJEXT) \
qgsdatabaselayer.moc.$(OBJEXT) qgsdbsourceselect.moc.$(OBJEXT) \ qgsdatabaselayer.moc.$(OBJEXT) qgsdbsourceselect.moc.$(OBJEXT) \
qgsnewconnection.moc.$(OBJEXT) \ qgsnewconnection.moc.$(OBJEXT) \
@ -314,7 +319,9 @@ am__objects_6 = qgisappbase.moc.$(OBJEXT) qgisapp.moc.$(OBJEXT) \
qgsmaplayer.moc.$(OBJEXT) qgsmaplayerinterface.moc.$(OBJEXT) \ qgsmaplayer.moc.$(OBJEXT) qgsmaplayerinterface.moc.$(OBJEXT) \
qgsmessageviewer.moc.$(OBJEXT) \ qgsmessageviewer.moc.$(OBJEXT) \
qgspluginmanagerbase.moc.$(OBJEXT) qgsrasterlayer.moc.$(OBJEXT) \ qgspluginmanagerbase.moc.$(OBJEXT) qgsrasterlayer.moc.$(OBJEXT) \
qgsshapefilelayer.moc.$(OBJEXT) $(am__objects_5) qgsshapefilelayer.moc.$(OBJEXT) \
qgsmapserverexportbase.moc.$(OBJEXT) \
qgsmapserverexport.moc.$(OBJEXT) $(am__objects_5)
am__objects_7 = qgsdbsourceselect.$(OBJEXT) qgsnewconnection.$(OBJEXT) \ am__objects_7 = qgsdbsourceselect.$(OBJEXT) qgsnewconnection.$(OBJEXT) \
qgsdatabaselayer.$(OBJEXT) qgsdatabaselayer.$(OBJEXT)
@POSTGRESDB_TRUE@am__objects_8 = $(am__objects_7) @POSTGRESDB_TRUE@am__objects_8 = $(am__objects_7)
@ -384,6 +391,9 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmaplayer.moc.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/qgsmaplayer.moc.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmaplayerinterface.moc.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/qgsmaplayerinterface.moc.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmapserverexport.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/qgsmapserverexport.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmapserverexport.moc.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmapserverexportbase.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmapserverexportbase.moc.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmarkersymbol.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/qgsmarkersymbol.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmessageviewer.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/qgsmessageviewer.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/qgsmessageviewer.moc.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/qgsmessageviewer.moc.Po \
@ -518,6 +528,9 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmaplayer.moc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmaplayer.moc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmaplayerinterface.moc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmaplayerinterface.moc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexport.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexport.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexport.moc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexportbase.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexportbase.moc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmarkersymbol.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmarkersymbol.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmessageviewer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmessageviewer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmessageviewer.moc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmessageviewer.moc.Po@am__quote@

23
src/qgisapp.cpp
View File

@ -62,6 +62,7 @@
#include "qgslegendview.h" #include "qgslegendview.h"
#include "qgsprojectio.h" #include "qgsprojectio.h"
#include "qgsmapserverexport.h" #include "qgsmapserverexport.h"
#ifdef POSTGRESQL #ifdef POSTGRESQL
#include <libpq++.h> #include <libpq++.h>
#include "qgsdbsourceselect.h" #include "qgsdbsourceselect.h"
@ -84,8 +85,8 @@ typedef QString name_t();
typedef QString description_t(); typedef QString description_t();
// version // version
static const char *qgisVersion = "0.0.13 Development - September-October 2003"; //static const char *qgisVersion = "0.0.13 Development - September-October 2003";
static const int qgisVersionInt = 13; //static const int qgisVersionInt = 13;
// cursors // cursors
static unsigned char zoom_in_bits[] = { static unsigned char zoom_in_bits[] = {
0xf8, 0x00, 0x06, 0x03, 0x22, 0x02, 0x21, 0x04, 0x21, 0x04, 0xfd, 0x05, 0xf8, 0x00, 0x06, 0x03, 0x22, 0x02, 0x21, 0x04, 0x21, 0x04, 0xfd, 0x05,
@ -181,7 +182,7 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare
mapLegend->setMapCanvas(mapCanvas); mapLegend->setMapCanvas(mapCanvas);
legendView->setResizeMode(QListView::AllColumns); legendView->setResizeMode(QListView::AllColumns);
QString caption = "Quantum GIS - "; QString caption = "Quantum GIS - ";
caption += qgisVersion; caption += QGis::qgisVersion;
setCaption(caption); setCaption(caption);
connect(mapCanvas, SIGNAL(xyCoordinates(QgsPoint &)), this, SLOT(showMouseCoordinate(QgsPoint &))); connect(mapCanvas, SIGNAL(xyCoordinates(QgsPoint &)), this, SLOT(showMouseCoordinate(QgsPoint &)));
connect(legendView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(layerProperties(QListViewItem *))); connect(legendView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(layerProperties(QListViewItem *)));
@ -220,7 +221,7 @@ void QgisApp::about()
{ {
QgsAbout *abt = new QgsAbout(); QgsAbout *abt = new QgsAbout();
QString versionString = "Version "; QString versionString = "Version ";
versionString += qgisVersion; versionString += QGis::qgisVersion;
#ifdef POSTGRESQL #ifdef POSTGRESQL
versionString += " with PostgreSQL support"; versionString += " with PostgreSQL support";
#else #else
@ -230,7 +231,7 @@ void QgisApp::about()
QString urls = "Web Page: http://qgis.sourceforge.net\nSourceforge Project Page: http://sourceforge.net/projects/qgis"; QString urls = "Web Page: http://qgis.sourceforge.net\nSourceforge Project Page: http://sourceforge.net/projects/qgis";
abt->setURLs(urls); abt->setURLs(urls);
QString watsNew = "Version "; QString watsNew = "Version ";
watsNew += qgisVersion; watsNew += QGis::qgisVersion;
watsNew += "\n" watsNew += "\n"
"**Multiple features displayed with the Identify tool\n" "**Multiple features displayed with the Identify tool\n"
"**Identify function returns and displays attributes for multiple\n" "**Identify function returns and displays attributes for multiple\n"
@ -398,9 +399,13 @@ void QgisApp::fileSaveAs(){
} }
void QgisApp::exportMapServer(){ void QgisApp::exportMapServer(){
QgsMapServerExport *mse = new QgsMapServerExport(mapCanvas, QgsProjectIo::SAVEAS);
mse->write(); QgsMapserverExport *mse = new QgsMapserverExport(mapCanvas, this);
if(mse->exec()){
mse->write();
}
delete mse; delete mse;
} }
void QgisApp::zoomIn() void QgisApp::zoomIn()
{ {
@ -966,11 +971,11 @@ void QgisApp::socketConnectionClosed(){
// check the version from the server against our version // check the version from the server against our version
QString versionInfo; QString versionInfo;
int currentVersion = parts[0].toInt(); int currentVersion = parts[0].toInt();
if(currentVersion > qgisVersionInt){ if(currentVersion > QGis::qgisVersionInt){
// show version message from server // show version message from server
versionInfo = "There is a new version of QGIS available\n"; versionInfo = "There is a new version of QGIS available\n";
}else{ }else{
if(qgisVersionInt > currentVersion){ if(QGis::qgisVersionInt > currentVersion){
versionInfo = "You are running a development version of QGIS\n"; versionInfo = "You are running a development version of QGIS\n";
}else{ }else{
versionInfo = "You are running the current version of QGIS\n"; versionInfo = "You are running the current version of QGIS\n";

14
src/qgsprojectio.cpp
View File

@ -12,7 +12,7 @@
* (at your option) any later version. * * (at your option) any later version. *
* * * *
***************************************************************************/ ***************************************************************************/
/* qgsprojectio.cpp,v 1.10 2003/11/11 06:34:27 gsherman Exp */ /* qgsprojectio.cpp,v 1.11 2003/11/12 04:44:37 gsherman Exp */
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <qfiledialog.h> #include <qfiledialog.h>
@ -50,7 +50,8 @@ bool QgsProjectIo::write(){
//QMessageBox::information(0,"Full Path",fullPath); //QMessageBox::information(0,"Full Path",fullPath);
int okToSave = 0; int okToSave = 0;
if(QFile::exists(fullPath) && (action == SAVEAS)){ if(QFile::exists(fullPath) && (action == SAVEAS)){
okToSave = QMessageBox::warning(0,"Overwrite File?",fullPath + " exists. \nDo you want to overwrite it?", "Yes", "No"); okToSave = QMessageBox::warning(0,"Overwrite File?",fullPath +
" exists. \nDo you want to overwrite it?", "Yes", "No");
} }
if(okToSave == 0){ if(okToSave == 0){
// write the project information to the selected file // write the project information to the selected file
@ -189,11 +190,13 @@ if(action == SAVE && fullPath.isEmpty()){
} }
switch(action){ switch(action){
case OPEN: case OPEN:
fullPath = QFileDialog::getOpenFileName("./", "QGis files (*.qgs)", 0, 0, "Choose a file to open" ); fullPath = QFileDialog::getOpenFileName("./", "QGis files (*.qgs)", 0, 0,
"Choose a file to open" );
break; break;
case SAVEAS: case SAVEAS:
fullPath = QFileDialog::getSaveFileName("./", "QGis files (*.qgs)", 0, 0, "Choose a filename to save" ); fullPath = QFileDialog::getSaveFileName("./", "QGis files (*.qgs)", 0,
0, "Choose a filename to save" );
break; break;
} }
return fullPath; return fullPath;
@ -248,7 +251,8 @@ void QgsProjectIo::writeXML(){
xml << "\">\n"; xml << "\">\n";
if(isDatabase){ if(isDatabase){
// cast the layer to a qgsdatabaselayer // cast the layer to a qgsdatabaselayer
// TODO fix this so database layers are properly saved/restored when name is changed in legend // TODO fix this so database layers are properly saved/restored
// when name is changed in legend
/* QgsDatabaseLayer *dblyr = (QgsDatabaseLayer *)lyr; /* QgsDatabaseLayer *dblyr = (QgsDatabaseLayer *)lyr;
xml << "\t\t<layername>" + dblyr->schemaName() << "." << xml << "\t\t<layername>" + dblyr->schemaName() << "." <<
dblyr->geometryTableName() << "</layername>\n"; */ dblyr->geometryTableName() << "</layername>\n"; */