tempo-plotter Changeset - 1ab619914658 · protofusion repositories

Changeset - 1ab619914658

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 3 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-20 18:09:27
hy@ozderya.net

removed snapshot view toolbar

3 files changed with 3 insertions and 13 deletions:

snapshotmanager.cpp

snapshotview.cpp

snapshotview.ui

0 comments (0 inline, 0 general)

snapshotmanager.cpp

➞

Show inline comments

@@ @@ -65,37 +65,38 @@ void SnapshotManager::updateMenu() @@
     if (snapshots.size())
+    {
         _menu.addSeparator();
         for (auto ss : snapshots)
+        {
             _menu.addAction(ss->showAction());
+        }
         _menu.addSeparator();
         _menu.addAction(&clearAction);
+    }
+}
 void SnapshotManager::clearSnapshots()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
     snapshots.clear();
     updateMenu();
+}
 void SnapshotManager::deleteSnapshot(SnapShot* snapshot)
+{
     delete snapshots.takeAt(snapshots.indexOf(snapshot));
     snapshots.removeOne(snapshot);
     snapshot->deleteLater(); // regular delete causes a crash when triggered from menu
     updateMenu();
+}
 QMenu* SnapshotManager::menu()
+{
     return &_menu;
+}
 QAction* SnapshotManager::takeSnapshotAction()
+{
     return &_takeSnapshotAction;
+}

snapshotview.cpp

➞

Show inline comments

 #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);
-    ui->toolBar->addAction(snapShot->deleteAction());
+    ui->menuSnapshot->addAction(snapShot->deleteAction());
     this->setWindowTitle(snapShot->name());
     unsigned numOfChannels = snapShot->data.size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         QwtPlotCurve* curve = new QwtPlotCurve();
         curves.append(curve);
         curve->setSamples(snapShot->data[ci]);
         curve->setPen(Plot::makeColor(ci));
         curve->attach(ui->plot);
+    }
     renameDialog.setWindowTitle("Rename Snapshot");
     renameDialog.setLabelText("Enter new name:");
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapShotView::showRenameDialog);
+}
 SnapShotView::~SnapShotView()
+{
     for (auto curve : curves)
+    {
         delete curve;

snapshotview.ui

➞

Show inline comments

@@ @@ -23,59 +23,48 @@ @@
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>544</width>
      <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSnapshot">
     <property name="title">
      <string>Snapshot</string>
     </property>
     <addaction name="actionRename"/>
     <addaction name="actionExportCSV"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
      <string>View</string>
     </property>
    </widget>
    <addaction name="menuSnapshot"/>
    <addaction name="menuView"/>
   </widget>
   <widget class="QToolBar" name="toolBar">
    <property name="windowTitle">
     <string>toolBar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
   </widget>
   <action name="actionExportCSV">
    <property name="text">
     <string>Export CSV</string>
    </property>
   </action>
   <action name="actionRename">
    <property name="text">
     <string>Rename</string>
    </property>
    <property name="toolTip">
     <string>Rename this snapshot</string>
    </property>
   </action>
  </widget>
  <customwidgets>
   <customwidget>
    <class>Plot</class>
    <extends>QWidget</extends>
    <header>plot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

0 comments (0 inline, 0 general)