Conference map

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 025593c9cf961d8dc9af9f0d2f924c98a6d127f2..ec6fc0e88262013017e00ae5da5066049ffc1f10 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -121,6 +121,8 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     connect(nowTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
     connect(nowTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));

+    // event conference map button clicked
+    connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));

     //
     connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(tabHasChanged(int)));
 
     //
     connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(tabHasChanged(int)));
 


@@ -291,6 +293,20 @@ void MainWindow::searchClicked()
     updateSearchView( Conference::getById(AppSettings::confId()).start() );
 }
 
     updateSearchView( Conference::getById(AppSettings::confId()).start() );
 }
 

+void MainWindow::conferenceMapClicked()
+{
+
+    QString mapPath = QString(":/maps/campus.png");
+    if(!QFile::exists(mapPath))
+        mapPath = QString(":/maps/rooms/not-available.png");
+
+    QString roomName;
+
+    QPixmap map(mapPath);
+    MapWindow window(map,roomName,this);
+    window.exec();
+}
+

 void MainWindow::displayWarning(const QModelIndex &aIndex)
 {
     Q_UNUSED(aIndex);
 void MainWindow::displayWarning(const QModelIndex &aIndex)
 {
     Q_UNUSED(aIndex);

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index df6b57d4647b49d611de7c5dec5aa6cd2f4e9cac..af0b5e7dc3c7308ed3cd8b45bd8d4526ba5ac8ac 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -27,6 +27,7 @@ private slots:
     void displayMap(const QModelIndex &aIndex);
     void displayWarning(const QModelIndex &aIndex);
     void searchClicked();
     void displayMap(const QModelIndex &aIndex);
     void displayWarning(const QModelIndex &aIndex);
     void searchClicked();

+    void conferenceMapClicked();

     void tabHasChanged(int aIndex);
     void eventHasChanged(int aEventId);
 private:
     void tabHasChanged(int aIndex);
     void eventHasChanged(int aEventId);
 private:

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 0089627754dc82b0e77e966b0e5d0f517ce75ffe..a5e7d6a8f605be2ecf0bd63664194292d88d0c80 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -229,13 +229,8 @@
         </item>
        </layout>
       </widget>
         </item>
        </layout>
       </widget>

-      <widget class="QWidget" name="mapTab" >
-       <attribute name="title" >
-        <string>Map</string>
-       </attribute>
-      </widget>
-      <widget class="QWidget" name="conferenceTab" >
-       <attribute name="title" >
+     <widget class="QWidget" name="conferenceTab" >
+      <attribute name="title" >

         <string>Conference</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_5" >
         <string>Conference</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_5" >

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 406e490c995950e01ce777dbff2dea47570c8880..8e25929866f99fa6a900fd89776ce125eab248dd 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -320,14 +320,13 @@ Delegate::ControlId Delegate::whichControlClicked(const QModelIndex &aIndex, con
         {
             return id;
         }
         {
             return id;
         }

-        else
-        {
-            if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+        else if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))

             && (mControls[id]->hasConflict))
             && (mControls[id]->hasConflict))

-            {
+        {
+            qDebug() << "tengo conflicto";

             return id;
             return id;

-            }

         }
         }

+

     }
 
     return ControlNone;
     }
 
     return ControlNone;