Mercurial > hg > svgui
comparison widgets/LEDButton.cpp @ 1478:d39db4673676 by-id
Fix a number of Qt deprecation warnings
author | Chris Cannam |
---|---|
date | Wed, 03 Jul 2019 08:55:02 +0100 |
parents | a34a2a25907c |
children |
comparison
equal
deleted
inserted
replaced
1477:0769eaacc6bf | 1478:d39db4673676 |
---|---|
47 led_state(true) | 47 led_state(true) |
48 { | 48 { |
49 QColor col(Qt::green); | 49 QColor col(Qt::green); |
50 d = new LEDButton::LEDButtonPrivate; | 50 d = new LEDButton::LEDButtonPrivate; |
51 d->dark_factor = 300; | 51 d->dark_factor = 300; |
52 d->offcolor = col.dark(300); | 52 d->offcolor = col.darker(300); |
53 | 53 |
54 setColor(col); | 54 setColor(col); |
55 } | 55 } |
56 | 56 |
57 | 57 |
59 QWidget(parent), | 59 QWidget(parent), |
60 led_state(true) | 60 led_state(true) |
61 { | 61 { |
62 d = new LEDButton::LEDButtonPrivate; | 62 d = new LEDButton::LEDButtonPrivate; |
63 d->dark_factor = 300; | 63 d->dark_factor = 300; |
64 d->offcolor = col.dark(300); | 64 d->offcolor = col.darker(300); |
65 | 65 |
66 setColor(col); | 66 setColor(col); |
67 } | 67 } |
68 | 68 |
69 LEDButton::LEDButton(const QColor& col, bool state, QWidget *parent) : | 69 LEDButton::LEDButton(const QColor& col, bool state, QWidget *parent) : |
70 QWidget(parent), | 70 QWidget(parent), |
71 led_state(state) | 71 led_state(state) |
72 { | 72 { |
73 d = new LEDButton::LEDButtonPrivate; | 73 d = new LEDButton::LEDButtonPrivate; |
74 d->dark_factor = 300; | 74 d->dark_factor = 300; |
75 d->offcolor = col.dark(300); | 75 d->offcolor = col.darker(300); |
76 | 76 |
77 setColor(col); | 77 setColor(col); |
78 } | 78 } |
79 | 79 |
80 LEDButton::~LEDButton() | 80 LEDButton::~LEDButton() |
158 // Calculate the LEDīs "light factor": | 158 // Calculate the LEDīs "light factor": |
159 int light_quote = (130*2/(light_width?light_width:1))+100; | 159 int light_quote = (130*2/(light_width?light_width:1))+100; |
160 | 160 |
161 // Now draw the bright spot on the LED: | 161 // Now draw the bright spot on the LED: |
162 while (light_width) { | 162 while (light_width) { |
163 color = color.light( light_quote ); // make color lighter | 163 color = color.lighter( light_quote ); // make color lighter |
164 pen.setColor( color ); // set color as pen color | 164 pen.setColor( color ); // set color as pen color |
165 paint.setPen( pen ); // select the pen for drawing | 165 paint.setPen( pen ); // select the pen for drawing |
166 paint.drawEllipse( pos, pos, light_width, light_width ); // draw the ellipse (circle) | 166 paint.drawEllipse( pos, pos, light_width, light_width ); // draw the ellipse (circle) |
167 light_width--; | 167 light_width--; |
168 if (!light_width) | 168 if (!light_width) |
195 pen.setColor(color); | 195 pen.setColor(color); |
196 paint.setPen(pen); | 196 paint.setPen(pen); |
197 int w = width - pen.width()/2; | 197 int w = width - pen.width()/2; |
198 paint.drawArc(pen.width()/2 + 1, pen.width()/2 + 1, w - 2, w - 2, angle + arc, 240); | 198 paint.drawArc(pen.width()/2 + 1, pen.width()/2 + 1, w - 2, w - 2, angle + arc, 240); |
199 paint.drawArc(pen.width()/2 + 1, pen.width()/2 + 1, w - 2, w - 2, angle - arc, 240); | 199 paint.drawArc(pen.width()/2 + 1, pen.width()/2 + 1, w - 2, w - 2, angle - arc, 240); |
200 color = color.dark(110); //FIXME: this should somehow use the contrast value | 200 color = color.darker(110); //FIXME: this should somehow use the contrast value |
201 } // end for ( angle = 720; angle < 6480; angle += 160 ) | 201 } // end for ( angle = 720; angle < 6480; angle += 160 ) |
202 | 202 |
203 paint.end(); | 203 paint.end(); |
204 } | 204 } |
205 | 205 |
236 void | 236 void |
237 LEDButton::setColor(const QColor& col) | 237 LEDButton::setColor(const QColor& col) |
238 { | 238 { |
239 if(led_color!=col) { | 239 if(led_color!=col) { |
240 led_color = col; | 240 led_color = col; |
241 d->offcolor = col.dark(d->dark_factor); | 241 d->offcolor = col.darker(d->dark_factor); |
242 update(); | 242 update(); |
243 } | 243 } |
244 } | 244 } |
245 | 245 |
246 void | 246 void |
247 LEDButton::setDarkFactor(int darkfactor) | 247 LEDButton::setDarkFactor(int darkfactor) |
248 { | 248 { |
249 if (d->dark_factor != darkfactor) { | 249 if (d->dark_factor != darkfactor) { |
250 d->dark_factor = darkfactor; | 250 d->dark_factor = darkfactor; |
251 d->offcolor = led_color.dark(darkfactor); | 251 d->offcolor = led_color.darker(darkfactor); |
252 update(); | 252 update(); |
253 } | 253 } |
254 } | 254 } |
255 | 255 |
256 int | 256 int |