Add 2 new graph styles: Outline, Gradient Line

ThePBone · ThePBone · commit c4c44ae82856 · 2020-03-04T20:06:45.000+01:00
diff --git a/config/appconfigwrapper.cpp b/config/appconfigwrapper.cpp
@@ -206,6 +206,14 @@ void AppConfigWrapper::setSpectrumTheme(int number){
     emit spectrumChanged();
     saveAppConfig();
 }
+int AppConfigWrapper::getSpectrumShape(){
+    return appconf->getInt("visualizer.spectrum.shape");
+}
+void AppConfigWrapper::setSpectrumShape(int number){
+    appconf->setValue("visualizer.spectrum.shape",QVariant(number));
+    emit spectrumChanged();
+    saveAppConfig();
+}
 void AppConfigWrapper::setSpectrumInput(const QString& npath){
     appconf->setValue("visualizer.spectrum.device",QVariant(npath));
     emit spectrumReloadRequired();
diff --git a/config/appconfigwrapper.h b/config/appconfigwrapper.h
@@ -90,7 +90,8 @@ class AppConfigWrapper : public QObject
     bool getIntroShown();
     QString getTrayContextMenu();
     void setTrayContextMenu(const QString &ctx);
-
+    void setSpectrumShape(int number);
+    int getSpectrumShape();
 signals:
     void spectrumChanged();
     void spectrumReloadRequired();
diff --git a/dialog/settings.ui b/dialog/settings.ui
@@ -113,7 +113,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>4</number>
+        <number>6</number>
        </property>
        <widget class="QWidget" name="general">
         <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -875,57 +875,75 @@
             <item>
              <layout class="QFormLayout" name="formLayout_4">
               <property name="horizontalSpacing">
-               <number>61</number>
+               <number>120</number>
               </property>
               <property name="leftMargin">
                <number>0</number>
               </property>
               <property name="topMargin">
                <number>0</number>
               </property>
-              <item row="0" column="0">
+              <item row="1" column="0">
                <widget class="QLabel" name="label_6">
                 <property name="text">
                  <string>Number of bands</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="1">
+              <item row="1" column="1">
                <widget class="QSpinBox" name="sa_bands">
+                <property name="maximumSize">
+                 <size>
+                  <width>120</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="suffix">
+                 <string> bands</string>
+                </property>
                 <property name="minimum">
                  <number>5</number>
                 </property>
                 <property name="maximum">
                  <number>300</number>
                 </property>
+                <property name="singleStep">
+                 <number>5</number>
+                </property>
                 <property name="value">
                  <number>50</number>
                 </property>
                </widget>
               </item>
-              <item row="1" column="0">
+              <item row="2" column="0">
                <widget class="QLabel" name="label_5">
                 <property name="text">
                  <string>Minimum frequency</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0">
+              <item row="3" column="0">
                <widget class="QLabel" name="label_7">
                 <property name="text">
                  <string>Maximum frequency</string>
                 </property>
                </widget>
               </item>
-              <item row="3" column="0">
+              <item row="4" column="0">
                <widget class="QLabel" name="label_8">
                 <property name="text">
                  <string>Audio input sink</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="1">
+              <item row="2" column="1">
                <widget class="QSpinBox" name="sa_minfreq">
+                <property name="maximumSize">
+                 <size>
+                  <width>120</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
                 <property name="suffix">
                  <string>Hz</string>
                 </property>
@@ -937,8 +955,14 @@
                 </property>
                </widget>
               </item>
-              <item row="2" column="1">
+              <item row="3" column="1">
                <widget class="QSpinBox" name="sa_maxfreq">
+                <property name="maximumSize">
+                 <size>
+                  <width>120</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
                 <property name="suffix">
                  <string>Hz</string>
                 </property>
@@ -956,7 +980,7 @@
                 </property>
                </widget>
               </item>
-              <item row="3" column="1">
+              <item row="4" column="1">
                <widget class="QComboBox" name="sa_input">
                 <property name="maximumSize">
                  <size>
@@ -966,12 +990,44 @@
                 </property>
                </widget>
               </item>
+              <item row="0" column="0">
+               <widget class="QLabel" name="label_13">
+                <property name="text">
+                 <string>Graph Type</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="sa_type">
+                <property name="maximumSize">
+                 <size>
+                  <width>120</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <item>
+                 <property name="text">
+                  <string>Bars</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Outline</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Line (gradient)</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
              </layout>
             </item>
             <item>
              <widget class="QLabel" name="label_10">
               <property name="text">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; If the selected audio source sink is unavailable, the visualizer will automatically switch to the system default input device (e.g. internal microphone). In order to reconnect to the sink you've selected above, you can use the 'Reload visualizer' option in the 3-dot menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; If the selected audio source sink is unavailable, the visualizer will automatically switch to the system default input device (e.g. internal microphone).&lt;/p&gt;&lt;p&gt;If you use the line or outline graph type, you should set the number of bands &lt;span style=&quot; font-weight:600;&quot;&gt;to at least 100&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="wordWrap">
                <bool>true</bool>
diff --git a/dialog/settingsdlg.cpp b/dialog/settingsdlg.cpp
@@ -256,7 +256,10 @@ SettingsDlg::SettingsDlg(MainWindow* mainwin,QWidget *parent) :
         if(lockslot)return;
         appconf->setSpectrumInput(str);
     });
