[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.1/kdeedu/marble
From: Torsten Rahn <tackat () kde ! org>
Date: 2008-08-04 17:16:56
Message-ID: 1217870216.346591.11971.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 842084 by rahn:
- Mostly fixing the Designer Plugin (except for projection change)
M +4 -0 data/maps/earth/bluemarble/bluemarble.dgml
M +4 -0 data/maps/earth/citylights/citylights.dgml
M +4 -0 data/maps/earth/openstreetmap/openstreetmap.dgml
M +4 -0 data/maps/earth/plain/plain.dgml
M +4 -0 data/maps/earth/precip-dec/precip-dec.dgml
M +4 -0 data/maps/earth/precip-july/precip-july.dgml
M +12 -8 data/maps/earth/srtm/srtm.dgml
M +4 -0 data/maps/earth/temp-dec/temp-dec.dgml
M +4 -0 data/maps/earth/temp-july/temp-july.dgml
M +16 -0 src/lib/MarbleMap.cpp
M +12 -0 src/lib/MarbleMap.h
M +7 -11 src/lib/MarbleModel.cpp
M +12 -0 src/lib/MarbleWidget.cpp
M +13 -0 src/lib/MarbleWidget.h
M +3 -3 src/lib/VectorComposer.cpp
M +5 -3 src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/bluemarble/bluemarble.dgml \
#842083:842084 @@ -157,6 +157,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/citylights/citylights.dgml \
#842083:842084 @@ -149,6 +149,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/openstreetmap/openstreetmap.dgml \
#842083:842084 @@ -37,6 +37,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/plain/plain.dgml #842083:842084
@@ -138,6 +138,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/precip-dec/precip-dec.dgml \
#842083:842084 @@ -168,6 +168,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/precip-july/precip-july.dgml \
#842083:842084 @@ -168,6 +168,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/srtm/srtm.dgml #842083:842084
@@ -145,12 +145,12 @@
<available>true</available>
</property>
<property name="international-boundaries">
- <available>false</available>
- <value>false</value>
+ <available>true</available>
+ <value>true</value>
</property>
<property name="state-boundaries">
- <available>false</available>
- <value>false</value>
+ <available>true</available>
+ <value>true</value>
</property>
</group>
<group name="Water Bodies">
@@ -159,12 +159,12 @@
<value>true</value>
</property>
<property name="lakes">
- <available>false</available>
- <value>false</value>
+ <available>true</available>
+ <value>true</value>
</property>
<property name="rivers">
- <available>false</available>
- <value>false</value>
+ <available>true</available>
+ <value>true</value>
</property>
</group>
<group name="Surface">
@@ -182,6 +182,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/temp-dec/temp-dec.dgml \
#842083:842084 @@ -168,6 +168,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/temp-july/temp-july.dgml \
#842083:842084 @@ -168,6 +168,10 @@
<value>true</value>
<available>true</available>
</property>
+ <property name="overviewmap">
+ <value>true</value>
+ <available>true</available>
+ </property>
<property name="compass">
<value>true</value>
<available>true</available>
--- branches/KDE/4.1/kdeedu/marble/src/lib/MarbleMap.cpp #842083:842084
@@ -363,6 +363,11 @@
return value;
}
+bool MarbleMap::showOverviewMap() const
+{
+ return propertyValue( "overviewmap" );
+}
+
bool MarbleMap::showScaleBar() const
{
return propertyValue( "scalebar" );
@@ -866,6 +871,11 @@
d->m_viewParams.setPropertyValue( name, value );
}
+void MarbleMap::setShowOverviewMap( bool visible )
+{
+ setPropertyValue( "overviewmap", visible );
+}
+
void MarbleMap::setShowScaleBar( bool visible )
{
setPropertyValue( "scalebar", visible );
@@ -917,6 +927,8 @@
void MarbleMap::setShowRelief( bool visible )
{
setPropertyValue( "relief", visible );
+ // Update texture map during the repaint that follows:
+ setNeedsUpdate();
}
void MarbleMap::setShowElevationModel( bool visible )
@@ -929,6 +941,8 @@
void MarbleMap::setShowIceLayer( bool visible )
{
setPropertyValue( "ice", visible );
+ // Update texture map during the repaint that follows:
+ setNeedsUpdate();
}
void MarbleMap::setShowBorders( bool visible )
@@ -944,6 +958,8 @@
void MarbleMap::setShowLakes( bool visible )
{
setPropertyValue( "lakes", visible );
+ // Update texture map during the repaint that follows:
+ setNeedsUpdate();
}
void MarbleMap::setShowFrameRate( bool visible )
--- branches/KDE/4.1/kdeedu/marble/src/lib/MarbleMap.h #842083:842084
@@ -296,6 +296,12 @@
bool propertyValue( const QString& name) const;
/**
+ * @brief Return whether the overview map is visible.
+ * @return The overview map visibility.
+ */
+ bool showOverviewMap() const;
+
+ /**
* @brief Return whether the scale bar is visible.
* @return The scale bar visibility.
*/
@@ -589,6 +595,12 @@
void setPropertyValue( const QString& name, bool value );
/**
+ * @brief Set whether the overview map overlay is visible
+ * @param visible visibility of the overview map
+ */
+ void setShowOverviewMap( bool visible );
+
+ /**
* @brief Set whether the scale bar overlay is visible
* @param visible visibility of the scale bar
*/
--- branches/KDE/4.1/kdeedu/marble/src/lib/MarbleModel.cpp #842083:842084
@@ -141,8 +141,6 @@
d->m_texmapper = 0;
d->m_veccomposer = new VectorComposer();
- d->m_placeMarkLayout = 0;
-
d->m_gridmap = new GridMap();
d->m_texcolorizer = new TextureColorizer( MarbleDirs::path( "seacolors.leg" ),
MarbleDirs::path( "landcolors.leg" ) \
); @@ -155,6 +153,13 @@
d->m_placemarkmodel = new MarblePlacemarkModel( d->m_placemarkmanager, this );
d->m_placemarkselectionmodel = new QItemSelectionModel( d->m_placemarkmodel );
+ d->m_placeMarkLayout = new PlaceMarkLayout( this );
+ connect( d->m_placemarkselectionmodel, SIGNAL( selectionChanged( QItemSelection,
+ \
QItemSelection) ), + d->m_placeMarkLayout, SLOT( requestStyleReset() ) \
); + connect( d->m_placemarkmodel, SIGNAL( modelReset() ),
+ d->m_placeMarkLayout, SLOT( requestStyleReset() ) );
+
d->m_placemarkmanager->loadStandardPlaceMarks();
d->m_gpxFileModel = new GpxFileModel( this );
@@ -351,15 +356,6 @@
}
}
- if ( d->m_placeMarkLayout == 0) {
- d->m_placeMarkLayout = new PlaceMarkLayout( this );
- connect( d->m_placemarkselectionmodel, SIGNAL( selectionChanged( \
QItemSelection,
- \
QItemSelection) ),
- d->m_placeMarkLayout, SLOT( requestStyleReset() ) );
- connect( d->m_placemarkmodel, SIGNAL( modelReset() ),
- d->m_placeMarkLayout, SLOT( requestStyleReset() ) );
- }
-
d->m_placeMarkLayout->requestStyleReset();
// FIXME: To be removed after MapTheme / KML refactoring
--- branches/KDE/4.1/kdeedu/marble/src/lib/MarbleWidget.cpp #842083:842084
@@ -355,6 +355,11 @@
return QPixmap::grabWidget( this );
}
+bool MarbleWidget::showOverviewMap() const
+{
+ return d->m_map->showOverviewMap();
+}
+
bool MarbleWidget::showScaleBar() const
{
return d->m_map->showScaleBar();
@@ -875,6 +880,13 @@
repaint();
}
+void MarbleWidget::setShowOverviewMap( bool visible )
+{
+ d->m_map->setShowOverviewMap( visible );
+
+ repaint();
+}
+
void MarbleWidget::setShowScaleBar( bool visible )
{
d->m_map->setShowScaleBar( visible );
--- branches/KDE/4.1/kdeedu/marble/src/lib/MarbleWidget.h #842083:842084
@@ -124,6 +124,7 @@
Q_PROPERTY(double longitude READ centerLongitude WRITE setCenterLongitude)
Q_PROPERTY(double latitude READ centerLatitude WRITE setCenterLatitude)
+ Q_PROPERTY(bool showOverviewMap READ showOverviewMap WRITE \
setShowOverviewMap)
Q_PROPERTY(bool showScaleBar READ showScaleBar WRITE setShowScaleBar)
Q_PROPERTY(bool showCompass READ showCompass WRITE setShowCompass)
Q_PROPERTY(bool showGrid READ showGrid WRITE setShowGrid)
@@ -350,6 +351,12 @@
QPixmap mapScreenShot();
/**
+ * @brief Return whether the overview map is visible.
+ * @return The overview map visibility.
+ */
+ bool showOverviewMap() const;
+
+ /**
* @brief Return whether the scale bar is visible.
* @return The scale bar visibility.
*/
@@ -654,6 +661,12 @@
void setPropertyValue( const QString& name, bool value );
/**
+ * @brief Set whether the overview map overlay is visible
+ * @param visible visibility of the overview map
+ */
+ void setShowOverviewMap( bool visible );
+
+ /**
* @brief Set whether the scale bar overlay is visible
* @param visible visibility of the scale bar
*/
--- branches/KDE/4.1/kdeedu/marble/src/lib/VectorComposer.cpp #842083:842084
@@ -130,7 +130,7 @@
viewParams->propertyValue( "waterbodies", showWaterbodies );
viewParams->propertyValue( "lakes", showLakes );
- if ( showWaterbodies || showLakes ) {
+ if ( showWaterbodies && showLakes ) {
// Lakes
m_vectorMap -> setzBoundingBoxLimit( 0.95 );
m_vectorMap -> setzPointLimit( 0.98 );
@@ -226,7 +226,7 @@
viewParams->propertyValue( "waterbodies", showWaterbodies );
viewParams->propertyValue( "lakes", showLakes );
- if ( showWaterbodies || showLakes ) {
+ if ( showWaterbodies && showLakes ) {
// Lakes
m_vectorMap -> setzBoundingBoxLimit( 0.95 );
m_vectorMap -> setzPointLimit( 0.98 );
@@ -283,7 +283,7 @@
viewParams->propertyValue( "waterbodies", showWaterbodies );
viewParams->propertyValue( "rivers", showRivers );
- if ( showWaterbodies || showRivers ) {
+ if ( showWaterbodies && showRivers ) {
// Rivers
m_vectorMap -> setzBoundingBoxLimit( -1.0 );
m_vectorMap -> setzPointLimit( -1.0 );
--- branches/KDE/4.1/kdeedu/marble/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp \
#842083:842084 @@ -41,9 +41,11 @@
QWidget *MarbleWidgetPlugin::createWidget(QWidget *parent)
{
- // Create the Model (Globe) and one view.
- //MarbleModel *model = new MarbleModel( parent );
- return new MarbleWidget( parent );
+ MarbleWidget* marbleWidget = new MarbleWidget( parent );
+ marbleWidget->setMapThemeId("earth/srtm/srtm.dgml");
+ marbleWidget->setDownloadUrl( "http://download.kde.org/apps/marble/" );
+
+ return marbleWidget;
}
QString MarbleWidgetPlugin::name() const
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic