Changeset - 5a5543df77a6
Parent rev.
Child rev.
[Not reviewed]
barplot
0 2 0
Hasan Yavuz ÖZDERYA - 8 years ago 2017-10-27 09:25:31
hy@ozderya.net
secondary plot orientation menu options
2 files changed with 21 insertions and 1 deletions:
src/mainwindow.cpp
17
src/mainwindow.ui
4
1
0 comments (0 inline, 0 general)
src/mainwindow.cpp
➞
Show inline comments
 
@@ -59,102 +59,119 @@ MainWindow::MainWindow(QWidget *parent)
 
    QMainWindow(parent),
 
    ui(new Ui::MainWindow),
 
    aboutDialog(this),
 
    portControl(&serialPort),
 
    channelMan(1, 1, this),
 
    secondaryPlot(NULL),
 
    snapshotMan(this, &channelMan),
 
    commandPanel(&serialPort),
 
    dataFormatPanel(&serialPort, &channelMan, &recorder),
 
    recordPanel(&recorder, &channelMan),
 
    updateCheckDialog(this)
 
{
 
    ui->setupUi(this);
 

			




	
	
	
		
 
    plotMan = new PlotManager(ui->plotArea, &plotMenu, channelMan.infoModel());

			




	
	
	
		
 

			




	
	
	
		
 
    ui->tabWidget->insertTab(0, &portControl, "Port");

			




	
	
	
		
 
    ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");

			




	
	
	
		
 
    ui->tabWidget->insertTab(2, &plotControlPanel, "Plot");

			




	
	
	
		
 
    ui->tabWidget->insertTab(3, &commandPanel, "Commands");

			




	
	
	
		
 
    ui->tabWidget->insertTab(4, &recordPanel, "Record");

			




	
	
	
		
 
    ui->tabWidget->setCurrentIndex(0);

			




	
	
	
		
 
    auto tbPortControl = portControl.toolBar();

			




	
	
	
		
 
    addToolBar(tbPortControl);

			




	
	
	
		
 
    addToolBar(recordPanel.toolbar());

			




	
	
	
		
 

			




	
	
	
		
 
    ui->plotToolBar->addAction(snapshotMan.takeSnapshotAction());

			




	
	
	
		
 
    menuBar()->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());

			




	
	
	
		
 
    menuBar()->insertMenu(ui->menuHelp->menuAction(), commandPanel.menu());

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&commandPanel, &CommandPanel::focusRequested, [this]()

			




	
	
	
		
 
            {

			




	
	
	
		
 
                this->ui->tabWidget->setCurrentWidget(&commandPanel);

			




	
	
	
		
 
                this->ui->tabWidget->showTabs();

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    tbPortControl->setObjectName("tbPortControl");

			




	
	
	
		
 
    ui->plotToolBar->setObjectName("tbPlot");

			




	
	
	
		
 

			




	
	
	
		
 
    setupAboutDialog();

			




	
	
	
		
 

			




	
	
	
		
 
    // init view menu

			




	
	
	
		
 
    ui->menuBar->insertMenu(ui->menuSecondary->menuAction(), &plotMenu);

			




	
	
	
		
 
    plotMenu.addSeparator();

			




	
	
	
		
 
    QMenu* tbMenu = plotMenu.addMenu("Toolbars");

			




	
	
	
		
 
    tbMenu->addAction(ui->plotToolBar->toggleViewAction());

			




	
	
	
		
 
    tbMenu->addAction(portControl.toolBar()->toggleViewAction());

			




	
	
	
		
 

			




	
	
	
		
 
    // init secondary plot menu

			




	
	
	
		
 
    auto group = new QActionGroup(this);

			




	
	
	
		
 
    group->addAction(ui->actionVertical);

			




	
	
	
		
 
    group->addAction(ui->actionHorizontal);

			




	
	
	
		
 

			




	
	
	
		
 
    // init UI signals

			




	
	
	
		
 

			




	
	
	
		
 
    // Secondary plot menu signals

			




	
	
	
		
 
    connect(ui->actionBarPlot, &QAction::triggered,

			




	
	
	
		
 
            this, &MainWindow::showBarPlot);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->actionVertical, &QAction::triggered,

			




	
	
	
		
 
            [this](bool checked)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                if (checked) ui->splitter->setOrientation(Qt::Vertical);

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->actionHorizontal, &QAction::triggered,

			




	
	
	
		
 
            [this](bool checked)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                if (checked) ui->splitter->setOrientation(Qt::Horizontal);

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    // Help menu signals

			




	
	
	
		
 
    QObject::connect(ui->actionHelpAbout, &QAction::triggered,

			




	
	
	
		
 
              &aboutDialog, &QWidget::show);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionCheckUpdate, &QAction::triggered,

			




	
	
	
		
 
              &updateCheckDialog, &QWidget::show);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionReportBug, &QAction::triggered,

			




	
	
	
		
 
                     [](){QDesktopServices::openUrl(QUrl(BUG_REPORT_URL));});

			




	
	
	
		
 

			




	
	
	
		
 
    // File menu signals

			




	
	
	
		
 
    QObject::connect(ui->actionExportCsv, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::onExportCsv);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionSaveSettings, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::onSaveSettings);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionLoadSettings, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::onLoadSettings);

			




	
	
	
		
 

			




	
	
	
		
 
    ui->actionQuit->setShortcutContext(Qt::ApplicationShortcut);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionQuit, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::close);

			




	
	
	
		
 

			




	
	
	
		
 
    // port control signals

			




	
	
	
		
 
    QObject::connect(&portControl, &PortControl::portToggled,

			




	
	
	
		
 
                     this, &MainWindow::onPortToggled);

			




	
	
	
		
 

			




	
	
	
		
 
    // plot control signals

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,

			




	
	
	
		
 
            this, &MainWindow::onNumOfSamplesChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,

			




	
	
	
		
 
            plotMan, &PlotManager::setNumOfSamples);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::yScaleChanged,

			




	
	
	
		
 
            plotMan, &PlotManager::setYAxis);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::xScaleChanged,

			




	
	
	
		
 
            plotMan, &PlotManager::setXAxis);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::plotWidthChanged,

			




	
	
	
		
 
            plotMan, &PlotManager::setPlotWidth);

			




	
	
	
		
 

			




	
	
	
		
 
    // plot toolbar signals

			




	
	
	
		
 
    QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),

			




	
	
	
		
 
                     this, SLOT(clearPlot()));

			




        

    


    
    

    

        

                

                    src/mainwindow.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -84,98 +84,98 @@

			




	
	
	
		
 
        </property>

			




	
	
	
		
 
        <item>

			




	
	
	
		
 
         <widget class="QPlainTextEdit" name="ptLog">

			




	
	
	
		
 
          <property name="readOnly">

			




	
	
	
		
 
           <bool>true</bool>

			




	
	
	
		
 
          </property>

			




	
	
	
		
 
         </widget>

			




	
	
	
		
 
        </item>

			




	
	
	
		
 
       </layout>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </widget>

			




	
	
	
		
 
    </item>

			




	
	
	
		
 
   </layout>

			




	
	
	
		
 
  </widget>

			




	
	
	
		
 
  <widget class="QMenuBar" name="menuBar">

			




	
	
	
		
 
   <property name="geometry">

			




	
	
	
		
 
    <rect>

			




	
	
	
		
 
     <x>0</x>

			




	
	
	
		
 
     <y>0</y>

			




	
	
	
		
 
     <width>653</width>

			




	
	
	
		
 
     <height>24</height>

			




	
	
	
		
 
    </rect>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <widget class="QMenu" name="menuHelp">

			




	
	
	
		
 
    <property name="title">

			




	
	
	
		
 
     <string>&amp;Help</string>

			




	
	
	
		
 
    </property>

			




	
	
	
		
 
    <addaction name="actionDemoMode"/>

			




	
	
	
		
 
    <addaction name="actionReportBug"/>

			




	
	
	
		
 
    <addaction name="actionCheckUpdate"/>

			




	
	
	
		
 
    <addaction name="actionHelpAbout"/>

			




	
	
	
		
 
   </widget>

			




	
	
	
		
 
   <widget class="QMenu" name="menuFile">

			




	
	
	
		
 
    <property name="title">

			




	
	
	
		
 
     <string>&amp;File</string>

			




	
	
	
		
 
    </property>

			




	
	
	
		
 
    <addaction name="actionSaveSettings"/>

			




	
	
	
		
 
    <addaction name="actionLoadSettings"/>

			




	
	
	
		
 
    <addaction name="actionExportCsv"/>

			




	
	
	
		
 
    <addaction name="separator"/>

			




	
	
	
		
 
    <addaction name="actionQuit"/>

			




	
	
	
		
 
   </widget>

			




	
	
	
		
 
   <widget class="QMenu" name="menuSecondary">

			




	
	
	
		
 
    <property name="title">

			




	
	
	
		
 
     <string>Secondary</string>

			




	
	
	
		
 
    </property>

			




	
	
	
		
 
    <addaction name="actionBarPlot"/>

			




	
	
	
		
 
    <addaction name="separator"/>

			




	
	
	
		
 
    <addaction name="actionHorizontal"/>

			




	
	
	
		
 
    <addaction name="actionVertical"/>

			




	
	
	
		
 
    <addaction name="actionHorizontal"/>

			




	
	
	
		
 
   </widget>

			




	
	
	
		
 
   <addaction name="menuFile"/>

			




	
	
	
		
 
   <addaction name="menuSecondary"/>

			




	
	
	
		
 
   <addaction name="menuHelp"/>

			




	
	
	
		
 
  </widget>

			




	
	
	
		
 
  <widget class="QToolBar" name="plotToolBar">

			




	
	
	
		
 
   <property name="windowTitle">

			




	
	
	
		
 
    <string>Plot Toolbar</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <attribute name="toolBarArea">

			




	
	
	
		
 
    <enum>TopToolBarArea</enum>

			




	
	
	
		
 
   </attribute>

			




	
	
	
		
 
   <attribute name="toolBarBreak">

			




	
	
	
		
 
    <bool>false</bool>

			




	
	
	
		
 
   </attribute>

			




	
	
	
		
 
   <addaction name="actionPause"/>

			




	
	
	
		
 
   <addaction name="actionClear"/>

			




	
	
	
		
 
  </widget>

			




	
	
	
		
 
  <widget class="QStatusBar" name="statusBar"/>

			




	
	
	
		
 
  <action name="actionPause">

			




	
	
	
		
 
   <property name="checkable">

			




	
	
	
		
 
    <bool>true</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="checked">

			




	
	
	
		
 
    <bool>false</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="icon">

			




	
	
	
		
 
    <iconset theme="player_pause">

			




	
	
	
		
 
     <normaloff>.</normaloff>.</iconset>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Pause</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Pause Plotting</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="shortcut">

			




	
	
	
		
 
    <string>P</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionClear">

			




	
	
	
		
 
   <property name="icon">

			




	
	
	
		
 
    <iconset theme="editclear">

			




	
	
	
		
 
     <normaloff>.</normaloff>.</iconset>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Clear</string>

			




	
	
	
		
 
   </property>

			




	
	
		
 
@@ -219,65 +219,68 @@

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>&amp;Report a Bug</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Report a Bug on SerialPlot Website</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionSaveSettings">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>&amp;Save Settings</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Save Settings to a File</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionLoadSettings">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>&amp;Load Settings</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Load Settings from a File</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionCheckUpdate">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>&amp;Check Update</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionBarPlot">

			




	
	
	
		
 
   <property name="checkable">

			




	
	
	
		
 
    <bool>true</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Bar Plot</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionVertical">

			




	
	
	
		
 
   <property name="checkable">

			




	
	
	
		
 
    <bool>true</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Vertical</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionHorizontal">

			




	
	
	
		
 
   <property name="checkable">

			




	
	
	
		
 
    <bool>true</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="checked">

			




	
	
	
		
 
    <bool>true</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Horizontal</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
 </widget>

			




	
	
	
		
 
 <layoutdefault spacing="6" margin="11"/>

			




	
	
	
		
 
 <customwidgets>

			




	
	
	
		
 
  <customwidget>

			




	
	
	
		
 
   <class>HidableTabWidget</class>

			




	
	
	
		
 
   <extends>QTabWidget</extends>

			




	
	
	
		
 
   <header>hidabletabwidget.h</header>

			




	
	
	
		
 
   <container>1</container>

			




	
	
	
		
 
  </customwidget>

			




	
	
	
		
 
 </customwidgets>

			




	
	
	
		
 
 <resources/>

			




	
	
	
		
 
 <connections/>

			




	
	
	
		
 
</ui>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-13856
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support