comparison view/Pane.cpp @ 188:dd573e090eed

* Add range input dialog
* Make Panner support middle-click/ctrl-left-click to reset and emit
  doubleClicked when doubleClicked instead of resetting
* Use range input dialog to enter new values for panner on double-click

 #include <QFrame>
 #include <QGridLayout>
 #include <QPushButton>
 #include "widgets/Thumbwheel.h"
 #include "widgets/Panner.h"
+#include "widgets/RangeInputDialog.h"
 
 using std::cerr;
 using std::endl;
 
 Pane::Pane(QWidget *w) :

         ++count;
     }
 
     std::cerr << "Have " << count+1 << " zoom levels" << std::endl;
 */
+
+    Layer *layer = 0;
+    if (getLayerCount() > 0) layer = getLayer(getLayerCount() - 1);
 
     if (!m_headsUpDisplay) {
 
         m_headsUpDisplay = new QFrame(this);
 

         m_vpan->setFixedWidth(12);
         m_vpan->setFixedHeight(70);
         m_vpan->setAlpha(80, 130);
         connect(m_vpan, SIGNAL(rectExtentsChanged(float, float, float, float)),
                 this, SLOT(verticalPannerMoved(float, float, float, float)));
+        connect(m_vpan, SIGNAL(doubleClicked()),
+                this, SLOT(editVerticalPannerExtents()));
 
         m_vthumb = new Thumbwheel(Qt::Vertical);
         m_vthumb->setObjectName(tr("Vertical Zoom"));
         layout->addWidget(m_vthumb, 0, 2);
         m_vthumb->setFixedWidth(16);
         m_vthumb->setFixedHeight(70);
         connect(m_vthumb, SIGNAL(valueChanged(int)), this, 
                 SLOT(verticalThumbwheelMoved(int)));
 
+        if (layer) {
+            RangeMapper *rm = layer->getNewVerticalZoomRangeMapper();
+            if (rm) m_vthumb->setRangeMapper(rm);
+        }
+
         QPushButton *reset = new QPushButton;
         reset->setFixedHeight(16);
         reset->setFixedWidth(16);
         layout->addWidget(reset, 1, 2);
         connect(reset, SIGNAL(clicked()), m_hthumb, SLOT(resetToDefault()));
         connect(reset, SIGNAL(clicked()), m_vthumb, SLOT(resetToDefault()));
+        connect(reset, SIGNAL(clicked()), m_vpan, SLOT(resetToDefault()));
     }
 
     int count = 0;
     int current = 0;
     int level = 1;

     if (count != 50 && m_hthumb->getDefaultValue() == 0) {
         m_hthumb->setDefaultValue(count - current);
 //        std::cerr << "set default value to " << m_hthumb->getDefaultValue() << std::endl;
     }
 
-    Layer *layer = 0;
-    if (getLayerCount() > 0) layer = getLayer(getLayerCount() - 1);
     if (layer) {
         int defaultStep = 0;
         int max = layer->getVerticalZoomSteps(defaultStep);
         if (max == 0) {
             m_vthumb->hide();

     return true;
 }
 
 bool
 Pane::getTopLayerDisplayExtents(float &vmin, float &vmax,
-                                float &dmin, float &dmax) 
+                                float &dmin, float &dmax,
+                                QString *unit) 
 {
     Layer *layer = 0;
     if (getLayerCount() > 0) layer = getLayer(getLayerCount() - 1);
     if (!layer) return false;
     bool vlog;
     QString vunit;
-    return (layer->getValueExtents(vmin, vmax, vlog, vunit) &&
-            layer->getDisplayExtents(dmin, dmax));
+    bool rv = (layer->getValueExtents(vmin, vmax, vlog, vunit) &&
+               layer->getDisplayExtents(dmin, dmax));
+    if (unit) *unit = vunit;
+    return rv;
 }
 
 bool
 Pane::setTopLayerDisplayExtents(float dmin, float dmax)
 {

     std::cerr << "verticalPannerMoved: (" << x0 << "," << y0 << "," << w
               << "," << h << ") -> (" << newmin << "," << newmax << ")" << std::endl;
     setTopLayerDisplayExtents(newmin, newmax);
 }
 
+void
+Pane::editVerticalPannerExtents()
+{
+    if (!m_vpan || !m_manager || !m_manager->getZoomWheelsEnabled()) return;
+
+    float vmin, vmax, dmin, dmax;
+    QString unit;
+    if (!getTopLayerDisplayExtents(vmin, vmax, dmin, dmax, &unit)
+        || vmax == vmin) {
+        return;
+    }
+
+    RangeInputDialog dialog(tr("Enter new range"),
+                            tr("New vertical display range, from %1 to %2 %4:")
+                            .arg(vmin).arg(vmax).arg(unit),
+                            unit, vmin, vmax, this);
+    dialog.setRange(dmin, dmax);
+
+    if (dialog.exec() == QDialog::Accepted) {
+        dialog.getRange(dmin, dmax);
+        setTopLayerDisplayExtents(dmin, dmax);
+        updateVerticalPanner();
+    }
+}
+
 bool
 Pane::editSelectionStart(QMouseEvent *e)
 {
     if (!m_identifyFeatures ||
 	!m_manager ||