mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-06 00:07:29 -04:00
changed #ifdef DEBUG to #ifdef QGISDEBUG to fix rh/fedora problem
git-svn-id: http://svn.osgeo.org/qgis/trunk@873 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman
parent
79ee83d007
commit
f5337a7d69
@ -130,7 +130,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
|
||||
// create the connection string
|
||||
QString connInfo = dataSource.left(dataSource.find("table="));
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Data source = " << QString("Datasource:%1\n\nConnectionInfo:%2").arg(dataSource).arg(connInfo) << std::endl;
|
||||
#endif
|
||||
// connect to the database and check the capabilities
|
||||
@ -193,7 +193,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
QString("select srid,f_geometry_column from geometry_columns where f_table_schema='%1' and f_table_name='%2'")
|
||||
.arg(schema)
|
||||
.arg(tableName.mid(tableName.find(".") + 1));
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "SRID SQL" << sridSql << std::endl;
|
||||
#endif
|
||||
QString geometryCol;
|
||||
@ -232,7 +232,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
sql = QString("set search_path = '%1','public'").arg(bb->schema());
|
||||
result = PQexec(conn, (const char *) sql);
|
||||
PQclear(result);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
}
|
||||
@ -243,11 +243,11 @@ void QgsPgGeoprocessing::buffer()
|
||||
.arg(bb->bufferLayerName())
|
||||
.arg(objId)
|
||||
.arg(objIdType);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
result = PQexec(conn, (const char *) sql);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Status from create table is " << PQresultStatus(result) << std::endl;
|
||||
#endif
|
||||
if (PQresultStatus(result) == PGRES_COMMAND_OK) {
|
||||
@ -261,7 +261,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
.arg(bb->srid())
|
||||
.arg("POLYGON")
|
||||
.arg("2");
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
PGresult *geoCol = PQexec(conn, (const char *) sql);
|
||||
@ -270,7 +270,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
sql = QString("alter table %1.%2 drop constraint \"$2\"")
|
||||
.arg(bb->schema())
|
||||
.arg(bb->bufferLayerName());
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
result = PQexec(conn, (const char *) sql);
|
||||
@ -286,7 +286,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
// modify the tableName
|
||||
tableName = tableName.mid(tableName.find(".")+1);
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Table name for PG 7.3 is: " << tableName.mid(tableName.find(".")+1) << std::endl;
|
||||
#endif
|
||||
// if(PQresultStatus(geoCol) == PGRES_COMMAND_OK) {
|
||||
@ -305,7 +305,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
.arg(geometryCol)
|
||||
.arg(bb->bufferDistance().toDouble())
|
||||
.arg(tableName);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
|
||||
@ -313,7 +313,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
result = PQexec(conn, (const char *) sql);
|
||||
PQclear(result);
|
||||
// }
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
result = PQexec(conn, "end work");
|
||||
@ -326,13 +326,13 @@ void QgsPgGeoprocessing::buffer()
|
||||
if (bb->addLayerToMap()) {
|
||||
// create the connection string
|
||||
QString newLayerSource = dataSource.left(dataSource.find("table="));
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "newLayerSource: " << newLayerSource << std::endl;
|
||||
#endif
|
||||
// add the schema.table and geometry column
|
||||
/* newLayerSource += "table=" + bb->schema() + "." + bb->bufferLayerName()
|
||||
+ " (" + bb->geometryColumn() + ")"; */
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "newLayerSource: " << newLayerSource << std::endl;
|
||||
std::cerr << "Adding new layer using\n\t" << newLayerSource << std::endl;
|
||||
#endif
|
||||
@ -370,7 +370,7 @@ void QgsPgGeoprocessing::buffer()
|
||||
QString QgsPgGeoprocessing::postgisVersion(PGconn *connection){
|
||||
PGresult *result = PQexec(connection, "select postgis_version()");
|
||||
postgisVersionInfo = PQgetvalue(result,0,0);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "PostGIS version info: " << postgisVersionInfo << std::endl;
|
||||
#endif
|
||||
// assume no capabilities
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
|
||||
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
|
||||
<class>QgsSpitBase</class>
|
||||
<widget class="QDialog">
|
||||
<property name="name">
|
||||
|
||||
@ -16,29 +16,29 @@ QgsShapeFileProvider::QgsShapeFileProvider(QString uri):dataSourceUri(uri), minm
|
||||
OGRRegisterAll();
|
||||
|
||||
// make connection to the data source
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Data source uri is " << uri << std::endl;
|
||||
#endif
|
||||
ogrDataSource = OGRSFDriverRegistrar::Open((const char *) uri);
|
||||
if (ogrDataSource != NULL) {
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Data source is valid" << std::endl;
|
||||
#endif
|
||||
valid = true;
|
||||
ogrLayer = ogrDataSource->GetLayer(0);
|
||||
// get the extent_ (envelope) of the layer
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Starting get extent\n";
|
||||
#endif
|
||||
extent_ = new OGREnvelope();
|
||||
ogrLayer->GetExtent(extent_);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Finished get extent\n";
|
||||
#endif
|
||||
// getting the total number of features in the layer
|
||||
numberFeatures = ogrLayer->GetFeatureCount();
|
||||
// check the validity of the layer
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "checking validity\n";
|
||||
#endif
|
||||
OGRFeature *feat = ogrLayer->GetNextFeature();
|
||||
@ -67,13 +67,13 @@ QgsShapeFileProvider::QgsShapeFileProvider(QString uri):dataSourceUri(uri), minm
|
||||
}
|
||||
|
||||
ogrLayer->ResetReading();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Done checking validity\n";
|
||||
#endif
|
||||
} else {
|
||||
std::cerr << "Data source is invalid" << std::endl;
|
||||
const char *er = CPLGetLastErrorMsg();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << er << std::endl;
|
||||
#endif
|
||||
valid = false;
|
||||
@ -105,17 +105,17 @@ QgsFeature *QgsShapeFileProvider::getFirstFeature(bool fetchAttributes)
|
||||
{
|
||||
QgsFeature *f = 0;
|
||||
if(valid){
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "getting first feature\n";
|
||||
#endif
|
||||
ogrLayer->ResetReading();
|
||||
OGRFeature *feat = ogrLayer->GetNextFeature();
|
||||
if(feat){
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "First feature is not null\n";
|
||||
#endif
|
||||
}else{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "First feature is null\n";
|
||||
#endif
|
||||
}
|
||||
@ -157,7 +157,7 @@ QgsFeature *QgsShapeFileProvider::getNextFeature(bool fetchAttributes)
|
||||
delete[] wkt; */
|
||||
delete fet;
|
||||
}else{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Feature is null\n";
|
||||
#endif
|
||||
// probably should reset reading here
|
||||
@ -166,7 +166,7 @@ QgsFeature *QgsShapeFileProvider::getNextFeature(bool fetchAttributes)
|
||||
|
||||
|
||||
}else{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Read attempt on an invalid shapefile data source\n";
|
||||
#endif
|
||||
}
|
||||
@ -206,7 +206,7 @@ void QgsShapeFileProvider::select(QgsRect *rect, bool useIntersect)
|
||||
}
|
||||
ogrLayer->ResetReading();*/
|
||||
}else{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Setting spatial filter failed!" << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -54,14 +54,14 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
geometryColumn.truncate(geometryColumn.length() - 1);
|
||||
tableName = tableName.mid(tableName.find(".") + 1, tableName.find(" (") - (tableName.find(".") + 1));
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Geometry column is: " << geometryColumn << std::endl;
|
||||
std::cerr << "Schema is: " + schema << std::endl;
|
||||
std::cerr << "Table name is: " + tableName << std::endl;
|
||||
#endif
|
||||
//QString logFile = "./pg_provider_" + tableName + ".log";
|
||||
//pLog.open((const char *)logFile);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Opened log file for " << tableName << std::endl;
|
||||
#endif
|
||||
PGconn *pd = PQconnectdb((const char *) connInfo);
|
||||
@ -69,7 +69,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
if (PQstatus(pd) == CONNECTION_OK) {
|
||||
/* Check to see if we have GEOS support and if not, warn the user about
|
||||
the problems they will see :) */
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Checking for GEOS support" << std::endl;
|
||||
#endif
|
||||
if(!hasGEOS(pd)){
|
||||
@ -89,7 +89,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
// check the geometry column
|
||||
QString sql = "select f_geometry_column,type,srid from geometry_columns where f_table_name='"
|
||||
+ tableName + "' and f_geometry_column = '" + geometryColumn + "' and f_table_schema = '" + schema + "'";
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Getting geometry column: " + sql << std::endl;
|
||||
#endif
|
||||
PGresult *result = PQexec(pd, (const char *) sql);
|
||||
@ -111,7 +111,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
PGresult * oidResult = PQexec(pd, firstOid);
|
||||
// get the int value from a "normal" select
|
||||
QString oidValue = PQgetvalue(oidResult,0,0);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Creating binary cursor" << std::endl;
|
||||
#endif
|
||||
// get the same value using a binary cursor
|
||||
@ -120,7 +120,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
// set up the cursor
|
||||
PQexec(pd, (const char *)oidDeclare);
|
||||
QString fetch = "fetch forward 1 from oidcursor";
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Fecthing a record and attempting to get check endian-ness" << std::endl;
|
||||
#endif
|
||||
PGresult *fResult = PQexec(pd, (const char *)fetch);
|
||||
@ -138,7 +138,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
}
|
||||
// end the cursor transaction
|
||||
PQexec(pd, "end work");
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Setting layer type" << std::endl;
|
||||
#endif
|
||||
// set the type
|
||||
@ -159,7 +159,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
sql = "select xmax(extent(" + geometryColumn + ")) as xmax,"
|
||||
"xmin(extent(" + geometryColumn + ")) as xmin,"
|
||||
"ymax(extent(" + geometryColumn + ")) as ymax," "ymin(extent(" + geometryColumn + ")) as ymin" " from " + tableName;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Getting extents using schema.table: " + sql << std::endl;
|
||||
#endif
|
||||
result = PQexec(pd, (const char *) sql);
|
||||
@ -172,7 +172,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
QTextOStream(&xMsg).width(18);
|
||||
QTextOStream(&xMsg) << "Set extents to: " << layerExtent.
|
||||
xMin() << ", " << layerExtent.yMin() << " " << layerExtent.xMax() << ", " << layerExtent.yMax();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << xMsg << std::endl;
|
||||
#endif
|
||||
// clear query result
|
||||
@ -232,7 +232,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
sql = "select count(*) from " + tableName;
|
||||
result = PQexec(pd, (const char *) sql);
|
||||
numberFeatures = QString(PQgetvalue(result, 0, 0)).toLong();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Number of features: " << numberFeatures << std::endl;
|
||||
#endif
|
||||
|
||||
@ -243,7 +243,7 @@ QgsPostgresProvider::QgsPostgresProvider(QString uri):dataSourceUri(uri)
|
||||
} else {
|
||||
// the table is not a geometry table
|
||||
valid = false;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Invalid Postgres layer" << std::endl;
|
||||
#endif
|
||||
}
|
||||
@ -386,7 +386,11 @@ QgsFeature *QgsPostgresProvider::getNextFeature(bool fetchAttributes)
|
||||
void QgsPostgresProvider::select(QgsRect * rect, bool useIntersect)
|
||||
{
|
||||
// spatial query to select features
|
||||
//--std::cout << "Selection rectangle is " << *rect << std::endl;
|
||||
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Selection rectangle is " << *rect << std::endl;
|
||||
std::cerr << "Selection polygon is " << rect->asPolygon() << std::endl;
|
||||
#endif
|
||||
QString declare = QString("declare qgisf binary cursor for select "
|
||||
+ primaryKey
|
||||
+ ",asbinary(%1,'%2') as qgs_feature_geometry from %3").arg(geometryColumn).arg(endianString()).arg(tableName);
|
||||
@ -403,7 +407,9 @@ void QgsPostgresProvider::select(QgsRect * rect, bool useIntersect)
|
||||
declare += srid;
|
||||
declare += ")";
|
||||
}
|
||||
//--std::cout << "Selecting features using: " << declare << std::endl;
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Selecting features using: " << declare << std::endl;
|
||||
#endif
|
||||
// set up the cursor
|
||||
if(ready){
|
||||
PQexec(connection, "end work");
|
||||
@ -535,7 +541,7 @@ void QgsPostgresProvider::reset()
|
||||
primaryKey +
|
||||
",asbinary(%1,'%2') as qgs_feature_geometry from %3").arg(geometryColumn).arg(endianString()).arg(tableName);
|
||||
//--std::cout << "Selecting features using: " << declare << std::endl;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Setting up binary cursor: " << declare << std::endl;
|
||||
#endif
|
||||
// set up the cursor
|
||||
@ -577,12 +583,12 @@ QString QgsPostgresProvider::endianString()
|
||||
}
|
||||
QString QgsPostgresProvider::getPrimaryKey(){
|
||||
QString sql = "select oid from pg_class where relname = '" + tableName + "'";
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Getting primary key" << std::endl;
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
PGresult *pk = PQexec(connection,(const char *)sql);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Got " << PQntuples(pk) << " rows " << std::endl;
|
||||
#endif
|
||||
// get the oid for the table
|
||||
@ -590,7 +596,7 @@ QString QgsPostgresProvider::getPrimaryKey(){
|
||||
// check to see if there is a primary key
|
||||
sql = "select indkey from pg_index where indrelid = " +
|
||||
oid + " and indisprimary = 't'";
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << sql << std::endl;
|
||||
#endif
|
||||
PQclear(pk);
|
||||
@ -598,7 +604,7 @@ QString QgsPostgresProvider::getPrimaryKey(){
|
||||
// if we got no tuples we ain't go no pk :)
|
||||
if(PQntuples(pk) == 0){
|
||||
// no key - should we warn the user that performance will suffer
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Table has no primary key -- using oid to fetch records" << std::endl;
|
||||
#endif
|
||||
primaryKey = "oid";
|
||||
@ -608,14 +614,14 @@ QString QgsPostgresProvider::getPrimaryKey(){
|
||||
QStringList columns = QStringList::split(" ", keyString);
|
||||
if(columns.count() > 1){
|
||||
//TODO concatenated key -- can we use this?
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Table has a concatenated primary key" << std::endl;
|
||||
#endif
|
||||
}
|
||||
primaryKeyIndex = columns[0].toInt()-1;
|
||||
QgsField fld = attributeFields[primaryKeyIndex];
|
||||
primaryKey = fld.getName();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Primary key is " << primaryKey << std::endl;//);// +<< " at column " << primaryKeyIndex << std::endl;
|
||||
#endif
|
||||
// pLog.flush();
|
||||
@ -679,7 +685,7 @@ bool QgsPostgresProvider::hasGEOS(PGconn *connection){
|
||||
QString QgsPostgresProvider::postgisVersion(PGconn *connection){
|
||||
PGresult *result = PQexec(connection, "select postgis_version()");
|
||||
postgisVersionInfo = PQgetvalue(result,0,0);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "PostGIS version info: " << postgisVersionInfo << std::endl;
|
||||
#endif
|
||||
// assume no capabilities
|
||||
|
||||
10
src/main.cpp
10
src/main.cpp
@ -61,7 +61,7 @@ int main(int argc, char *argv[])
|
||||
//
|
||||
for (int myIteratorInt = 1; myIteratorInt < argc; myIteratorInt++)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
printf("%d: %s\n", myIteratorInt, argv[myIteratorInt]);
|
||||
#endif
|
||||
myQFile.setName(argv[myIteratorInt]);
|
||||
@ -69,23 +69,23 @@ int main(int argc, char *argv[])
|
||||
myQFile.close();
|
||||
if (myFileExistsFlag)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
printf("OK\n");
|
||||
#endif
|
||||
myArgString = argv[myIteratorInt];
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
printf("Layer count: %d\n", myFileStringList.count());
|
||||
#endif
|
||||
myFileStringList.append(myArgString);
|
||||
|
||||
}
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
printf("rCount: %d\n", myFileStringList.count());
|
||||
#endif
|
||||
if (!myFileStringList.isEmpty())
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
printf("Loading vector files...\n");
|
||||
#endif
|
||||
//try to add all these layers - any unsupported file types will be refected automatically
|
||||
|
||||
@ -293,7 +293,7 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare
|
||||
plib += "/lib/qgis";
|
||||
providerRegistry = QgsProviderRegistry::instance(plib);
|
||||
// set the provider plugin path
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting plugin lib dir to " << plib << std::endl;
|
||||
#endif
|
||||
// connect the "cleanup" slot
|
||||
@ -304,7 +304,7 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare
|
||||
mySplash->finish(this);
|
||||
delete mySplash;
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Plugins are installed in " << plib << std::endl;
|
||||
#endif
|
||||
// set the dirty flag to false -- no changes yet
|
||||
@ -417,7 +417,7 @@ static void buildSupportedVectorFileFilter_(QString & fileFilters)
|
||||
|
||||
driverName = driver->GetName();
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qDebug("got driver string %s", driver->GetName());
|
||||
#endif
|
||||
|
||||
@ -564,7 +564,7 @@ void QgisApp::addLayer()
|
||||
|
||||
if (pOgr.isEmpty())
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qDebug( "unable to get OGR registry" );
|
||||
#endif
|
||||
}
|
||||
@ -783,7 +783,7 @@ static void buildSupportedRasterFileFilter_(QString & fileFilters)
|
||||
if (!isSupportedRasterDriver_(driverDescription))
|
||||
{
|
||||
// not supported, therefore skip
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("skipping unsupported driver %s", driver->GetDescription());
|
||||
#endif
|
||||
continue;
|
||||
@ -1519,13 +1519,13 @@ void QgisApp::loadPlugin(QString name, QString description, QString fullPath)
|
||||
} else
|
||||
{
|
||||
QLibrary *myLib = new QLibrary(fullPath);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Library name is " << myLib->library() << std::endl;
|
||||
#endif
|
||||
bool loaded = myLib->load();
|
||||
if (loaded)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Loaded test plugin library" << std::endl;
|
||||
std::cout << "Attempting to resolve the classFactory function" << std::endl;
|
||||
#endif
|
||||
@ -1554,7 +1554,7 @@ void QgisApp::loadPlugin(QString name, QString description, QString fullPath)
|
||||
}
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Unable to find the class factory for " << fullPath << std::endl;
|
||||
#endif
|
||||
}
|
||||
@ -1580,7 +1580,7 @@ void QgisApp::loadPlugin(QString name, QString description, QString fullPath)
|
||||
}
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Unable to find the class factory for " << fullPath << std::endl;
|
||||
#endif
|
||||
}
|
||||
@ -1588,7 +1588,7 @@ void QgisApp::loadPlugin(QString name, QString description, QString fullPath)
|
||||
break;
|
||||
default:
|
||||
// type is unknown
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Plugin " << fullPath << " did not return a valid type and cannot be loaded" << std::endl;
|
||||
#endif
|
||||
break;
|
||||
@ -1600,7 +1600,7 @@ void QgisApp::loadPlugin(QString name, QString description, QString fullPath)
|
||||
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Failed to load " << fullPath << "\n";
|
||||
#endif
|
||||
}
|
||||
@ -1617,32 +1617,32 @@ void QgisApp::testMapLayerPlugins()
|
||||
{
|
||||
for (unsigned i = 0; i < mlpDir.count(); i++)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Getting information for plugin: " << mlpDir[i] << std::endl;
|
||||
std::cout << "Attempting to load the plugin using dlopen\n";
|
||||
#endif
|
||||
void *handle = dlopen("../plugins/maplayer/" + mlpDir[i], RTLD_LAZY);
|
||||
if (!handle)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Error in dlopen: " << dlerror() << std::endl;
|
||||
#endif
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "dlopen suceeded" << std::endl;
|
||||
#endif
|
||||
dlclose(handle);
|
||||
}
|
||||
|
||||
QLibrary *myLib = new QLibrary("../plugins/maplayer/" + mlpDir[i]);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Library name is " << myLib->library() << std::endl;
|
||||
#endif
|
||||
bool loaded = myLib->load();
|
||||
if (loaded)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Loaded test plugin library" << std::endl;
|
||||
std::cout << "Attempting to resolve the classFactory function" << std::endl;
|
||||
#endif
|
||||
@ -1650,32 +1650,32 @@ void QgisApp::testMapLayerPlugins()
|
||||
|
||||
if (cf)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Getting pointer to a MapLayerInterface object from the library\n";
|
||||
#endif
|
||||
QgsMapLayerInterface *pl = cf();
|
||||
if (pl)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Instantiated the maplayer test plugin\n";
|
||||
#endif
|
||||
// set the main window pointer for the plugin
|
||||
pl->setQgisMainWindow(this);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "getInt returned " << pl->getInt() << " from map layer plugin\n";
|
||||
#endif
|
||||
// set up the gui
|
||||
pl->initGui();
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Unable to instantiate the maplayer test plugin\n";
|
||||
#endif
|
||||
}
|
||||
}
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Failed to load " << mlpDir[i] << "\n";
|
||||
#endif
|
||||
}
|
||||
@ -1702,15 +1702,15 @@ void QgisApp::testPluginFunctions()
|
||||
|
||||
for (unsigned i = 0; i < pluginDir.count(); i++)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Getting information for plugin: " << pluginDir[i] << std::endl;
|
||||
#endif
|
||||
QLibrary *myLib = new QLibrary("../plugins/" + pluginDir[i]); //"/home/gsherman/development/qgis/plugins/" + pluginDir[i]);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Library name is " << myLib->library() << std::endl;
|
||||
#endif
|
||||
//QLibrary myLib("../plugins/" + pluginDir[i]);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Attempting to load " << +"../plugins/" + pluginDir[i] << std::endl;
|
||||
#endif
|
||||
/* void *handle = dlopen("/home/gsherman/development/qgis/plugins/" + pluginDir[i], RTLD_LAZY);
|
||||
@ -1726,7 +1726,7 @@ void QgisApp::testPluginFunctions()
|
||||
bool loaded = myLib->load();
|
||||
if (loaded)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Loaded test plugin library" << std::endl;
|
||||
std::cout << "Getting the name of the plugin" << std::endl;
|
||||
#endif
|
||||
@ -1735,18 +1735,18 @@ void QgisApp::testPluginFunctions()
|
||||
{
|
||||
QMessageBox::information(this, tr("Name"), tr("Plugin %1 is named %2").arg(pluginDir[i]).arg(pName()));
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Attempting to resolve the classFactory function" << std::endl;
|
||||
#endif
|
||||
create_t *cf = (create_t *) myLib->resolve("classFactory");
|
||||
|
||||
if (cf)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Getting pointer to a QgisPlugin object from the library\n";
|
||||
#endif
|
||||
QgisPlugin *pl = cf(this, qgisInterface);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Displaying name, version, and description\n";
|
||||
std::cout << "Plugin name: " << pl->name() << std::endl;
|
||||
std::cout << "Plugin version: " << pl->version() << std::endl;
|
||||
@ -1756,7 +1756,7 @@ void QgisApp::testPluginFunctions()
|
||||
tr("Name: %1").arg(pl->name()) + "\n" + tr("Version: %1").arg(pl->version()) + "\n" +
|
||||
tr("Description: %1").arg(pl->description()));
|
||||
// unload the plugin (delete it)
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Attempting to resolve the unload function" << std::endl;
|
||||
#endif
|
||||
/*
|
||||
@ -1773,7 +1773,7 @@ void QgisApp::testPluginFunctions()
|
||||
{
|
||||
QMessageBox::warning(this, tr("Unable to Load Plugin"),
|
||||
tr("QGIS was unable to load the plugin from: %1").arg(pluginDir[i]));
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Unable to load library" << std::endl;
|
||||
#endif
|
||||
}
|
||||
@ -2079,7 +2079,7 @@ int QgisApp::saveDirty()
|
||||
{
|
||||
int answer = 0;
|
||||
mapCanvas->freeze(true);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Layer count is " << mapCanvas->layerCount() << std::endl;
|
||||
std::cout << "Project is ";
|
||||
if (projectIsDirty)
|
||||
|
||||
@ -76,7 +76,7 @@ int QgisIface::addMenu(QString menuText, QPopupMenu * menu)
|
||||
{
|
||||
QMenuBar *mainMenu = qgis->menuBar();
|
||||
// get the index of the help menu
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Menu item count is : " << mainMenu->count() << std::endl;
|
||||
#endif
|
||||
return mainMenu->insertItem(menuText, menu, -1, mainMenu->count() - 1);
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
|
||||
QgsContColDialog::QgsContColDialog(QgsVectorLayer * layer):QgsContColDialogBase(), m_vectorlayer(layer)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsContColDialog");
|
||||
#endif
|
||||
|
||||
@ -97,14 +97,14 @@ QgsContColDialog::QgsContColDialog(QgsVectorLayer * layer):QgsContColDialogBase(
|
||||
|
||||
QgsContColDialog::QgsContColDialog()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsContColDialog");
|
||||
#endif
|
||||
}
|
||||
|
||||
QgsContColDialog::~QgsContColDialog()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("destructor QgsContColDialog");
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -149,7 +149,7 @@ void QgsDbSourceSelect::dbConnect()
|
||||
// allow null password entry in case its valid for the database
|
||||
}
|
||||
connString += " password=" + password;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Connection info: " << connString << std::endl;
|
||||
#endif
|
||||
if (makeConnection)
|
||||
|
||||
@ -33,7 +33,7 @@ QgsFeature::QgsFeature(int id):fId(id), geometry(0), wkt(0)
|
||||
//! Destructor
|
||||
QgsFeature::~QgsFeature()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "In QgsFeature destructor" << std::endl;
|
||||
#endif
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer):QgsGraSyDialogBase(), ext
|
||||
{
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsGraSyDialog");
|
||||
#endif
|
||||
|
||||
@ -145,7 +145,7 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer):QgsGraSyDialogBase(), ext
|
||||
|
||||
QgsGraSyDialog::QgsGraSyDialog()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsGraSyDialog");
|
||||
#endif
|
||||
}
|
||||
@ -157,7 +157,7 @@ QgsGraSyDialog::~QgsGraSyDialog()
|
||||
ext->hide();
|
||||
delete ext;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("destructor QgsGraSyDialog");
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ QgsGraSyExtensionWidget::QgsGraSyExtensionWidget(QWidget * parent, int classfiel
|
||||
m_vectorlayer
|
||||
(vlayer)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsGraSyExtensionWidget");
|
||||
#endif
|
||||
|
||||
@ -207,14 +207,14 @@ m_vectorlayer
|
||||
|
||||
QgsGraSyExtensionWidget::QgsGraSyExtensionWidget()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsGraSyExtensionWidget");
|
||||
#endif
|
||||
}
|
||||
|
||||
QgsGraSyExtensionWidget::~QgsGraSyExtensionWidget()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("destructor QgsGraSyExtensionWidget");
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@ void QgsMapCanvas::addLayer(QgsMapLayer * lyr)
|
||||
{
|
||||
if (lyr->type() != QgsMapLayer::RASTER)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Layer name is " << lyr->name() << std::endl;
|
||||
#endif
|
||||
// give the layer a default symbol
|
||||
@ -243,7 +243,7 @@ void QgsMapCanvas::render2()
|
||||
if (ml)
|
||||
{
|
||||
// QgsDatabaseLayer *dbl = (QgsDatabaseLayer *)&ml;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Rendering " << ml->name() << std::endl;
|
||||
#endif
|
||||
if (ml->visible())
|
||||
@ -252,7 +252,7 @@ void QgsMapCanvas::render2()
|
||||
// mi.draw(p, &fullExtent);
|
||||
}
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Done rendering map layers\n";
|
||||
#endif
|
||||
paint->end();
|
||||
@ -485,7 +485,7 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
|
||||
//center = new QgsPoint(zoomRect->center());
|
||||
// delete zoomRect;
|
||||
currentExtent.expand(sf);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Extent scaled by " << sf << " to " << currentExtent << std::endl;
|
||||
std::cout << "Center of currentExtent after scaling is " << currentExtent.center() << std::endl;
|
||||
#endif
|
||||
|
||||
@ -88,7 +88,7 @@ QString QgsMapserverExport::fullPathName()
|
||||
void QgsMapserverExport::writeMapFile()
|
||||
{
|
||||
// write the map file, making massive assumptions about default values
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Opening map file " << txtMapFilePath->text() << std::endl;
|
||||
#endif
|
||||
std::ofstream mapFile(txtMapFilePath->text());
|
||||
@ -171,7 +171,7 @@ void QgsMapserverExport::writeMapFile()
|
||||
bool isPolygon = false;
|
||||
bool isLine = false;
|
||||
QgsMapLayer *lyr = map->getZpos(i);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Mapsrver Export Processing Layer" << std::endl;
|
||||
#endif
|
||||
mapFile << "LAYER" << std::endl;
|
||||
@ -183,7 +183,7 @@ void QgsMapserverExport::writeMapFile()
|
||||
name.replace(QRegExp("\\)"), "_");
|
||||
mapFile << " NAME " << name << std::endl;
|
||||
// feature type
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export checking feature type" << std::endl;
|
||||
#endif
|
||||
mapFile << " TYPE ";
|
||||
@ -206,7 +206,7 @@ void QgsMapserverExport::writeMapFile()
|
||||
}
|
||||
mapFile << std::endl;
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export checking visibility" << std::endl;
|
||||
#endif
|
||||
// set visibility (STATUS)
|
||||
@ -222,7 +222,7 @@ void QgsMapserverExport::writeMapFile()
|
||||
|
||||
// data source (DATA)
|
||||
// Data source spec depends on layer type
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export checking layer type" << std::endl;
|
||||
#endif
|
||||
switch (lyr->type())
|
||||
@ -243,7 +243,7 @@ void QgsMapserverExport::writeMapFile()
|
||||
break;
|
||||
#endif */
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export creating symbol entries" << std::endl;
|
||||
#endif
|
||||
// create a simple class entry based on layer color
|
||||
@ -252,20 +252,20 @@ void QgsMapserverExport::writeMapFile()
|
||||
QgsLegend *lgd = map->getLegend();
|
||||
//QListViewItem *li = lgd->currentItem();
|
||||
// return li->text(0);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export symbol name" << std::endl;
|
||||
#endif
|
||||
mapFile << " NAME \"" << lyr->name() << "\"" << std::endl;
|
||||
mapFile << " # TEMPLATE" << std::endl;
|
||||
if (isPolygon)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export symbol fill color" << std::endl;
|
||||
#endif
|
||||
QColor fillColor = sym->fillColor();
|
||||
mapFile << " COLOR " << fillColor.red() << " " << fillColor.green() << " " << fillColor.blue() << std::endl;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export checking for line symbol " << std::endl;
|
||||
#endif
|
||||
if (isPolygon || isLine)
|
||||
@ -276,7 +276,7 @@ void QgsMapserverExport::writeMapFile()
|
||||
}
|
||||
mapFile << " END" << std::endl;
|
||||
mapFile << "END" << std::endl;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "\tMapsrver Export layer definition done..." << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -101,19 +101,19 @@ void QgsPluginManager::getPluginDescriptions()
|
||||
pl->setText(2, pDesc());
|
||||
pl->setText(3, pluginDir[i]);
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Getting an instance of the QgsPluginRegistry" << std::endl;
|
||||
#endif
|
||||
// check to see if the plugin is loaded and set the checkbox accordingly
|
||||
QgsPluginRegistry *pRegistry = QgsPluginRegistry::instance();
|
||||
// get the library using the plugin description
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Getting library name from the registry" << std::endl;
|
||||
#endif
|
||||
QString libName = pRegistry->library(pName());
|
||||
if (libName.length() > 0)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Found library name in the registry" << std::endl;
|
||||
#endif
|
||||
if (libName == myLib->library())
|
||||
@ -141,7 +141,7 @@ void QgsPluginManager::apply()
|
||||
|
||||
void QgsPluginManager::unload()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Checking for plugins to unload" << std::endl;
|
||||
#endif
|
||||
QCheckListItem *lvi = (QCheckListItem *) lstPlugins->firstChild();
|
||||
@ -151,7 +151,7 @@ void QgsPluginManager::unload()
|
||||
{
|
||||
// its off -- see if it is loaded and if so, unload it
|
||||
QgsPluginRegistry *pRegistry = QgsPluginRegistry::instance();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Checking to see if " << lvi->text(0) << " is loaded" << std::endl;
|
||||
#endif
|
||||
QgisPlugin *plugin = pRegistry->plugin(lvi->text(0));
|
||||
|
||||
@ -304,25 +304,25 @@ unsigned int QgsRasterLayer::getTransparency()
|
||||
that in muliband layers more than one "Undefined" band can exist! */
|
||||
bool QgsRasterLayer::hasBand(QString theBandName)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Looking for band : " << theBandName << std::endl;
|
||||
#endif
|
||||
for (int i = 1; i <= gdalDataset->GetRasterCount(); i++)
|
||||
{
|
||||
GDALRasterBand *myGdalBand = gdalDataset->GetRasterBand(i);
|
||||
QString myColorQString = GDALGetColorInterpretationName(myGdalBand->GetColorInterpretation());
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "band : " << i << std::endl;
|
||||
#endif
|
||||
if (myColorQString == theBandName)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "band : " << i << std::endl;
|
||||
std::cout << "Found band : " << theBandName << std::endl;
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Found unmatched band : " << i << " " << myColorQString << std::endl;
|
||||
#endif
|
||||
}
|
||||
@ -480,7 +480,7 @@ void QgsRasterLayer::draw(QPainter * theQPainter, QgsRect * theViewExtent, QgsCo
|
||||
break;
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "PALETTED_SINGLE_BAND_GRAY drawing type detected..." << std::endl;
|
||||
#endif
|
||||
int myBandNoInt = 1;
|
||||
@ -507,13 +507,13 @@ void QgsRasterLayer::draw(QPainter * theQPainter, QgsRect * theViewExtent, QgsCo
|
||||
break;
|
||||
// a layer containing 2 or more bands, but using only one band to produce a grayscale image
|
||||
case MULTI_BAND_SINGLE_BAND_GRAY:
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "MULTI_BAND_SINGLE_BAND_GRAY drawing type detected..." << std::endl;
|
||||
#endif
|
||||
//check the band is set!
|
||||
if (grayBandNameQString == tr("Not Set"))
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "MULTI_BAND_SINGLE_BAND_GRAY Not Set detected..." << grayBandNameQString << std::endl;
|
||||
#endif
|
||||
break;
|
||||
@ -558,7 +558,7 @@ void QgsRasterLayer::draw(QPainter * theQPainter, QgsRect * theViewExtent, QgsCo
|
||||
|
||||
void QgsRasterLayer::drawSingleBandGray(QPainter * theQPainter, RasterViewPort * theRasterViewPort, int theBandNoInt)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::drawSingleBandGray called for layer " << theBandNoInt << std::endl;
|
||||
#endif
|
||||
//create the outout image that the layer will be drawn on before placing it in the qcanvas
|
||||
@ -584,11 +584,11 @@ void QgsRasterLayer::drawSingleBandGray(QPainter * theQPainter, RasterViewPort *
|
||||
|
||||
QImage myQImage = QImage(theRasterViewPort->drawableAreaXDimInt, theRasterViewPort->drawableAreaYDimInt, 32);
|
||||
myQImage.setAlphaBuffer(true);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "draw gray band Retrieving stats" << std::endl;
|
||||
#endif
|
||||
RasterBandStats myRasterBandStats = getRasterBandStats(theBandNoInt);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "draw gray band Git stats" << std::endl;
|
||||
#endif
|
||||
double myRangeDouble = myRasterBandStats.rangeDouble;
|
||||
@ -628,7 +628,7 @@ void QgsRasterLayer::drawSingleBandGray(QPainter * theQPainter, RasterViewPort *
|
||||
|
||||
void QgsRasterLayer::drawSingleBandPseudoColor(QPainter * theQPainter, RasterViewPort * theRasterViewPort, int theBandNoInt)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::drawSingleBandPseudoColor called" << std::endl;
|
||||
#endif
|
||||
GDALRasterBand *myGdalBand = gdalDataset->GetRasterBand(theBandNoInt);
|
||||
@ -800,7 +800,7 @@ void QgsRasterLayer::drawSingleBandPseudoColor(QPainter * theQPainter, RasterVie
|
||||
void QgsRasterLayer::drawPalettedSingleBandGray(QPainter * theQPainter,
|
||||
RasterViewPort * theRasterViewPort, int theBandNoInt, QString theColorQString)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::drawPalettedSingleBandGray called" << std::endl;
|
||||
#endif
|
||||
// read entire clipped area of raster band
|
||||
@ -881,7 +881,7 @@ void QgsRasterLayer::drawPalettedSingleBandGray(QPainter * theQPainter,
|
||||
void QgsRasterLayer::drawPalettedSingleBandPseudoColor(QPainter * theQPainter,
|
||||
RasterViewPort * theRasterViewPort, int theBandNoInt, QString theColorQString)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::drawPalettedSingleBandPseudoColor called" << std::endl;
|
||||
#endif
|
||||
// read entire clipped area of raster band
|
||||
@ -1075,7 +1075,7 @@ void QgsRasterLayer::drawPalettedSingleBandPseudoColor(QPainter * theQPainter,
|
||||
*/
|
||||
void QgsRasterLayer::drawPalettedMultiBandColor(QPainter * theQPainter, RasterViewPort * theRasterViewPort, int theBandNoInt)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::drawPalettedMultiBandColor called" << std::endl;
|
||||
#endif
|
||||
|
||||
@ -1174,7 +1174,7 @@ void QgsRasterLayer::drawMultiBandSingleBandPseudoColor(QPainter * theQPainter,
|
||||
|
||||
void QgsRasterLayer::drawMultiBandColor(QPainter * theQPainter, RasterViewPort * theRasterViewPort)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::drawMultiBandColor called" << std::endl;
|
||||
#endif
|
||||
|
||||
@ -1362,7 +1362,7 @@ const bool QgsRasterLayer::hasStats(int theBandNoInt)
|
||||
const RasterBandStats QgsRasterLayer::getRasterBandStats(int theBandNoInt)
|
||||
{
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::calculate stats for band " << theBandNoInt << std::endl;
|
||||
#endif
|
||||
//check if we have received a valid band number
|
||||
@ -1698,7 +1698,7 @@ QPixmap QgsRasterLayer::getLegendQPixmap()
|
||||
*/
|
||||
QPixmap QgsRasterLayer::getLegendQPixmap(bool theWithNameFlag)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "QgsRasterLayer::getLegendQPixmap called (" << getDrawingStyleAsQString() << ")" << std::endl;
|
||||
#endif
|
||||
//
|
||||
|
||||
@ -49,7 +49,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties(QgsMapLayer * lyr):QgsRasterL
|
||||
//downcast the maplayer to rasterlayer
|
||||
rasterLayer = (QgsRasterLayer *) lyr;
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
//populate the metadata tab's text browser widget with gdal metadata info
|
||||
txtbMetadata->setText(rasterLayer->getMetadata());
|
||||
#else
|
||||
@ -234,14 +234,14 @@ QgsRasterLayerProperties::QgsRasterLayerProperties(QgsMapLayer * lyr):QgsRasterL
|
||||
|
||||
else //all other layer types use band name entries only
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Populating combos for non paletted layer" << std::endl;
|
||||
#endif
|
||||
int myBandCountInt = 1;
|
||||
for (QStringList::Iterator myIterator = myBandNameQStringList.begin(); myIterator != myBandNameQStringList.end(); ++myIterator)
|
||||
{
|
||||
QString myQString = *myIterator;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Inserting : " << myQString << std::endl;
|
||||
#endif
|
||||
cboGray->insertItem(myQString);
|
||||
@ -305,13 +305,13 @@ void QgsRasterLayerProperties::apply()
|
||||
|
||||
if (cboColorMap->currentText() == tr("Pseudocolor"))
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to :: SINGLE_BAND_PSEUDO_COLOR" << std::endl;
|
||||
#endif
|
||||
rasterLayer->setDrawingStyle(QgsRasterLayer::SINGLE_BAND_PSEUDO_COLOR);
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to :: SINGLE_BAND_GRAY" << std::endl;
|
||||
#endif
|
||||
rasterLayer->setDrawingStyle(QgsRasterLayer::SINGLE_BAND_GRAY);
|
||||
@ -324,16 +324,16 @@ void QgsRasterLayerProperties::apply()
|
||||
{
|
||||
if (cboColorMap->currentText() == tr("Pseudocolor"))
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to :: PALETTED_SINGLE_BAND_PSEUDO_COLOR" << std::endl;
|
||||
#endif
|
||||
rasterLayer->setDrawingStyle(QgsRasterLayer::PALETTED_SINGLE_BAND_PSEUDO_COLOR);
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to :: PALETTED_SINGLE_BAND_GRAY" << std::endl;
|
||||
#endif
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Combo value : " << cboGray->currentText() << " GrayBand Mapping : " << rasterLayer->
|
||||
getGrayBandName() << std::endl;
|
||||
#endif
|
||||
@ -349,13 +349,13 @@ void QgsRasterLayerProperties::apply()
|
||||
{
|
||||
if (cboColorMap->currentText() == tr("Pseudocolor"))
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to ::MULTI_BAND_SINGLE_BAND_PSEUDO_COLOR " << std::endl;
|
||||
#endif
|
||||
rasterLayer->setDrawingStyle(QgsRasterLayer::MULTI_BAND_SINGLE_BAND_PSEUDO_COLOR);
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to :: MULTI_BAND_SINGLE_BAND_GRAY" << std::endl;
|
||||
std::cout << "Combo value : " << cboGray->currentText() << " GrayBand Mapping : " << rasterLayer->
|
||||
getGrayBandName() << std::endl;
|
||||
@ -370,14 +370,14 @@ void QgsRasterLayerProperties::apply()
|
||||
|
||||
if (rasterLayer->rasterLayerType == QgsRasterLayer::PALETTE)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to :: PALETTED_MULTI_BAND_COLOR" << std::endl;
|
||||
#endif
|
||||
rasterLayer->setDrawingStyle(QgsRasterLayer::PALETTED_MULTI_BAND_COLOR);
|
||||
} else if (rasterLayer->rasterLayerType == QgsRasterLayer::MULTIBAND)
|
||||
{
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Setting Raster Drawing Style to :: MULTI_BAND_COLOR" << std::endl;
|
||||
#endif
|
||||
rasterLayer->setDrawingStyle(QgsRasterLayer::MULTI_BAND_COLOR);
|
||||
@ -674,13 +674,13 @@ void QgsRasterLayerProperties::fillStatsTable()
|
||||
myQHeader->setLabel(1, "Value");
|
||||
for (int myIteratorInt = 1; myIteratorInt <= myBandCountInt; ++myIteratorInt)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Raster properties : checking if band " << myIteratorInt << " has stats? ";
|
||||
#endif
|
||||
//check if full stats for this layer have already been collected
|
||||
if (!rasterLayer->hasStats(myIteratorInt)) //not collected
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << ".....no" << std::endl;
|
||||
#endif
|
||||
tblStats->setText(myRowInt, 0, "Band");
|
||||
@ -695,7 +695,7 @@ void QgsRasterLayerProperties::fillStatsTable()
|
||||
++myRowInt;
|
||||
} else // collected - show full detail
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << ".....yes" << std::endl;
|
||||
#endif
|
||||
RasterBandStats myRasterBandStats = rasterLayer->getRasterBandStats(myIteratorInt);
|
||||
|
||||
@ -34,14 +34,14 @@
|
||||
|
||||
QgsSiSyDialog::QgsSiSyDialog():QgsSiSyDialogBase(), m_vectorlayer(0)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsSiSyDialog");
|
||||
#endif
|
||||
}
|
||||
|
||||
QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer * layer):QgsSiSyDialogBase(), m_vectorlayer(layer)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("constructor QgsSiSyDialog");
|
||||
#endif
|
||||
|
||||
@ -89,7 +89,7 @@ QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer * layer):QgsSiSyDialogBase(), m_vect
|
||||
|
||||
QgsSiSyDialog::~QgsSiSyDialog()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("destructor QgsSiSyDialog");
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -65,7 +65,7 @@ m_rendererDialog(0)
|
||||
// initialize the identify results pointer
|
||||
ir = 0;
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "VECTORLAYERPATH: " << vectorLayerPath << std::endl;
|
||||
std::cerr << "BASENAME: " << baseName << std::endl;
|
||||
#endif
|
||||
@ -90,13 +90,13 @@ m_rendererDialog(0)
|
||||
#endif
|
||||
// load the data provider
|
||||
myLib = new QLibrary((const char *) ogrlib);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Library name is " << myLib->library() << std::endl;
|
||||
#endif
|
||||
bool loaded = myLib->load();
|
||||
if (loaded)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Loaded data provider library" << std::endl;
|
||||
std::cout << "Attempting to resolve the classFactory function" << std::endl;
|
||||
#endif
|
||||
@ -104,13 +104,13 @@ m_rendererDialog(0)
|
||||
valid = false; // assume the layer is invalid until we determine otherwise
|
||||
if (cf)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Getting pointer to a dataProvider object from the library\n";
|
||||
#endif
|
||||
dataProvider = cf(vectorLayerPath);
|
||||
if (dataProvider)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Instantiated the data provider plugin\n";
|
||||
#endif
|
||||
|
||||
@ -121,7 +121,7 @@ m_rendererDialog(0)
|
||||
QgsRect *mbr = dataProvider->extent();
|
||||
// show the extent
|
||||
QString s = mbr->stringRep();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Extent of layer: " << s << std::endl;
|
||||
#endif
|
||||
// store the extent
|
||||
@ -138,13 +138,13 @@ m_rendererDialog(0)
|
||||
|
||||
if (providerKey == "postgres")
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Beautifying layer name " << layerTitle << std::endl;
|
||||
#endif
|
||||
// adjust the display name for postgres layers
|
||||
layerTitle = layerTitle.mid(layerTitle.find(".") + 1);
|
||||
layerTitle = layerTitle.left(layerTitle.find("("));
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Beautified name is " << layerTitle << std::endl;
|
||||
#endif
|
||||
}
|
||||
@ -154,7 +154,7 @@ m_rendererDialog(0)
|
||||
}
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Unable to instantiate the data provider plugin\n";
|
||||
#endif
|
||||
valid = false;
|
||||
@ -163,7 +163,7 @@ m_rendererDialog(0)
|
||||
} else
|
||||
{
|
||||
valid = false;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Failed to load " << "../providers/libproviders.so" << "\n";
|
||||
#endif
|
||||
}
|
||||
@ -179,7 +179,7 @@ m_rendererDialog(0)
|
||||
|
||||
QgsVectorLayer::~QgsVectorLayer()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "In QgsVectorLayer destructor" << std::endl;
|
||||
#endif
|
||||
if (tabledisplay)
|
||||
@ -228,7 +228,7 @@ void QgsVectorLayer::setDisplayField()
|
||||
{
|
||||
|
||||
QString fldName = fields[j].getName();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Checking field " << fldName << std::endl;
|
||||
#endif
|
||||
if (fldName.find("name", false) > -1)
|
||||
@ -303,14 +303,14 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans
|
||||
|
||||
// select the records in the extent. The provider sets a spatial filter
|
||||
// and sets up the selection set for retrieval
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("Selecting features based on view extent");
|
||||
#endif
|
||||
dataProvider->reset();
|
||||
dataProvider->select(viewExtent);
|
||||
int featureCount = 0;
|
||||
// QgsFeature *ftest = dataProvider->getFirstFeature();
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("Starting draw of features");
|
||||
#endif
|
||||
QgsFeature *fet;
|
||||
@ -335,12 +335,12 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans
|
||||
|
||||
if (fet == 0)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "get next feature returned null\n";
|
||||
#endif
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "!!!!!!!!!!!!!!!!!!!!!!!Feature geometry: " << fet->wellKnownText() << std::endl;
|
||||
#endif
|
||||
//if feature is selected, change the color of the painter
|
||||
@ -513,7 +513,7 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans
|
||||
break;
|
||||
|
||||
default:
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "UNKNOWN WKBTYPE ENCOUNTERED\n";
|
||||
#endif
|
||||
break;
|
||||
@ -528,21 +528,21 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans
|
||||
//std::cout << "deleting feature[]\n";
|
||||
// std::cout << geom->getGeometryName() << std::endl;
|
||||
featureCount++;
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Feature count: " << featureCount << std::endl;
|
||||
#endif
|
||||
//delete[]feature;
|
||||
}
|
||||
// delete fet;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cerr << "Total features processed is " << featureCount << std::endl;
|
||||
#endif
|
||||
delete brush;
|
||||
qApp->processEvents();
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("Warning, QgsRenderer is null in QgsVectorLayer::draw()");
|
||||
#endif
|
||||
}
|
||||
@ -589,7 +589,7 @@ void QgsVectorLayer::identify(QgsRect * r)
|
||||
std::vector < QgsFeatureAttribute > attr = fet->attributeMap();
|
||||
for (int i = 0; i < attr.size(); i++)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << attr[i].fieldName() << " == " << fieldIndex << std::endl;
|
||||
#endif
|
||||
if (attr[i].fieldName().lower() == fieldIndex)
|
||||
@ -601,7 +601,7 @@ void QgsVectorLayer::identify(QgsRect * r)
|
||||
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "Feature count on identify: " << featureCount << std::endl;
|
||||
#endif
|
||||
if (ir)
|
||||
@ -676,7 +676,7 @@ void QgsVectorLayer::table()
|
||||
for (std::map < int, bool >::iterator it = selected.begin(); it != selected.end(); ++it)
|
||||
{
|
||||
tabledisplay->table()->selectRowWithId(it->first);
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("selecting row with id " + QString::number(it->first));
|
||||
#endif
|
||||
}
|
||||
@ -827,7 +827,7 @@ QGis::VectorType QgsVectorLayer::vectorType()
|
||||
}
|
||||
} else
|
||||
{
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
qWarning("warning, pointer to dataProvider is null in QgsVectorLayer::vectorType()");
|
||||
#endif
|
||||
}
|
||||
@ -1055,7 +1055,7 @@ QgsRect QgsVectorLayer::bBoxOfSelected()
|
||||
break;
|
||||
|
||||
default:
|
||||
#ifdef DEBUG
|
||||
#ifdef QGISDEBUG
|
||||
std::cout << "UNKNOWN WKBTYPE ENCOUNTERED\n";
|
||||
#endif
|
||||
break;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user