tempo-plotter Changeset - 08b87927957a · protofusion repositories

Changeset - 08b87927957a

Parent rev.

Child rev.

[Not reviewed]

channelmanager

0 4 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-01-29 13:55:27
hy@ozderya.net

get channel colors from infomodel

4 files changed with 10 insertions and 2 deletions:

src/plotmanager.cpp

src/snapshot.cpp

src/snapshot.h

src/snapshotview.cpp

0 comments (0 inline, 0 general)

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -255,49 +255,51 @@ Plot* PlotManager::addPlotWidget() @@
     return plot;
+}
 void PlotManager::addCurve(QString title, FrameBuffer* buffer)
+{
     auto curve = new QwtPlotCurve(title);
     curve->setSamples(new FrameBufferSeries(buffer));
     _addCurve(curve);
+}
 void PlotManager::addCurve(QString title, QVector<QPointF> data)
+{
     auto curve = new QwtPlotCurve(title);
     curve->setSamples(data);
     _addCurve(curve);
+}
 void PlotManager::_addCurve(QwtPlotCurve* curve)
+{
     // store and init the curve
     curves.append(curve);
     unsigned index = curves.size()-1;
     curve->setPen(Plot::makeColor(index));
     auto color = _infoModel->index(index, ChannelInfoModel::COLUMN_NAME)\
         .data(Qt::ForegroundRole).value<QColor>();
     curve->setPen(color);
     // create the plot for the curve if we are on multi display
     Plot* plot;
     if (isMulti)
+    {
         // create a new plot widget
         plot = addPlotWidget();
+    }
     else
+    {
         plot = plotWidgets[0];
+    }
     // show the curve
     curve->attach(plot);
     plot->replot();
+}
 void PlotManager::removeCurves(unsigned number)
+{
     for (unsigned i = 0; i < number; i++)
+    {
         if (!curves.isEmpty())
+        {

src/snapshot.cpp

➞

Show inline comments

@@ @@ -86,48 +86,53 @@ void Snapshot::onDeleteTriggered() @@
 QString Snapshot::name()
+{
     return _name;
+}
 QString Snapshot::displayName()
+{
     if (_saved)
+    {
         return name();
+    }
     else
+    {
         return name() + "*";
+    }
+}
 void Snapshot::setName(QString name)
+{
     _name = name;
     _showAction.setText(_name);
     emit nameChanged(this);
+}
 ChannelInfoModel* Snapshot::infoModel()
+{
     return &cInfoModel;
+}
 QString Snapshot::channelName(unsigned channel)
+{
     return cInfoModel.data(cInfoModel.index(channel, ChannelInfoModel::COLUMN_NAME),
                            Qt::DisplayRole).toString();
+}
 void Snapshot::save(QString fileName)
+{
     // TODO: remove code duplication (MainWindow::onExportCsv)
     QSaveFile file(fileName);
     if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
         QTextStream fileStream(&file);
         unsigned numOfChannels = data.size();
         unsigned numOfSamples = data[0].size();
         // print header
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             fileStream << channelName(ci);
             if (ci != numOfChannels-1) fileStream << ",";
+        }

src/snapshot.h

➞

Show inline comments

@@ @@ -24,48 +24,49 @@ @@
 #include <QMainWindow>
 #include <QAction>
 #include <QVector>
 #include <QString>
 #include <QStringList>
 #include "channelinfomodel.h"
 class SnapshotView;
 class Snapshot : public QObject
+{
     Q_OBJECT
 public:
     Snapshot(QMainWindow* parent, QString name, ChannelInfoModel infoModel);
     ~Snapshot();
     QVector<QVector<QPointF>> data;
     QAction* showAction();
     QAction* deleteAction();
     QString name();
     QString displayName(); ///< `name()` plus '*' if snapshot is not saved
     ChannelInfoModel* infoModel();
     void setName(QString name);
     QString channelName(unsigned channel);
     void save(QString fileName); ///< save snapshot data as CSV
     bool isSaved(); ///< snapshot has been saved at least once
 signals:
     void deleteRequested(Snapshot*);
     void nameChanged(Snapshot*);
 private:
     QString _name;
     ChannelInfoModel cInfoModel;
     QAction _showAction;
     QAction _deleteAction;
     QMainWindow* mainWindow;
     SnapshotView* view;
     bool _saved;
 private slots:
     void show();
     void viewClosed();
     void onDeleteTriggered();

src/snapshotview.cpp

➞

Show inline comments

@@ @@ -8,49 +8,49 @@ @@
   the Free Software Foundation, either version 3 of the License, or
   (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 "snapshotview.h"
 #include "ui_snapshotview.h"
 SnapshotView::SnapshotView(QWidget *parent, Snapshot* snapshot) :
     QMainWindow(parent),
     ui(new Ui::SnapshotView),
     renameDialog(this)
+{
     _snapshot = snapshot;
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea);
+    plotMan = new PlotManager(ui->plotArea, snapshot->infoModel());
     ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());
     this->setWindowTitle(snapshot->displayName());
     // initialize curves
     unsigned numOfChannels = snapshot->data.size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         plotMan->addCurve(snapshot->channelName(ci), snapshot->data[ci]);
+    }
     renameDialog.setWindowTitle("Rename Snapshot");
     renameDialog.setLabelText("Enter new name:");
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapshotView::showRenameDialog);
     connect(ui->actionExport, &QAction::triggered,
             this, &SnapshotView::save);
     // add 'View' menu items
     for (auto a : plotMan->menuActions())
+    {
         ui->menuView->addAction(a);
+    }

0 comments (0 inline, 0 general)