# HG changeset patch
# User Chris Cannam
# Date 1563365576 -3600
# Node ID 0e971e3d93e2dd018bedeaacaa8eb9b6cf940719
# Parent  b43ff1abdc020f0a1eb3ee72141a8c4539f0673c
Tidy; also don't show cancel buttons for alignments

diff -r b43ff1abdc02 -r 0e971e3d93e2 layer/Colour3DPlotLayer.cpp
--- a/layer/Colour3DPlotLayer.cpp	Wed Jul 17 11:20:08 2019 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Wed Jul 17 13:12:56 2019 +0100
@@ -173,7 +173,6 @@
     invalidatePeakCache();
 
     emit modelReplaced();
-//!!!    emit sliceableModelReplaced(oldModel, model);
 }
 
 void
diff -r b43ff1abdc02 -r 0e971e3d93e2 layer/SliceLayer.cpp
--- a/layer/SliceLayer.cpp	Wed Jul 17 11:20:08 2019 +0100
+++ b/layer/SliceLayer.cpp	Wed Jul 17 13:12:56 2019 +0100
@@ -89,17 +89,7 @@
         setSliceableModel(replacement);
     }
 }
-/*!!!
-void
-SliceLayer::modelAboutToBeDeleted(Model *m)
-{
-    SVDEBUG << "SliceLayer::modelAboutToBeDeleted(" << m << ")" << endl;
 
-    if (m == m_sliceableModel) {
-        setSliceableModel(nullptr);
-    }
-}
-*/
 QString
 SliceLayer::getFeatureDescription(LayerGeometryProvider *v, QPoint &p) const
 {
diff -r b43ff1abdc02 -r 0e971e3d93e2 view/View.cpp
--- a/view/View.cpp	Wed Jul 17 11:20:08 2019 +0100
+++ b/view/View.cpp	Wed Jul 17 13:12:56 2019 +0100
@@ -1747,7 +1747,6 @@
 
     QSettings settings;
     settings.beginGroup("View");
-    //!!! perhaps alignments in general should not be cancellable?
     bool showCancelButton = settings.value("showcancelbuttons", true).toBool();
     settings.endGroup();
     
@@ -1808,8 +1807,14 @@
                     (model && 
                      (wfm = ModelById::getAs<RangeSummarisableTimeValueModel>
                       (model->getSourceModel())))) {
+
                     completion = wfm->getAlignmentCompletion();
 
+                    // We don't allow cancelling alignment operations
+                    // - they aren't usually all that expensive, and
+                    // it would leave things in a very uncertain state
+                    showCancelButton = false;
+
 #ifdef DEBUG_PROGRESS_STUFF
                     SVCERR << "View[" << this << "]::checkProgress(" << object << "): "
                            << "alignment completion = " << completion << endl;