comparison widgets/LEDButton.cpp @ 33:651e4e868bcc

* Implement play mute, level and pan controls and a layer visibility control
* Handle swapping the buffers in AudioCallbackPlaySource more gracefully, so
  that in many cases it can be done inaudibly.  Still gets it wrong when
  playing in a noncontiguous selection.
* Fix to SV file save for non-2d sparse models
* Fixes to LED button drawing and AudioDial mouse functionality
* Add progress bar for Ogg file import
* Reshuffle PropertyContainer and its subclasses so it can be a QObject
* Add layer dormancy (invisible layer permitted to free its cache space)
* Optimisations to SpectrogramLayer, removing locks when reading/writing
  individual pixels in the cache (should be unnecessary there) -- there's
  still an issue here as we need a lock when reading from the model in
  case the model is replaced, and we don't currently have one
* Several munlock() calls to make it harder to exhaust real memory if
  running in an RT mode with mlockall() active

 #include "LEDButton.h"
 
 #include <QPainter>
 #include <QImage>
 #include <QColor>
+#include <QMouseEvent>
 
 
 class LEDButton::LEDButtonPrivate
 {
     friend class LEDButton;

 LEDButton::~LEDButton()
 {
     delete d->off_map;
     delete d->on_map;
     delete d;
+}
+
+void
+LEDButton::mousePressEvent(QMouseEvent *e)
+{
+    if (e->buttons() & Qt::LeftButton) {
+	toggle();
+	emit stateChanged(state());
+    }
 }
 
 void
 LEDButton::paintEvent(QPaintEvent *)
 {

 		paint.end();
 		return;
 	    }
 	}
 
-	scale = 3;
+	scale = 1;
 	width *= scale;
 
 	tmpMap = new QPixmap(width, width);
 	tmpMap->fill(palette().background().color());
 	paint.begin(tmpMap);
 
     } else {
 	paint.begin(this);
     }
 
-    paint.setRenderHint(QPainter::Antialiasing, false);
+    paint.setRenderHint(QPainter::Antialiasing, true);
 
     // Set the color of the LED according to given parameters
     color = (led_state) ? led_color : d->offcolor;
 
     // Set the brush to SolidPattern, this fills the entire area

 
     // Drawing of bright spot finished, now draw a thin border
     // around the LED which resembles a shadow with light coming
     // from the upper left.
 
-    pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs?
+//    pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs?
+    pen.setWidth(2 * scale);
     brush.setStyle(Qt::NoBrush);
     paint.setBrush(brush); // This avoids filling of the ellipse
 
     // Set the initial color value to colorGroup().light() (bright) and start
     // drawing the shadow border at 45° (45*16 = 720).

     
     for (int arc = 120; arc < 2880; arc += 240) {
 	pen.setColor(color);
 	paint.setPen(pen);
 	int w = width - pen.width()/2 - scale + 1;
-	paint.drawArc(pen.width()/2, pen.width()/2, w, w, angle + arc, 240);
-	paint.drawArc(pen.width()/2, pen.width()/2, w, w, angle - arc, 240);
+	paint.drawArc(pen.width()/2 + 1, pen.width()/2 + 1, w - 2, w - 2, angle + arc, 240);
+	paint.drawArc(pen.width()/2 + 1, pen.width()/2 + 1, w - 2, w - 2, angle - arc, 240);
 	color = color.dark(110); //FIXME: this should somehow use the contrast value
     }	// end for ( angle = 720; angle < 6480; angle += 160 )
 
     paint.end();
     //
     // painting done
 
     if (smooth) {
 	QPixmap *&dest = led_state ? d->on_map : d->off_map;
 	QImage i = tmpMap->toImage();
-	width /= 3;
-	i = i.scaled(width, width, 
-		     Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+	width /= scale;
 	delete tmpMap;
-	dest = new QPixmap(QPixmap::fromImage(i));
+	dest = new QPixmap(QPixmap::fromImage
+			   (i.scaled(width, width, 
+				     Qt::KeepAspectRatio,
+				     Qt::SmoothTransformation)));
 	paint.begin(this);
 	paint.drawPixmap(0, 0, *dest);
 	paint.end();
     }
 }

 }
 
 QSize
 LEDButton::sizeHint() const
 {
-    return QSize(16, 16);
+    return QSize(17, 17);
 }
 
 QSize
 LEDButton::minimumSizeHint() const
 {
-    return QSize(16, 16 );
-}
-
+    return QSize(17, 17);
+}
+