Merge remote-tracking branch 'hyperion-project/master' into userauthapi

This commit is contained in:
brindosch
2019-08-30 00:15:31 +02:00
19 changed files with 826 additions and 694 deletions

View File

@@ -489,9 +489,6 @@ private:
/// The specifiation of the led frame construction and picture integration
LedString _ledString;
/// specifiation of cloned leds
LedString _ledStringClone;
/// Image Processor
ImageProcessor* _imageProcessor;

View File

@@ -88,9 +88,6 @@ inline ColorOrder stringToColorOrder(const QString & order)
///
struct Led
{
/// The index of the led
unsigned index;
/// The minimum vertical scan line included for this leds color
double minX_frac;
/// The maximum vertical scan line included for this leds color
@@ -99,8 +96,6 @@ struct Led
double minY_frac;
/// The maximum horizontal scan line included for this leds color
double maxY_frac;
/// id to clone
int clone;
/// the color order
ColorOrder colorOrder;
};