sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

qgisapp :

Browse Source 
- now catches qgs project read errors and displays appropriate critical
    dialog

qgsproject :

  - (most) all qDebug()'s now use utf8() strings (I may have missed a few)

  - fixed bug where projects with no layers (i.e., they're empty) would cause
    app to bomb when trying to read same


git-svn-id: http://svn.osgeo.org/qgis/trunk@2373 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mcoletti 2004-11-29 18:10:58 +00:00
parent fab1388151
commit 67f279f022
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qgisapp.cpp
View File

@ -1518,16 +1518,25 @@ bool QgisApp::addProject(QString projectFile)
// clear the map canvas
removeAllLayers();
if ( QgsProject::instance()->read( projectFile ) )
try
{
setCaption(tr("Quantum GIS --") + " " + QgsProject::instance()->title() );
if ( QgsProject::instance()->read( projectFile ) )
{
setCaption(tr("Quantum GIS --") + " " + QgsProject::instance()->title() );
emit projectRead(); // let plug-ins know that we've read in a new
// project so that they can check any project
// specific plug-in state
emit projectRead(); // let plug-ins know that we've read in a new
// project so that they can check any project
// specific plug-in state
}
else
{
return false;
}
}
else
catch ( std::exception & e )
{
QMessageBox::critical( 0x0, "Unable to open project", e.what(), QMessageBox::Ok, QMessageBox::NoButton );
return false;
}

46
src/qgsproject.cpp
View File

@ -204,12 +204,12 @@ public:
i != sl.end();
++i )
{
qDebug( "[%s] ", (*i) );
qDebug( "[%s] ", (const char*)(*i).utf8() );
}
}
else
{
qDebug( "%s", value_.toString() );
qDebug( "%s", (const char*)value_.toString().utf8() );
}
}
@ -244,7 +244,7 @@ public:
if ( QString::null == typeString )
{
qDebug( "%s:%d null ``type'' attribute for %s",
__FILE__, __LINE__, keyNode.nodeName() );
__FILE__, __LINE__, (const char*)keyNode.nodeName().utf8() );
return false;
}
@ -267,7 +267,7 @@ public:
{
case QVariant::Invalid :
qDebug( "%s:%d invalid value type %s .. ",
__FILE__, __LINE__, typeString );
__FILE__, __LINE__, (const char*)typeString.utf8() );
return false;
@ -308,7 +308,7 @@ public:
else
{
qDebug( "qgsproject.cpp:%d non <value> element ``%s'' in string list",
__LINE__, values.item(i).nodeName() );
__LINE__, (const char*)values.item(i).nodeName().utf8() );
}
++i;
@ -514,7 +514,7 @@ public:
default :
qDebug( "%s:%d unsupported value type %s .. not propertly translated to QVariant in qgsproject.cpp:%d",
__FILE__, __LINE__, typeString );
__FILE__, __LINE__, (const char*)typeString.utf8() );
}
return true;
@ -696,9 +696,9 @@ public:
{
for ( QDictIterator<Property> i(properties_); i.current(); ++i )
{
qDebug( "<%s>", i.currentKey() );
qDebug( "<%s>", (const char*)i.currentKey().utf8() );
i.current()->dump( );
qDebug( "</%s>", i.currentKey() );
qDebug( "</%s>", (const char*)i.currentKey().utf8() );
}
}
@ -733,7 +733,7 @@ public:
else
{
qDebug( "%s:%d cannot find key %s to remove",
__FILE__, __LINE__, currentKey );
__FILE__, __LINE__, (const char*)currentKey.utf8() );
return false;
}
@ -764,7 +764,7 @@ public:
if ( ! properties_[subkeys.item(i).nodeName()]->readXML( subkey ) )
{
qDebug( "%s:%d unable to parse key value %s",
__FILE__, __LINE__, subkeys.item(i).nodeName() );
__FILE__, __LINE__, (const char*)subkeys.item(i).nodeName().utf8() );
}
}
else // otherwise it's a subkey, so just recurse on down the remaining keys
@ -776,7 +776,7 @@ public:
if ( ! properties_[subkeys.item(i).nodeName()]->readXML( subkey) )
{
qDebug( "%s:%d unable to parse subkey %s",
__FILE__, __LINE__, subkeys.item(i).nodeName() );
__FILE__, __LINE__, (const char*)subkeys.item(i).nodeName().utf8() );
}
}
@ -1292,14 +1292,14 @@ _getProperties( QDomDocument const & doc, QMap< QString, PropertyKey > & project
qDebug( "found %d property node(s) for scope %s",
curr_scope_node.childNodes().count(),
curr_scope_node.nodeName() );
(const char*)curr_scope_node.nodeName().utf8() );
// DEPRECATED _getScopeProperties( curr_scope_node, project_properties );
if ( ! project_properties[curr_scope_node.nodeName()].readXML( curr_scope_node ) )
{
qDebug ("%s:%d unable to read XML for property %s",
__FILE__, __LINE__, curr_scope_node.nodeName() );
__FILE__, __LINE__, (const char*)curr_scope_node.nodeName().utf8() );
}
++i;
@ -1547,7 +1547,11 @@ _getMapLayers( QDomDocument const & doc )
// process the map layer nodes
assert(nl.count() != 0);
if ( 0 == nl.count() ) // if we have no layers to process, bail
{
return false;
}
for (size_t i = 0; i < nl.count(); i++)
{
QDomNode node = nl.item(i);
@ -1761,7 +1765,7 @@ QgsProject::read( )
errorMsg + " at line " + QString::number( line ) +
" column " + QString::number( column );
qDebug( errorString );
qDebug( (const char*)errorString.utf8() );
imp_->file.close();
@ -1948,13 +1952,13 @@ QgsProject::write( )
curr_scope != imp_->properties_.end();
curr_scope++ )
{
qDebug( "scope ``%s'' has %d entries", curr_scope.key(), curr_scope.data().count() );
qDebug( "scope ``%s'' has %d entries", (const char*)curr_scope.key().utf8(), curr_scope.data().count() );
// <$scope>
if ( ! curr_scope.data().writeXML( curr_scope.key(), propertiesElement, *doc ) )
{
qDebug ( "%s:%d error create property %s's DOM objects",
__FILE__, __LINE__, curr_scope.key() );
__FILE__, __LINE__, (const char*)curr_scope.key().utf8() );
}
// </$scope>
@ -1987,14 +1991,6 @@ QgsProject::write( )
// QgsProject::Properties &
// QgsProject::properties( QString const & scope )
// {
// return imp_->properties_[scope];
// } // QgsProject::properties
void
QgsProject::clearProperties()
{