Changeset e6ab8a2

Timestamp:

07/04/11 23:42:02 (12 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

526128c

Parents:

8dd3dd2

Message:

Removed the ability to show "pictures" (maps) of rooms and maps of conferences.
The XML file does not contain picture/map/image information of conferences or rooms.
We left the room.picture definition in the database SQL because there is no "drop column"
in sqlite.

Location:

src

Files:

• create_tables.sql (modified) (1 diff)
• gui/conferenceeditor.cpp (modified) (4 diffs)
• gui/conferenceeditor.h (modified) (1 diff)
• gui/conferenceeditor.ui (modified) (1 diff)
• gui/gui.pro (modified) (3 diffs)
• gui/mapwindow.cpp (deleted)
• gui/mapwindow.h (deleted)
• gui/mapwindow.ui (deleted)
• gui/tabcontainer.cpp (modified) (3 diffs)
• gui/tabcontainer.h (modified) (1 diff)
• icons.qrc (modified) (1 diff)
• icons/applications-internet.png (deleted)
• mvc/conference.cpp (modified) (1 diff)
• mvc/conference.h (modified) (1 diff)
• mvc/delegate.cpp (modified) (2 diffs)
• mvc/delegate.h (modified) (1 diff)
• mvc/room.cpp (modified) (1 diff)
• mvc/room.h (modified) (1 diff)
• mvc/treeview.cpp (modified) (1 diff)
• mvc/treeview.h (modified) (1 diff)
• sql/schedulexmlparser.cpp (modified) (1 diff)
• sql/sqlengine.cpp (modified) (3 diffs)
• sql/sqlengine.h (modified) (1 diff)

src/create_tables.sql

@@ -11 +11 @@
     , timeslot_duration INTEGER
     , active INTEGER DEFAULT 0
-    , url VARCHAR
-    , map VARCHAR);
+    , url VARCHAR);
 
 CREATE TABLE TRACK ( id INTEGER  PRIMARY KEY AUTOINCREMENT  NOT NULL

src/gui/conferenceeditor.cpp

@@ -22 +22 @@
 #include "conferencemodel.h"
 #include "urlinputdialog.h"
-#include "mapwindow.h"
 #include "errormessage.h"
 
@@ -51 +50 @@
     connect(changeUrl, SIGNAL(clicked()), SLOT(changeUrlClicked()));
     connect(refreshBtn, SIGNAL(clicked()), SLOT(refreshClicked()));
-    connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
     connect(buttonBox, SIGNAL(rejected()), SLOT(close()));
 
@@ -97 +95 @@
                 + ", " +
                 conf.end().toString("dd-MM-yyyy"));
-
-        QString map = conf.map();
-        if (map.isEmpty()) {
-            showMapButton->hide();
-        } else {
-            showMapButton->show();
-        }
-
         conferenceInfo->setCurrentIndex(0);
         removeBtn->show();
@@ -220 +210 @@
 }
 
-void ConferenceEditor::conferenceMapClicked()
-{
-    Conference conf = Conference::getById(selected_id);
-    QString mapPath = conf.map();
-    if(mapPath.isEmpty() or !QFile::exists(mapPath)) {
-        error_message("Map is not available");
-        return;
-    }
-
-    QString roomName;
-
-    QPixmap map(mapPath);
-    MapWindow window(map,roomName,this);
-    window.exec();
-}

src/gui/conferenceeditor.h

@@ -65 +65 @@
     void changeUrlClicked();
     void refreshClicked();
-    void conferenceMapClicked();
 
 private:

src/gui/conferenceeditor.ui

@@ -217 +217 @@
             </item>
             <item row="1" column="3">
-             <widget class="QPushButton" name="showMapButton">
-              <property name="text">
-               <string>MAP</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../icons.qrc">
-                <normaloff>:/icons/applications-internet.png</normaloff>:/icons/applications-internet.png</iconset>
-              </property>
-              <property name="flat">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="4">
              <spacer name="horizontalSpacer_4">
               <property name="orientation">

src/gui/gui.pro

@@ -44 +44 @@
     conflictsdialog.ui \
     tabcontainer.ui \
-    mapwindow.ui \
     settingsdialog.ui \
     conferenceeditor.ui \
@@ -62 +61 @@
     eventdialog.h \
     tabcontainer.h \
-    mapwindow.h \
     settingsdialog.h \
     conferenceeditor.h \
@@ -80 +78 @@
     eventdialog.cpp \
     tabcontainer.cpp \
-    mapwindow.cpp \
     settingsdialog.cpp \
     conferenceeditor.cpp \

src/gui/tabcontainer.cpp

@@ -28 +28 @@
 
 #include "eventdialog.h"
-#include "mapwindow.h"
 #include "room.h"
 #include "errormessage.h"
@@ -50 +49 @@
     connect(treeView, SIGNAL(eventHasChanged(int,bool)), SIGNAL(eventHasChanged(int,bool)));
     connect(treeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
-    connect(treeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForConflicts(const QModelIndex &)), SLOT(displayConflicts(const QModelIndex &)));
 
@@ -81 +79 @@
     dialog.exec();
     disconnect(&dialog, SIGNAL(eventHasChanged(int,bool)), this, SIGNAL(eventHasChanged(int,bool)));
-}
-
-void TabContainer::displayMap(const QModelIndex &aIndex)
-{
-    Event *event = static_cast<Event*>(aIndex.internalPointer());
-
-    QVariant mapPathV = event->room()->map();
-    QString mapPath;
-    if (!mapPathV.isValid()) {
-        error_message("No map for this room");
-        return;
-    } else {
-        mapPath = mapPathV.toString();
-        if (!QFile::exists(mapPath)) {
-            error_message("Map for this room not found: " + mapPath);
-            return;
-        }
-    }
-
-    QPixmap map(mapPath);
-    MapWindow window(map, event->room()->name(),this);
-    window.exec();
 }
 

src/gui/tabcontainer.h

@@ -51 +51 @@
     virtual void updateTreeView(const QDate &aDate);
     void itemClicked(const QModelIndex &aIndex);
-    void displayMap(const QModelIndex &aIndex);
     void displayConflicts(const QModelIndex &aIndex);
 };

src/icons.qrc

@@ -1 +1 @@
 <RCC>
-    <qresource prefix="/">
-        <file>icons/add.png</file>
-        <file>icons/remove.png</file>
-        <file>icons/reload.png</file>
-        <file>icons/appointment-soon-off.png</file>
-        <file>icons/appointment-soon.png</file>
-        <file>icons/applications-internet.png</file>
-        <file>icons/emblem-new-off.png</file>
-        <file>icons/emblem-new.png</file>
-        <file>icons/dialog-warning.png</file>
-        <file>icons/search.png</file>
-    </qresource>
+  <qresource prefix="/">
+    <file>icons/add.png</file>
+    <file>icons/remove.png</file>
+    <file>icons/reload.png</file>
+    <file>icons/appointment-soon-off.png</file>
+    <file>icons/appointment-soon.png</file>
+    <file>icons/emblem-new-off.png</file>
+    <file>icons/emblem-new.png</file>
+    <file>icons/dialog-warning.png</file>
+    <file>icons/search.png</file>
+  </qresource>
 </RCC>

src/mvc/conference.cpp

@@ -34 +34 @@
     << QSqlField("active", QVariant::Bool)
     << QSqlField("url", QVariant::String)
-    << QSqlField("map", QVariant::String)
     );
 

src/mvc/conference.h

@@ -52 +52 @@
     bool isActive() const { return value("active").toBool(); }
     QString url() const { return stringFromNullable(value("url")); }
-    QString map() const { return stringFromNullable(value("map")); }
 
     #if 0

src/mvc/delegate.cpp

@@ -150 +150 @@
             mControls[AlarmControlOff]->paint(painter, option.rect);
 #endif
-        if (event->room()->hasMap())
-            mControls[MapControl]->paint(painter, option.rect);
         if(event->hasTimeConflict())
             mControls[WarningControl]->paint(painter, option.rect);
@@ -376 +374 @@
     mControls.insert(AlarmControlOff,
                     new Control(AlarmControlOff, QString(":icons/appointment-soon-off.png"), mControls[FavouriteControlOff]));
