tempo-plotter Changeset - d1ec2d001aae · protofusion repositories

Changeset - d1ec2d001aae

Parent rev.

Child rev.

[Not reviewed]

channelmanager

0 2 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-01-02 15:14:04
hy@ozderya.net

update symbol colors as well

2 files changed with 23 insertions and 16 deletions:

src/plot.h

src/plotmanager.cpp

0 comments (0 inline, 0 general)

src/plot.h

➞

Show inline comments

@@ @@ -28,58 +28,62 @@ @@
 #include <qwt_plot_shapeitem.h>
 #include <qwt_plot_legenditem.h>
 #include <qwt_plot_textlabel.h>
 #include "zoomer.h"
 #include "scalezoomer.h"
 #include "plotsnapshotoverlay.h"
 class Plot : public QwtPlot
+{
     Q_OBJECT
     friend class PlotManager;
 public:
     Plot(QWidget* parent = 0);
     ~Plot();
     static QColor makeColor(unsigned int channelIndex);
 private:
     bool isAutoScaled;
     double yMin, yMax;
     int symbolSize;
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     PlotSnapshotOverlay* snapshotOverlay;
     QwtPlotLegendItem legend;
     QwtPlotTextLabel demoIndicator;
     /// update the display of symbols depending on `symbolSize`
     void updateSymbols();
     void resetAxes();
     void resizeEvent(QResizeEvent * event);
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void showDemoIndicator(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     /**
      * Displays an animation for snapshot.
+     *
      * @param light show a light colored (white) animation or the opposite
      */
     void flashSnapshotOverlay(bool light);
     void onNumOfSamplesChanged(unsigned value);
 protected:
     /// update the display of symbols depending on `symbolSize`
     void updateSymbols();
 private:
     bool isAutoScaled;
     double yMin, yMax;
     int symbolSize;
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     PlotSnapshotOverlay* snapshotOverlay;
     QwtPlotLegendItem legend;
     QwtPlotTextLabel demoIndicator;
     void resetAxes();
     void resizeEvent(QResizeEvent * event);
 private slots:
     void unzoomed();
     void onXScaleChanged();
 };
 #endif // PLOT_H

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -9,24 +9,25 @@ @@
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QtDebug>
 #include "qwt_symbol.h"
 #include "plot.h"
 #include "plotmanager.h"
 #include "utils.h"
 #include "setting_defines.h"
 PlotManager::PlotManager(QWidget* plotArea, ChannelInfoModel* infoModel, QObject *parent) :
     QObject(parent),
     _plotArea(plotArea),
     showGridAction("&Grid", this),
     showMinorGridAction("&Minor Grid", this),
     unzoomAction("&Unzoom", this),
@@ @@ -124,31 +125,33 @@ void PlotManager::onChannelInfoChanged(c @@
         QString name = topLeft.sibling(ci, ChannelInfoModel::COLUMN_NAME).data(Qt::EditRole).toString();
         QColor color = topLeft.sibling(ci, ChannelInfoModel::COLUMN_NAME).data(Qt::ForegroundRole).value<QColor>();
         bool visible = topLeft.sibling(ci, ChannelInfoModel::COLUMN_VISIBILITY).data(Qt::CheckStateRole).toBool();
         curves[ci]->setTitle(name);
         curves[ci]->setPen(color);
         curves[ci]->setVisible(visible);
         // replot only updated widgets
         if (isMulti)
+        {
             plotWidgets[ci]->updateSymbols(); // required for color change
             plotWidgets[ci]->replot();
+        }
+    }
     // replot single widget
     if (!isMulti)
+    {
         plotWidgets[0]->updateSymbols();
         replot();
+    }
+}
 void PlotManager::setMulti(bool enabled)
+{
     if (enabled == isMulti) return;
     isMulti = enabled;
     // detach all curves
     for (auto curve : curves)

0 comments (0 inline, 0 general)