Skip to content

Commit

Permalink
Enabled the call to render() in all places where it was commented out.
Browse files Browse the repository at this point in the history 
Layers now draw when first added to the map. This should fix most
refresh issues. This needs testing to ensure proper operation with
all data stores. This can be refactored for Qt 4.1 if need be...


git-svn-id: http://svn.osgeo.org/qgis/trunk@4475 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman committed Jan 5, 2006
1 parent b9df9d5 commit b2bc26f
Showing 1 changed file with 58 additions and 20 deletions.
78 changes: 58 additions & 20 deletions src/qgisapp.cpp
View file
Expand Up @@ -777,7 +777,7 @@ void QgisApp::createStatusBar()
mCoordsLabel->setFont(myFont);
QWhatsThis::add(mCoordsLabel, tr("Shows the map coordinates at the current cursor postion. The display is continuously updated as the mouse is moved."));
statusBar()->addWidget(mCoordsLabel, 0, true);
//render suppression status bar widget
// render suppression status bar widget
mRenderSuppressionCBox = new QCheckBox(tr("Render"),statusBar());
mRenderSuppressionCBox->setChecked(true);
mRenderSuppressionCBox->setFont(myFont);
Expand Down Expand Up @@ -1710,7 +1710,10 @@ bool QgisApp::addLayer(QFileInfo const & vectorFile)
qApp->processEvents(); // XXX why does this need to be called manually?
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render(); // XXX eh, wot?
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render(); // XXX eh, wot? -- without this nothing is drawn when
// the layer is intially added
mMapCanvas->update();

QApplication::restoreOverrideCursor();
Expand Down Expand Up @@ -1846,7 +1849,9 @@ bool QgisApp::addLayer(QStringList const &theLayerQStringList, const QString& en
mMapCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
QApplication::restoreOverrideCursor();
statusBar()->message(mMapCanvas->extent().stringRep(2));
Expand Down Expand Up @@ -1963,7 +1968,9 @@ void QgisApp::addDatabaseLayer()
mMapCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
QApplication::restoreOverrideCursor();
} // QgisApp::addDatabaseLayer()
Expand Down Expand Up @@ -3168,7 +3175,9 @@ void QgisApp::addAllToOverview()
mOverviewCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the overview canvas widget.
// mOverviewCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mOverviewCanvas->render();
mOverviewCanvas->update();

// notify the project we've made a change
Expand All @@ -3194,7 +3203,9 @@ void QgisApp::removeAllFromOverview()
mOverviewCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the overview canvas widget.
// mOverviewCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mOverviewCanvas->render();
mOverviewCanvas->update();

// notify the project we've made a change
Expand Down Expand Up @@ -3230,11 +3241,15 @@ void QgisApp::hideAllLayers()
mOverviewCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the overview canvas widget.
// mOverviewCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mOverviewCanvas->render();
mOverviewCanvas->update();

// notify the project we've made a change
Expand Down Expand Up @@ -3270,11 +3285,15 @@ void QgisApp::showAllLayers()
mOverviewCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the overview canvas widget.
// mOverviewCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mOverviewCanvas->render();
mOverviewCanvas->update();

// notify the project we've made a change
Expand Down Expand Up @@ -3721,7 +3740,9 @@ void QgisApp::drawLayers()
mMapCanvas->setDirty(true);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();

}
Expand Down Expand Up @@ -3800,8 +3821,9 @@ void QgisApp::inOverview( bool in_overview )

// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the overview canvas widget.

//but adding a layer to overview canvas does only work at the moment when calling render()...
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mOverviewCanvas->render();
//mOverviewCanvas->update();
}
Expand Down Expand Up @@ -3835,7 +3857,9 @@ void QgisApp::removeLayer()
mOverviewCanvas->clear();
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the overview canvas widget.
// mOverviewCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mOverviewCanvas->render();
mOverviewCanvas->update();
mMapCanvas->freeze(false);

Expand All @@ -3846,7 +3870,9 @@ void QgisApp::removeLayer()
mMapCanvas->clear();
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
}
else if(ll)
Expand Down Expand Up @@ -3907,7 +3933,9 @@ void QgisApp::zoomToLayerExtent()
mMapCanvas->clear();
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();

// notify the project we've made a change
Expand Down Expand Up @@ -4696,7 +4724,9 @@ void QgisApp::addVectorLayer(QString vectorLayerPath, QString baseName, QString
mMapCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
QApplication::restoreOverrideCursor();

Expand Down Expand Up @@ -4736,7 +4766,9 @@ void QgisApp::addMapLayer(QgsMapLayer *theMapLayer)
mMapCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
QApplication::restoreOverrideCursor();

Expand Down Expand Up @@ -4957,7 +4989,9 @@ void QgisApp::showExtents(QgsRect theExtents)
mOverviewCanvas->clear();
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the overview canvas widget.
// mOverviewCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mOverviewCanvas->render();
mOverviewCanvas->update();
}

Expand Down Expand Up @@ -5339,7 +5373,9 @@ bool QgisApp::addRasterLayer(QgsRasterLayer * theRasterLayer, bool theForceRedra
mMapCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
}
return true;
Expand Down Expand Up @@ -5490,7 +5526,9 @@ void QgisApp::addRasterLayer(QString const & rasterLayerPath,
mMapCanvas->freeze(false);
// For Qt4, deprecate direct calling of render(). Let render() be called by the
// paint event loop of the map canvas widget.
// mMapCanvas->render();
// XXX - this doesn't work -- or nobody implemented it so render() is still enabled
// [gsherman]
mMapCanvas->render();
mMapCanvas->update();
QApplication::restoreOverrideCursor();

Expand Down

0 comments on commit b2bc26f

Please sign in to comment.