Changeset 59c6cfe

Timestamp:

01/18/10 22:32:44 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

446bce4

Parents:

c18cbd0

Message:

started work on displaying map

• implemented mapwindow
• map is hard-coded for now

TODO: finish getting map path from the event

Location:

src

Files:

• gui/gui.pro (modified) (1 diff)
• gui/mainwindow.cpp (modified) (4 diffs)
• gui/mainwindow.h (modified) (1 diff)
• gui/mapwindow.cpp (added)
• gui/mapwindow.h (added)
• gui/mapwindow.ui (added)
• mvc/eventmodel.cpp (modified) (2 diffs)
• mvc/treeview.cpp (modified) (1 diff)
• mvc/treeview.h (modified) (2 diffs)

src/gui/gui.pro

@@ -27 +27 @@
          daynavigatorwidget.ui \
          about.ui \
-         eventdialog.ui
+         eventdialog.ui \
+         mapwindow.ui
 
 HEADERS += mainwindow.h \
            daynavigatorwidget.h \
-           eventdialog.h
+           eventdialog.h \
+           mapwindow.h
 
 SOURCES += mainwindow.cpp \
            daynavigatorwidget.cpp \
-           eventdialog.cpp
+           eventdialog.cpp \
+           mapwindow.cpp
 
 maemo {

src/gui/mainwindow.cpp

@@ -16 +16 @@
 #include "eventdialog.h"
 #include "daynavigatorwidget.h"
+#include "mapwindow.h"
 
 MainWindow::MainWindow(QWidget *parent)
@@ -64 +65 @@
     actTreeView->setItemDelegate(new Delegate(actTreeView));
 
+    // event double clicked
     connect(dayTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
     connect(favTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
     connect(actTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
+    // request for map to be displayed
+    connect(dayTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
+    connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
+    connect(actTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
+
 
     // TESTING: load some 'fav' data
@@ -113 +120 @@
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
-        QString currPath = QDir::currentPath();
-        qDebug() << "current path: " << currPath;
         qDebug() << "can't open " << file.fileName();
         return;
@@ -192 +197 @@
 }
 
+void MainWindow::displayMap(const QModelIndex &aIndex)
+{
+    QPixmap map(":/maps/rooms/janson.png");
+    MapWindow window(map,this);
+    window.exec();
+}
+

src/gui/mainwindow.h

@@ -24 +24 @@
     void updateActivitiesDayView(const QDate &aDate);
     void itemDoubleClicked(const QModelIndex &aIndex);
+    void displayMap(const QModelIndex &aIndex);
 private:
     SqlEngine *mSqlEngine;

src/mvc/eventmodel.cpp

@@ -62 +62 @@
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
             mGroups << EventModel::Group(QString("activity %1").arg(activityId), 0);
-            int nextActivityId = activityId;
+            //int nextActivityId = activityId;
         }
         // add parent-child relation
@@ -151 +151 @@
         Group group = mGroups[i];
         beginRemoveRows(idx, 0, group.mChildCount - 1);
-        bool ok = removeRows(0, group.mChildCount, idx);
+        /*bool ok =*/ removeRows(0, group.mChildCount, idx);
         endRemoveRows();
         //qDebug() << "removing " << group.mChildCount << " events from group:" << i << idx.data() << ":" << ok;

src/mvc/treeview.cpp

@@ -80 +80 @@
                 // handle Alarm Control clicked
                 qDebug() << "MAP CLICKED: " << qVariantValue<QString>(aIndex.data());
+                emit(requestForMap(aIndex));
             }
         break;

src/mvc/treeview.h

@@ -4 +4 @@
 #include <QTreeView>
 
-
 class TreeView : public QTreeView
 {
+    Q_OBJECT
 public:
     TreeView(QWidget *aParent = NULL);
@@ -13 +13 @@
     void mouseReleaseEvent(QMouseEvent *aEvent);
     void testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint);
+signals:
+    void requestForMap(const QModelIndex &aIndex);
 };