Changeset - 11e2033df414
[Not reviewed]
default
0 3 0
Hasan Yavuz Ă–ZDERYA - 10 years ago 2016-03-20 12:15:46
hy@ozderya.net
added a simple legend
3 files changed with 5 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/mainwindow.cpp
Show inline comments
 
@@ -148,25 +148,25 @@ MainWindow::MainWindow(QWidget *parent) 
 
    numOfSamples = ui->spNumOfSamples->value();
 
    unsigned numOfChannels = dataFormatPanel.numOfChannels();
 

	
 
    QObject::connect(&dataFormatPanel,
 
                     &DataFormatPanel::numOfChannelsChanged,
 
                     this,
 
                     &MainWindow::onNumOfChannelsChanged);
 

	
 
    // init channel data and curve list
 
    for (unsigned int i = 0; i < numOfChannels; i++)
 
    {
 
        channelBuffers.append(new FrameBuffer(numOfSamples));
 
        curves.append(new QwtPlotCurve());
 
        curves.append(new QwtPlotCurve(QString("Channel %1").arg(i+1)));
 
        curves[i]->setSamples(channelBuffers[i]);
 
        curves[i]->setPen(Plot::makeColor(i));
 
        curves[i]->attach(ui->plot);
 
    }
 

	
 
    // init auto scale
 
    ui->plot->setAxis(ui->cbAutoScale->isChecked(),
 
                      ui->spYmin->value(), ui->spYmax->value());
 

	
 
    // init scale range preset list
 
    for (int nbits = 8; nbits <= 24; nbits++) // signed binary formats
 
    {
 
@@ -335,25 +335,25 @@ void MainWindow::onNumOfSamplesChanged(i
 

	
 
void MainWindow::onNumOfChannelsChanged(unsigned value)
 
{
 
    unsigned int oldNum = channelBuffers.size();
 
    unsigned numOfChannels = value;
 

	
 
    if (numOfChannels > oldNum)
 
    {
 
        // add new channels
 
        for (unsigned int i = 0; i < numOfChannels - oldNum; i++)
 
        {
 
            channelBuffers.append(new FrameBuffer(numOfSamples));
 
            curves.append(new QwtPlotCurve());
 
            curves.append(new QwtPlotCurve(QString("Channel %1").arg(oldNum+i+1)));
 
            curves.last()->setSamples(channelBuffers.last());
 
            curves.last()->setPen(Plot::makeColor(curves.length()-1));
 
            curves.last()->attach(ui->plot);
 
        }
 
    }
 
    else if(numOfChannels < oldNum)
 
    {
 
        // remove channels
 
        for (unsigned int i = 0; i < oldNum - numOfChannels; i++)
 
        {
 
            // also deletes owned FrameBuffer
 
            delete curves.takeLast();
src/plot.cpp
Show inline comments
 
@@ -30,24 +30,25 @@ Plot::Plot(QWidget* parent) :
 
    sZoomer(this, &zoomer),
 
    _showGridAction("Grid", this),
 
    _showMinorGridAction("Minor Grid", this),
 
    _unzoomAction("Unzoom", this),
 
    _darkBackgroundAction("Dark Background", this)
 
{
 
    isAutoScaled = true;
 

	
 
    QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
 

	
 
    zoomer.setZoomBase();
 
    grid.attach(this);
 
    legend.attach(this);
 

	
 
    showGrid(false);
 
    darkBackground(false);
 

	
 
    _showGridAction.setToolTip("Show Grid");
 
    _showMinorGridAction.setToolTip("Show Minor Grid");
 
    _unzoomAction.setToolTip("Unzoom the Plot");
 
    _darkBackgroundAction.setToolTip("Enable Dark Plot Background");
 

	
 
    _showGridAction.setShortcut(QKeySequence("G"));
 
    _showMinorGridAction.setShortcut(QKeySequence("M"));
 

	
src/plot.h
Show inline comments
 
@@ -17,24 +17,25 @@
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 
*/
 

	
 
#ifndef PLOT_H
 
#define PLOT_H
 

	
 
#include <QColor>
 
#include <QList>
 
#include <QAction>
 
#include <qwt_plot.h>
 
#include <qwt_plot_grid.h>
 
#include <qwt_plot_shapeitem.h>
 
#include <qwt_plot_legenditem.h>
 

	
 
#include "zoomer.h"
 
#include "scalezoomer.h"
 
#include "plotsnapshotoverlay.h"
 

	
 
class Plot : public QwtPlot
 
{
 
    Q_OBJECT
 

	
 
public:
 
    Plot(QWidget* parent = 0);
 
    ~Plot();
 
@@ -42,24 +43,25 @@ public:
 

	
 
    QList<QAction*> menuActions();
 

	
 
    static QColor makeColor(unsigned int channelIndex);
 

	
 
private:
 
    bool isAutoScaled;
 
    double yMin, yMax;
 
    Zoomer zoomer;
 
    ScaleZoomer sZoomer;
 
    QwtPlotGrid grid;
 
    PlotSnapshotOverlay* snapshotOverlay;
 
    QwtPlotLegendItem legend;
 

	
 
    QAction _showGridAction;
 
    QAction _showMinorGridAction;
 
    QAction _unzoomAction;
 
    QAction _darkBackgroundAction;
 

	
 
    void resetAxes();
 

	
 
public slots:
 
    void showGrid(bool show = true);
 
    void showMinorGrid(bool show = true);
 
    void unzoom();
0 comments (0 inline, 0 general)