-
+    connect(ui->sa_type,static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this, [this](const QString&){
+        if(lockslot)return;
+        appconf->setSpectrumShape(ui->sa_type->currentIndex());
+    });
     /*
      * Connect all signals for SA/Design
      */
@@ -470,6 +473,7 @@ void SettingsDlg::refreshAll(){
     ui->spectrum_theme->setEnabled(appconf->getSpetrumEnable());
     ui->spectrum_advanced->setEnabled(appconf->getSpetrumEnable());
 
+    ui->sa_type->setCurrentIndex(appconf->getSpectrumShape());
     ui->sa_bands->setValue(bands);
     ui->sa_minfreq->setValue(minfreq);
     ui->sa_maxfreq->setValue(maxfreq);
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -302,13 +302,19 @@ void MainWindow::RefreshSpectrumParameters(){
         outline = palette().window().color().lighter(140);
 
     if(m_appwrapper->getSpectrumTheme() == 0)
-        m_spectrograph->setTheme(Qt::black,QColor(51,204,201),QColor(51,204,201).darker(),QColor(255,255,0),m_appwrapper->getSpetrumGrid());
+        m_spectrograph->setTheme(Qt::black,
+                                 QColor(51,204,201),
+                                 QColor(51,204,201).darker(),
+                                 QColor(255,255,0),
+                                 m_appwrapper->getSpetrumGrid(),
+                                 (Spectrograph::Mode)m_appwrapper->getSpectrumShape());
     else
         m_spectrograph->setTheme(palette().window().color().lighter(),
                                  palette().highlight().color(),
                                  palette().text().color(),
                                  outline.lighter(108),
-                                 m_appwrapper->getSpetrumGrid());
+                                 m_appwrapper->getSpetrumGrid(),
+                                 (Spectrograph::Mode)m_appwrapper->getSpectrumShape());
 
 
 
diff --git a/misc/stylehelper.h b/misc/stylehelper.h
@@ -65,13 +65,13 @@ namespace ColorStyleProvider {
 static QMap<CS_UNIT> TABLE(){
     InitializableQMap<CS_UNIT> map;
     map << QPair<CS_UNIT>("dark",ColorStyle(true,QColor(25,25,25),QColor(53,53,53),Qt::white,QColor(42, 130, 218)))
-        << QPair<CS_UNIT>("gray",ColorStyle(true,QColor(83,83,125),QColor(49,49,74),Qt::white,QColor(85,85,127),QColor(144,144,179)))
+        << QPair<CS_UNIT>("gray",ColorStyle(true,QColor(83,83,125),QColor(49,49,74),Qt::white,QColor(151, 151, 184),QColor(144,144,179)))
         << QPair<CS_UNIT>("white",ColorStyle(false,Qt::white,Qt::white,Qt::black,QColor(56,161,227)))
         << QPair<CS_UNIT>("blue",ColorStyle(true,QColor(0,0,38),QColor(0,0,50),Qt::white,QColor(85,0,255)))
         << QPair<CS_UNIT>("darkblue",ColorStyle(true,QColor(14,19,29),QColor(19,25,38),Qt::white,QColor(70,79,89)))
         << QPair<CS_UNIT>("honeycomb",ColorStyle(false,QColor(185,188,182),QColor(212,215,208),Qt::black,QColor(243,193,41),Qt::white))
         << QPair<CS_UNIT>("black",ColorStyle(true,Qt::black,QColor(16,16,16),QColor(222,222,222),QColor(132,132,132)))
-        << QPair<CS_UNIT>("darkgreen",ColorStyle(true,QColor(30,30,30),QColor(27,34,36),QColor(197,209,217),QColor(21,67,58)))
+        << QPair<CS_UNIT>("darkgreen",ColorStyle(true,QColor(30,30,30),QColor(27,34,36),QColor(197,209,217),QColor(153, 199, 190)))
         << QPair<CS_UNIT>("green",ColorStyle(true,QColor(6,29,12),QColor(0,12,0),Qt::white,QColor(86,191,121)))
         << QPair<CS_UNIT>("stone",ColorStyle(true,QColor(27,36,40),QColor(34,45,50),Qt::white,QColor(165,206,255)));
     return std::move(map);
diff --git a/visualization/spectrograph.cpp b/visualization/spectrograph.cpp
@@ -83,13 +83,14 @@ void Spectrograph::setParams(int numBars, qreal lowFreq, qreal highFreq)
     updateBars();
 }
 
-void Spectrograph::setTheme(QColor background, QColor bar, QColor bar_max, QColor outline, bool grid)
+void Spectrograph::setTheme(QColor background, QColor bar, QColor bar_max, QColor outline, bool grid, Mode mode)
 {
     m_background = background;
     m_bar = bar;
     m_bar_max = bar_max;
     m_grid = grid;
     m_outline = outline;
+    m_mode = mode;
 }
 
 void Spectrograph::timerEvent(QTimerEvent *event)
@@ -159,12 +160,15 @@ void Spectrograph::paintEvent(QPaintEvent *event)
         }
     }
 