-
-    // MAP ICON
-    mControls.insert(MapControl,
-                    new Control(MapControl, QString(":icons/applications-internet.png"), mControls[AlarmControlOn]));
-#else
-    // MAP ICON
-    mControls.insert(MapControl,
-                    new Control(MapControl, QString(":icons/applications-internet.png"), mControls[FavouriteControlOn]));
 #endif
 
     // WARNING ICON
     mControls.insert(WarningControl,
-                    new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[MapControl]));
+                    new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[FavouriteControlOn]));
 }
 

src/mvc/delegate.h

@@ -38 +38 @@
             AlarmControlOn,
             AlarmControlOff,
-            MapControl,
             WarningControl
         };

src/mvc/room.cpp

@@ -22 +22 @@
 
 QString const Room::sTableName = QString("room");
-int const Room::sTableColCount = 3;
+int const Room::sTableColCount = 2;
 const QString Room::NAME = "name";
 
 QSqlRecord const Room::sColumns = Room::toRecord(QList<QSqlField>()
     << QSqlField("id", QVariant::Int)
-    << QSqlField(NAME, QVariant::String)
-    << QSqlField("picture", QVariant::String));
+    << QSqlField(NAME, QVariant::String));
 
 Room Room::retrieveByName(QString name)

src/mvc/room.h

@@ -36 +36 @@
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }
-    // TODO: make naming consistent - either "picture" or "map"
-    QVariant map() const { return value("picture"); }
-    bool hasMap() const
-    {
-        // empty strings also treasted as NULL,
-        // as storing NULLs requires rewrite of storing code and DB scheme
-        return !isNull("picture") and !value("picture").toString().isEmpty();
-    }
     int insert();
 public:

src/mvc/treeview.cpp

@@ -126 +126 @@
             }
             break;
-        case Delegate::MapControl:
-            {
-                // handle Alarm Control clicked
-                emit(requestForMap(aIndex));
-                handled = true;
-            }
-        break;
         case Delegate::WarningControl:
         {

src/mvc/treeview.h

@@ -37 +37 @@
     void handleItemClicked(const QModelIndex &index);
 signals:
-    void requestForMap(const QModelIndex &aIndex);
     void requestForConflicts(const QModelIndex &aIndex);
     void eventHasChanged(int aEventId, bool aReloadModel = false); // emited when user changes some event details, eg. sets it Favourite

src/sql/schedulexmlparser.cpp

@@ -104 +104 @@
                         room["event_id"] = eventElement.attribute("id");
                         room["conference_id"] = QString::number(confId,10);
-                        room["picture"] = ""; // TODO: implement some mapping to assign correct picture to specified room_name
                         SqlEngine::addRoomToDB(room);
 

src/sql/sqlengine.cpp

@@ -67 +67 @@
         database.open();
     }
-
-    checkConferenceMap(database);
 
     //LOG_INFO(QString("Opening '%1' database '%2'").arg(aDatabaseType).arg(aDatabaseName));
@@ -257 +255 @@
         {
             query = QSqlQuery(db);
-            query.prepare("INSERT INTO ROOM (xid_conference,name,picture) VALUES (:xid_conference, :name, :picture)");
+            query.prepare("INSERT INTO ROOM (xid_conference,name,picture) VALUES (:xid_conference, :name, '')");
             query.bindValue(":xid_conference", aRoom["conference_id"]);
             query.bindValue(":xid_name", aRoom["name"]);
-            query.bindValue(":xid_picture", aRoom["picture"]);
             if (!query.exec()) qDebug() << "Could not execute 'insert into room ...' query." << query.lastError();
             aRoom["id"]= query.lastInsertId().toString(); // 'id' is assigned automatically
@@ -402 +399 @@
     return true;
 }
-
-void SqlEngine::checkConferenceMap(QSqlDatabase &aDatabase)
-{
-    QSqlQuery sqlQuery(aDatabase);
-    sqlQuery.prepare("SELECT map FROM conference");
-    if (!sqlQuery.exec()) {
-        qWarning() << "column conference.map is missing; adding";
-        execQuery(aDatabase, "ALTER TABLE conference ADD COLUMN map VARCHAR");
-    }
-}

src/sql/sqlengine.h

@@ -49 +49 @@
         static bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);
         static bool execQueryWithParameter(QSqlDatabase &aDatabase, const QString &aQuery, const QHash<QString, QVariant>& params);
-
-        static void checkConferenceMap(QSqlDatabase &aDatabase);
 };