comparison view/View.cpp @ 797:edada332c374 tonioni

Add an experimental cancel button to view progress bars

 #include "layer/TimeRulerLayer.h"
 #include "layer/SingleColourLayer.h"
 #include "data/model/PowerOfSqrtTwoZoomConstraint.h"
 #include "data/model/RangeSummarisableTimeValueModel.h"
 
+#include "widgets/IconLoader.h"
+
 #include <QPainter>
 #include <QPaintEvent>
 #include <QRect>
 #include <QApplication>
 #include <QProgressDialog>
 #include <QTextStream>
 #include <QFont>
 #include <QMessageBox>
+#include <QPushButton>
 
 #include <iostream>
 #include <cassert>
 #include <cmath>
 

     if (widgetLight != light) return widgetfg;
     else if (light) return Qt::black;
     else return Qt::white;
 }
 
-View::LayerProgressBar::LayerProgressBar(QWidget *parent) :
-    QProgressBar(parent)
-{
-}
-
 void
 View::addLayer(Layer *layer)
 {
     delete m_cache;
     m_cache = 0;

     pb->setMinimum(0);
     pb->setMaximum(0);
     pb->setFixedWidth(80);
     pb->setTextVisible(false);
 
+    QPushButton *cancel = new QPushButton(this);
+    cancel->setIcon(IconLoader().load("fileclose"));
+    cancel->setFlat(true);
+    cancel->setFixedSize(QSize(20, 20));
+    connect(cancel, SIGNAL(clicked()), this, SLOT(cancelClicked()));
+    
     ProgressBarRec pbr;
+    pbr.cancel = cancel;
     pbr.bar = pb;
     pbr.lastCheck = 0;
     pbr.checkTimer = new QTimer();
     connect(pbr.checkTimer, SIGNAL(timeout()), this,
             SLOT(progressCheckStalledTimerElapsed()));

     m_progressBars[layer] = pbr;
 
     QFont f(pb->font());
     int fs = Preferences::getInstance()->getViewFontSize();
     f.setPointSize(std::min(fs, int(ceil(fs * 0.85))));
+
+    cancel->hide();
 
     pb->setFont(f);
     pb->hide();
     
     connect(layer, SIGNAL(layerParametersChanged()),

     for (LayerList::iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
 	if (*i == layer) {
 	    m_layers.erase(i);
 	    if (m_progressBars.find(layer) != m_progressBars.end()) {
 		delete m_progressBars[layer].bar;
+                delete m_progressBars[layer].cancel;
 		delete m_progressBars[layer].checkTimer;
 		m_progressBars.erase(layer);
 	    }
 	    break;
 	}

 	setCentreFrame(m_centreFrame - delta, e);
     }
 }
 
 void
-View::checkProgress(void *object)
-{
-    if (!m_showProgress) return;
-
-    int ph = height();
+View::cancelClicked()
+{
+    QPushButton *cancel = qobject_cast<QPushButton *>(sender());
+    if (!cancel) return;
 
     for (ProgressMap::iterator i = m_progressBars.begin();
 	 i != m_progressBars.end(); ++i) {
 
+        if (i->second.cancel == cancel) {
+
+            Layer *layer = i->first;
+            Model *model = layer->getModel();
+
+            if (model) model->abandon();
+        }
+    }
+}
+
+void
+View::checkProgress(void *object)
+{
+    if (!m_showProgress) return;
+
+    int ph = height();
+
+    for (ProgressMap::iterator i = m_progressBars.begin();
+	 i != m_progressBars.end(); ++i) {
+
         QProgressBar *pb = i->second.bar;
+        QPushButton *cancel = i->second.cancel;
 
 	if (i->first == object) {
 
             // The timer is used to test for stalls.  If the progress
             // bar does not get updated for some length of time, the

             }
 
 	    if (completion >= 100) {
 
 		pb->hide();
+                cancel->hide();
                 timer->stop();
 
 	    } else {
 
 //                cerr << "progress = " << completion << endl;

                     i->second.lastCheck = 0;
                     timer->setInterval(2000);
                     timer->start();
                 }
 
+                cancel->move(0, ph - pb->height()/2 - 10);
+                cancel->show();
+
 		pb->setValue(completion);
-		pb->move(0, ph - pb->height());
+		pb->move(20, ph - pb->height());
 
 		pb->show();
 		pb->update();
 
 		ph -= pb->height();