-    QColor m_bar_l = m_bar;
-    m_bar_l.setAlphaF(0.75);
-    m_bar_max.setAlphaF(0.75);
-
     // Draw the bars
     if (numBars) {
+        QColor m_bar_l = m_bar;
+        m_bar_l.setAlphaF(0.75);
+        m_bar_max.setAlphaF(0.75);
+
+        QPainterPath frequencyResponse;
+        painter.setRenderHint(QPainter::RenderHint::Antialiasing,true);
+
         // Calculate width of bars and gaps
         const int widgetWidth = rect().width();
         const int barPlusGapWidth = widgetWidth / numBars;
@@ -187,7 +191,30 @@ void Spectrograph::paintEvent(QPaintEvent *event)
             if (m_bars[i].clipped)
                 color = m_bar_max;
 
-            painter.fillRect(bar, color);
+            if (i == 0) frequencyResponse.moveTo(bar.topLeft().x(),
+                                                 bar.topLeft().y()+1);
+            else frequencyResponse.lineTo(bar.topLeft().x(),
+                                          bar.topLeft().y()+1);
+
+            if(m_mode == Mode::Bars)
+                painter.fillRect(bar, color);
+        }
+
+        if(m_mode == Mode::LineGradient){
+            frequencyResponse.lineTo(width(),height());
+            frequencyResponse.lineTo(0, height());
+            QColor light = m_bar_l;
+            light.setAlpha(60);
+            QLinearGradient gradient(QPoint(width(),0),QPoint(width(),height()));
+            gradient.setColorAt(0.0,m_bar_l);
+            gradient.setColorAt(1.0,light);
+            painter.setBrush(gradient);
+            painter.setPen(QPen(Qt::PenStyle::NoPen));
+            painter.drawPath(frequencyResponse);
+        }
+        if(m_mode == Mode::Line){
+            painter.setPen(QPen(QBrush(m_bar_l),1,Qt::PenStyle::SolidLine,Qt::PenCapStyle::SquareCap));
+            painter.drawPath(frequencyResponse);
         }
     }
 }
diff --git a/visualization/spectrograph.h b/visualization/spectrograph.h
@@ -63,12 +63,19 @@ class Spectrograph : public QWidget
 {
     Q_OBJECT
 
+
 public:
+    typedef enum{
+        Bars,
+        Line,
+        LineGradient
+    }Mode;
+
     explicit Spectrograph(QWidget *parent = 0);
     ~Spectrograph();
 
     void setParams(int numBars, qreal lowFreq, qreal highFreq);
-    void setTheme(QColor background=Qt::black, QColor bar=QColor(51, 204, 102), QColor bar_max=QColor(255, 255, 0), QColor outline=QColor(51, 204, 102).darker(), bool grid=true);
+    void setTheme(QColor background=Qt::black, QColor bar=QColor(51, 204, 102), QColor bar_max=QColor(255, 255, 0), QColor outline=QColor(51, 204, 102).darker(), bool grid=true, Mode mode = Mode::Bars);
 
     // QObject
     void timerEvent(QTimerEvent *event) override;
@@ -110,6 +117,7 @@ public slots:
     QColor m_bar_max    = QColor(255, 255, 0);
     QColor m_outline    = QColor(51, 204, 102).darker();
     bool m_grid = true;
+    Mode m_mode = Mode::Bars;
 };
 
 #endif // SPECTROGRAPH_H
