[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/graphics
From: Michael Georg Hansen <mike () mghansen ! de>
Date: 2010-08-14 19:41:23
Message-ID: 20100814194123.2E0A8AC84E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1163679 by mghansen:
Polish: Rename KMap to KMapWidget, as in Marble and MarbleWidget.
M +3 -3 digikam/digikam/mapwidgetview.cpp
M +2 -2 digikam/libs/dialogs/libsinfodlg.cpp
M +1 -1 digikam/libs/imageproperties/imagegpsitem.h
M +0 -1 digikam/libs/imageproperties/imagegpsmodelhelper.h
M +3 -3 digikam/libs/imageproperties/imagepropertiesgpstab.cpp
M +0 -1 digikam/utilities/gpssearch/gpsmarkertiler.h
M +3 -2 digikam/utilities/gpssearch/gpssearchview.cpp
M +3 -3 kipi-plugins/gpssync/gpssyncdialog.cpp
M +3 -3 kipi-plugins/gpssync/searchwidget.cpp
M +1 -1 kipi-plugins/gpssync/searchwidget.h
M +3 -3 libkmap/demo/mainwindow.cpp
M +2 -2 libkmap/libkmap/CMakeLists.txt
M +9 -12 libkmap/libkmap/abstractmarkertiler.cpp
M +9 -1 libkmap/libkmap/abstractmarkertiler.h
M +1 -1 libkmap/libkmap/backend-googlemaps.cpp
M +1 -1 libkmap/libkmap/backend-marble.cpp
M +2 -1 libkmap/libkmap/itemmarkertiler.cpp
D libkmap/libkmap/kmap.cpp
D libkmap/libkmap/kmap.h
M +1 -1 libkmap/libkmap/kmap_common.h
M +1 -2 libkmap/libkmap/kmap_primitives.h
A libkmap/libkmap/kmapwidget.cpp libkmap/libkmap/kmap.cpp#1163656 \
[License: GPL (v2+)] A libkmap/libkmap/kmapwidget.h \
libkmap/libkmap/kmap.h#1163647 [License: GPL (v2+)]
--- branches/extragear/graphics/digikam/digikam/mapwidgetview.cpp #1163678:1163679
@@ -39,7 +39,7 @@
// libkmap includes
-#include <libkmap/kmap.h>
+#include <libkmap/kmapwidget.h>
#include <libkmap/itemmarkertiler.h>
//local includes
@@ -82,7 +82,7 @@
}
KVBox *vbox;
- KMapIface::KMap *mapWidget;
+ KMapIface::KMapWidget *mapWidget;
ImageAlbumModel *imageModel;
QItemSelectionModel *selectionModel;
MapViewModelHelper *mapViewModelHelper;
@@ -97,7 +97,7 @@
d->mapViewModelHelper = new MapViewModelHelper(d->imageModel, d->selectionModel, \
imageFilterModel, this); QVBoxLayout *vBoxLayout = new QVBoxLayout(this);
- d->mapWidget = new KMapIface::KMap(this);
+ d->mapWidget = new KMapIface::KMapWidget(this);
KMapIface::ItemMarkerTiler* const kmapMarkerModel = new \
KMapIface::ItemMarkerTiler(d->mapViewModelHelper, this); \
d->mapWidget->setGroupedModel(kmapMarkerModel); d->mapWidget->setBackend("marble");
--- branches/extragear/graphics/digikam/libs/dialogs/libsinfodlg.cpp #1163678:1163679
@@ -48,7 +48,7 @@
// Libkmap includes
-#include <libkmap/kmap.h>
+#include <libkmap/kmapwidget.h>
// C ANSI includes
@@ -118,7 +118,7 @@
list.insert(i18n("LibLCMS"), QString::number(LCMS_VERSION));
list.insert(i18n("LibPGF"), libPGFVersion());
- list.insert(i18n("LibKMap"), KMapIface::KMap::version());
+ list.insert(i18n("LibKMap"), \
KMapIface::KMapWidget::version());
listView()->setHeaderLabels(QStringList() << i18n("Component") << i18n("Info"));
setInfoMap(list);
--- branches/extragear/graphics/digikam/libs/imageproperties/imagegpsitem.h \
#1163678:1163679 @@ -32,7 +32,7 @@
// libkmap includes
-#include <libkmap/kmap.h>
+#include <libkmap/kmap_primitives.h>
// TODO: move this somewhere central, because it is defined multiple times now
#include "digikam_export.h"
--- branches/extragear/graphics/digikam/libs/imageproperties/imagegpsmodelhelper.h \
#1163678:1163679 @@ -32,7 +32,6 @@
// libkmap includes
-#include <libkmap/kmap.h>
#include <libkmap/kmap_primitives.h>
#include "thumbnailloadthread.h"
--- branches/extragear/graphics/digikam/libs/imageproperties/imagepropertiesgpstab.cpp \
#1163678:1163679 @@ -53,7 +53,7 @@
// libkmap includes
-#include <libkmap/kmap.h>
+#include <libkmap/kmapwidget.h>
#include <libkmap/itemmarkertiler.h>
// local includes
@@ -97,7 +97,7 @@
KSqueezedTextLabel *longitude;
KSqueezedTextLabel *date;
- KMapIface::KMap *map;
+ KMapIface::KMapWidget *map;
KMapIface::ItemMarkerTiler *itemMarkerTiler;
GPSInfoList gpsInfoList;
@@ -119,7 +119,7 @@
mapPanel->setLineWidth(style()->pixelMetric(QStyle::PM_DefaultFrameWidth));
QVBoxLayout* const vlay2 = new QVBoxLayout(mapPanel);
- d->map = new KMapIface::KMap(mapPanel);
+ d->map = new KMapIface::KMapWidget(mapPanel);
d->map->setBackend("marble");
vlay2->addWidget(d->map);
vlay2->setMargin(0);
--- branches/extragear/graphics/digikam/utilities/gpssearch/gpsmarkertiler.h \
#1163678:1163679 @@ -39,7 +39,6 @@
// libkmap includes
-#include <libkmap/kmap.h>
#include <libkmap/abstractmarkertiler.h>
// local includes
--- branches/extragear/graphics/digikam/utilities/gpssearch/gpssearchview.cpp \
#1163678:1163679 @@ -53,6 +53,7 @@
// libkmap includes
+#include <libkmap/kmapwidget.h>
#include <libkmap/itemmarkertiler.h>
// Local includes
@@ -100,7 +101,7 @@
QSplitter* splitter;
- KMapIface::KMap* mapSearchWidget;
+ KMapIface::KMapWidget* mapSearchWidget;
GPSMarkerTiler* gpsMarkerTiler;
ImageAlbumModel* imageAlbumModel;
@@ -145,7 +146,7 @@
mapPanel->setMinimumWidth(256);
mapPanel->setMinimumHeight(256);
QVBoxLayout* vlay2 = new QVBoxLayout(mapPanel);
- d->mapSearchWidget = new KMapIface::KMap(mapPanel);
+ d->mapSearchWidget = new KMapIface::KMapWidget(mapPanel);
d->mapSearchWidget->setBackend("marble");
d->gpsMarkerTiler = new GPSMarkerTiler(this);
--- branches/extragear/graphics/kipi-plugins/gpssync/gpssyncdialog.cpp \
#1163678:1163679 @@ -78,7 +78,7 @@
// Libkmap includes
#include <libkmap/html_widget.h>
-#include <libkmap/kmap.h>
+#include <libkmap/kmapwidget.h>
#include <libkmap/itemmarkertiler.h>
// Local includes
@@ -151,7 +151,7 @@
KTabWidget *tabWidget;
QSplitter *VSplitter;
QSplitter *HSplitter;
- KMapIface::KMap *mapWidget;
+ KMapIface::KMapWidget *mapWidget;
KipiImageList *treeView;
GPSImageDetails *detailsWidget;
GPSSettingsWidget *settingsWidget;
@@ -245,7 +245,7 @@
d->HSplitter->addWidget(d->VSplitter);
d->HSplitter->setStretchFactor(0, 10);
- d->mapWidget = new KMapIface::KMap(this);
+ d->mapWidget = new KMapIface::KMapWidget(this);
d->mapWidget->setEditModeAvailable(true);
KMapIface::ItemMarkerTiler* const kmapMarkerModel = new \
KMapIface::ItemMarkerTiler(d->mapModelHelper, this); \
d->mapWidget->setGroupedModel(kmapMarkerModel);
--- branches/extragear/graphics/kipi-plugins/gpssync/searchwidget.cpp \
#1163678:1163679 @@ -44,7 +44,7 @@
// Libkmap includes
-#include <libkmap/kmap.h>
+#include <libkmap/kmapwidget.h>
// local includes
@@ -71,7 +71,7 @@
{
}
- KMapIface::KMap* mapWidget;
+ KMapIface::KMapWidget* mapWidget;
GPSBookmarkOwner* gpsBookmarkOwner;
KipiImageModel* kipiImageModel;
QItemSelectionModel* kipiImageSelectionModel;
@@ -96,7 +96,7 @@
KAction* actionMoveImagesToThisResult;
};
-SearchWidget::SearchWidget(KMapIface::KMap* const mapWidget, GPSBookmarkOwner* const \
gpsBookmarkOwner, +SearchWidget::SearchWidget(KMapIface::KMapWidget* const \
mapWidget, GPSBookmarkOwner* const gpsBookmarkOwner,
KipiImageModel* const kipiImageModel, \
QItemSelectionModel* const kipiImageSelectionModel, QWidget* parent)
: QWidget(parent), d(new SearchWidgetPrivate())
--- branches/extragear/graphics/kipi-plugins/gpssync/searchwidget.h #1163678:1163679
@@ -105,7 +105,7 @@
Q_OBJECT
public:
- SearchWidget(KMapIface::KMap* const mapWidget, GPSBookmarkOwner* const \
gpsBookmarkOwner, KipiImageModel* const kipiImageModel, QItemSelectionModel* const \
kipiImageSelectionModel, QWidget* parent = 0); + \
SearchWidget(KMapIface::KMapWidget* const mapWidget, GPSBookmarkOwner* const \
gpsBookmarkOwner, KipiImageModel* const kipiImageModel, QItemSelectionModel* const \
kipiImageSelectionModel, QWidget* parent = 0); ~SearchWidget();
KMapIface::WMWModelHelper* getModelHelper();
--- branches/extragear/graphics/libkmap/demo/mainwindow.cpp #1163678:1163679
@@ -62,7 +62,7 @@
// local includes
-#include "kmap.h"
+#include "kmapwidget.h"
#include "itemmarkertiler.h"
#include "mytreewidget.h"
#include "dragdrophandler.h"
@@ -144,7 +144,7 @@
}
QSplitter* splitter;
- KMap* mapWidget;
+ KMapWidget* mapWidget;
MyTreeWidget* treeWidget;
QPointer<QProgressBar> progressBar;
QList<QFuture<MyImageData> > imageLoadingRunningFutures;
@@ -197,7 +197,7 @@
d->splitter = new QSplitter(Qt::Vertical, this);
setCentralWidget(d->splitter);
- d->mapWidget = new KMap(d->splitter);
+ d->mapWidget = new KMapWidget(d->splitter);
d->mapWidget->setEditModeAvailable(true);
d->mapWidget->setGroupedModel(mm);
d->mapWidget->setDragDropHandler(new DemoDragDropHandler(d->displayMarkersModel, \
d->mapWidget));
--- branches/extragear/graphics/libkmap/libkmap/CMakeLists.txt #1163678:1163679
@@ -39,7 +39,7 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/version.h)
SET(widget_sources
- kmap.cpp
+ kmapwidget.cpp
kmap_common.cpp
kmap_dragdrophandler.cpp
kmap_primitives.cpp
@@ -91,7 +91,7 @@
INSTALL(TARGETS kmap ${INSTALL_TARGETS_DEFAULT_ARGS})
INSTALL(FILES libkmap_export.h
- kmap.h
+ kmapwidget.h
kmap_dragdrophandler.h
kmap_primitives.h
altitude-backend.h
--- branches/extragear/graphics/libkmap/libkmap/abstractmarkertiler.cpp \
#1163678:1163679 @@ -465,8 +465,8 @@
const qreal dLat = tileLatHeight / latDivisor;
const qreal dLon = tileLonWidth / lonDivisor;
- int latIndex = indexLat(l);
- int lonIndex = indexLon(l);
+ const int latIndex = indexLat(l);
+ const int lonIndex = indexLon(l);
// update the start position for the next tile:
tileLatBL += latIndex*dLat;
@@ -479,11 +479,8 @@
}
-WMWGeoCoordinate AbstractMarkerTiler::TileIndex::toCoordinates(int ofCorner) const
+WMWGeoCoordinate AbstractMarkerTiler::TileIndex::toCoordinates(const CornerPosition \
ofCorner) const {
- //corners:
- //1-NW; 2-SW; 3-NE; 4-SE
-
// TODO: safeguards against rounding errors!
qreal tileLatBL = -90.0;
qreal tileLonBL = -180.0;
@@ -499,28 +496,28 @@
const qreal dLat = tileLatHeight / latDivisor;
const qreal dLon = tileLonWidth / lonDivisor;
- int latIndex = indexLat(l);
- int lonIndex = indexLon(l);
+ const int latIndex = indexLat(l);
+ const int lonIndex = indexLon(l);
// update the start position for the next tile:
if(l+1 >= m_indicesCount)
{
- if(ofCorner == 1)
+ if(ofCorner == CornerNW)
{
tileLatBL += latIndex*dLat;
tileLonBL += lonIndex*dLon;
}
- else if(ofCorner == 2)
+ else if(ofCorner == CornerSW)
{
tileLatBL += (latIndex+1)*dLat;
tileLonBL += lonIndex*dLon;
}
- else if(ofCorner == 3)
+ else if(ofCorner == CornerNE)
{
tileLatBL += latIndex*dLat;
tileLonBL += (lonIndex+1)*dLon;
}
- else if(ofCorner == 4)
+ else if(ofCorner == CornerSE)
{
tileLatBL += (latIndex+1)*dLat;
tileLonBL += (lonIndex+1)*dLon;
--- branches/extragear/graphics/libkmap/libkmap/abstractmarkertiler.h \
#1163678:1163679 @@ -59,6 +59,14 @@
MaxLinearIndex = Tiling*Tiling
};
+ enum CornerPosition
+ {
+ CornerNW = 1,
+ CornerSW = 2,
+ CornerNE = 3,
+ CornerSE = 4
+ };
+
inline TileIndex()
: m_indicesCount(0),
m_indices()
@@ -136,7 +144,7 @@
WMWGeoCoordinate toCoordinates() const;
- WMWGeoCoordinate toCoordinates(int ofCorner) const;
+ WMWGeoCoordinate toCoordinates(const CornerPosition ofCorner) const;
inline static TileIndex fromIntList(const QIntList& intList)
{
--- branches/extragear/graphics/libkmap/libkmap/backend-googlemaps.cpp \
#1163678:1163679 @@ -44,7 +44,7 @@
// local includes
#include "html_widget.h"
-#include "kmap.h"
+#include "kmapwidget.h"
#include "abstractmarkertiler.h"
namespace KMapIface
--- branches/extragear/graphics/libkmap/libkmap/backend-marble.cpp #1163678:1163679
@@ -59,7 +59,7 @@
#endif // KMAP_MARBLE_ADD_LAYER
#include "abstractmarkertiler.h"
-#include "kmap.h"
+#include "kmapwidget.h"
using namespace Marble;
--- branches/extragear/graphics/libkmap/libkmap/itemmarkertiler.cpp #1163678:1163679
@@ -185,8 +185,9 @@
emit(signalTilesOrSelectionChanged());
}
-void ItemMarkerTiler::slotSourceModelDataChanged(const QModelIndex& /*topLeft*/, \
const QModelIndex& /*bottomRight*/) +void \
ItemMarkerTiler::slotSourceModelDataChanged(const QModelIndex& topLeft, const \
QModelIndex& bottomRight) {
+ kDebug()<<topLeft<<bottomRight;
setDirty();
if(d->activeState)
emit signalTilesOrSelectionChanged();
--- branches/extragear/graphics/libkmap/libkmap/kmap_common.h #1163678:1163679
@@ -72,7 +72,7 @@
markerPixmap = markerPixmaps["00ff00"];
}
- KMap* worldMapWidget;
+ KMapWidget* worldMapWidget;
QIntList visibleMarkers;
AbstractMarkerTiler* markerModel;
WMWCluster::List clusterList;
--- branches/extragear/graphics/libkmap/libkmap/kmap_primitives.h #1163678:1163679
@@ -319,8 +319,7 @@
QPoint pixmapOffset;
};
-class MarkerModel;
-class KMap;
+class KMapWidget;
class KMAP_EXPORT WMWModelHelper : public QObject
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic