Changeset - 21c0962ff02f
Parent rev.
Child rev.
[Not reviewed]
plot-manager
0 3 0
Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-28 16:18:39
hy@ozderya.net
completely removed now-old plot widget
3 files changed with 7 insertions and 27 deletions:
src/mainwindow.cpp
3
10
src/mainwindow.h
2
9
src/mainwindow.ui
2
8
0 comments (0 inline, 0 general)
src/mainwindow.cpp
➞
Show inline comments
 
@@ -41,38 +41,31 @@
 

			




	
	
	
		
 
#if defined(Q_OS_WIN) && defined(QT_STATIC)

			




	
	
	
		
 
#include <QtPlugin>

			




	
	
	
		
 
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::MainWindow(QWidget *parent) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::MainWindow),

			




	
	
	
		
 
    aboutDialog(this),

			




	
	
	
		
 
    portControl(&serialPort),

			




	
	
	
		
 
    channelMan(1, 1, this),

			




	
	
	
		
 
    snapshotMan(this, &channelMan),

			




	
	
	
		
 
    commandPanel(&serialPort),

			




	
	
	
		
 
    dataFormatPanel(&serialPort, &channelMan),

			




	
	
	
		
 
    snapshotMan(this, &channelMan)

			




	
	
	
		
 
    dataFormatPanel(&serialPort, &channelMan)

			




	
	
	
		
 
{

			




	
	
	
		
 

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 
    ui->plot->setParent(NULL);

			




	
	
	
		
 
    ui->plot->show();

			




	
	
	
		
 

			




	
	
	
		
 
    ((QVBoxLayout*) ui->centralWidget->layout())->insertWidget(0, &plotArea);

			




	
	
	
		
 
    plotMan = new PlotManager(&plotArea);

			




	
	
	
		
 

			




	
	
	
		
 
    // test code

			




	
	
	
		
 
    // plotArea.show();

			




	
	
	
		
 
    plotMan = new PlotManager(ui->plotArea);

			




	
	
	
		
 

			




	
	
	
		
 
    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->setCurrentIndex(0);

			




	
	
	
		
 
    addToolBar(portControl.toolBar());

			




	
	
	
		
 

			




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

			




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

			




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

			




	
	
	
		
 
    connect(commandPanel.newCommandAction(), &QAction::triggered, [this]()

			




        

    


    
    

    

        

                

                    src/mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -61,42 +61,35 @@ public:

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::MainWindow *ui;

			




	
	
	
		
 

			




	
	
	
		
 
    QDialog aboutDialog;

			




	
	
	
		
 
    void setupAboutDialog();

			




	
	
	
		
 

			




	
	
	
		
 
    QSerialPort serialPort;

			




	
	
	
		
 
    PortControl portControl;

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned int numOfSamples;

			




	
	
	
		
 

			




	
	
	
		
 
    QList<QwtPlotCurve*> curves;

			




	
	
	
		
 
    // Note: FrameBuffer s are owned by their respective QwtPlotCurve s.

			




	
	
	
		
 
    // QList<FrameBuffer*> channelBuffers;

			




	
	
	
		
 
    ChannelManager channelMan;

			




	
	
	
		
 
    PlotManager* plotMan;

			




	
	
	
		
 
    SnapshotManager snapshotMan;

			




	
	
	
		
 

			




	
	
	
		
 
    QLabel spsLabel;

			




	
	
	
		
 

			




	
	
	
		
 
    CommandPanel commandPanel;

			




	
	
	
		
 
    DataFormatPanel dataFormatPanel;

			




	
	
	
		
 
    PlotControlPanel plotControlPanel;

			




	
	
	
		
 

			




	
	
	
		
 
    SnapshotManager snapshotMan;

			




	
	
	
		
 

			




	
	
	
		
 
    bool isDemoRunning();

			




	
	
	
		
 

			




	
	
	
		
 
    // test widget

			




	
	
	
		
 
    QWidget plotArea;

			




	
	
	
		
 
    PlotManager* plotMan;

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void onPortToggled(bool open);

			




	
	
	
		
 
    void onPortError(QSerialPort::SerialPortError error);

			




	
	
	
		
 

			




	
	
	
		
 
    void onNumOfSamplesChanged(int value);

			




	
	
	
		
 
    void onNumOfChannelsChanged(unsigned value);

			




	
	
	
		
 
    void onChannelNameChanged(unsigned channel, QString name);

			




	
	
	
		
 

			




	
	
	
		
 
    void clearPlot();

			




	
	
	
		
 

			




	
	
	
		
 
    void onSpsChanged(unsigned sps);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/mainwindow.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,25 +7,25 @@

			




	
	
	
		
 
    <x>0</x>

			




	
	
	
		
 
    <y>0</y>

			




	
	
	
		
 
    <width>653</width>

			




	
	
	
		
 
    <height>650</height>

			




	
	
	
		
 
   </rect>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>SerialPlot</string>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <widget class="QWidget" name="centralWidget">

			




	
	
	
		
 
   <layout class="QVBoxLayout" name="verticalLayout_2">

			




	
	
	
		
 
    <item>

			




	
	
	
		
 
     <widget class="Plot" name="plot" native="true">

			




	
	
	
		
 
     <widget class="QWidget" name="plotArea" native="true">

			




	
	
	
		
 
      <property name="sizePolicy">

			




	
	
	
		
 
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">

			




	
	
	
		
 
        <horstretch>0</horstretch>

			




	
	
	
		
 
        <verstretch>0</verstretch>

			




	
	
	
		
 
       </sizepolicy>

			




	
	
	
		
 
      </property>

			




	
	
	
		
 
     </widget>

			




	
	
	
		
 
    </item>

			




	
	
	
		
 
    <item>

			




	
	
	
		
 
     <widget class="HidableTabWidget" name="tabWidget">

			




	
	
	
		
 
      <property name="sizePolicy">

			




	
	
	
		
 
       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">

			




	
	
		
 
@@ -81,25 +81,25 @@

			




	
	
	
		
 
       </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>27</height>

			




	
	
	
		
 
     <height>20</height>

			




	
	
	
		
 
    </rect>

			




	
	
	
		
 
   </property>

			




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

			




	
	
	
		
 
    <property name="title">

			




	
	
	
		
 
     <string>Help</string>

			




	
	
	
		
 
    </property>

			




	
	
	
		
 
    <addaction name="actionDemoMode"/>

			




	
	
	
		
 
    <addaction name="actionReportBug"/>

			




	
	
	
		
 
    <addaction name="actionHelpAbout"/>

			




	
	
	
		
 
   </widget>

			




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

			




	
	
	
		
 
    <property name="title">

			




	
	
		
 
@@ -192,27 +192,21 @@

			




	
	
	
		
 
  <action name="actionReportBug">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Report a Bug</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




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

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
 </widget>

			




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

			




	
	
	
		
 
 <customwidgets>

			




	
	
	
		
 
  <customwidget>

			




	
	
	
		
 
   <class>Plot</class>

			




	
	
	
		
 
   <extends>QWidget</extends>

			




	
	
	
		
 
   <header>plot.h</header>

			




	
	
	
		
 
   <container>1</container>

			




	
	
	
		
 
  </customwidget>

			




	
	
	
		
 
  <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