Changeset - e81770084e42
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-27 11:59:19
hy@ozderya.net
don't greet the user with command panel
1 file changed with 8 insertions and 4 deletions:
src/mainwindow.cpp
8
4
0 comments (0 inline, 0 general)
src/mainwindow.cpp
➞
Show inline comments
 
@@ -58,52 +58,48 @@ 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)
 
{
 
    ui->setupUi(this);
 

			




	
	
	
		
 
    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);

			




	
	
	
		
 
    auto tbPortControl = portControl.toolBar();

			




	
	
	
		
 
    addToolBar(tbPortControl);

			




	
	
	
		
 

			




	
	
	
		
 
    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]()

			




	
	
	
		
 
            {

			




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

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            {

			




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

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    tbPortControl->setObjectName("tbPortControl");

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    setupAboutDialog();

			




	
	
	
		
 

			




	
	
	
		
 
    // init view menu

			




	
	
	
		
 
    for (auto a : plotMan->menuActions())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        ui->menuView->addAction(a);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    ui->menuView->addSeparator();

			




	
	
	
		
 

			




	
	
	
		
 
    QMenu* tbMenu = ui->menuView->addMenu("Toolbars");

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    // init UI signals

			




	
	
		
 
@@ -191,48 +187,56 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
    // Init sps (sample per second) counter

			




	
	
	
		
 
    spsLabel.setText("0sps");

			




	
	
	
		
 
    spsLabel.setToolTip("samples per second (per channel)");

			




	
	
	
		
 
    ui->statusBar->addPermanentWidget(&spsLabel);

			




	
	
	
		
 
    QObject::connect(&dataFormatPanel,

			




	
	
	
		
 
                     &DataFormatPanel::samplesPerSecondChanged,

			




	
	
	
		
 
                     this, &MainWindow::onSpsChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    // init demo

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     this, &MainWindow::enableDemo);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     plotMan, &PlotManager::showDemoIndicator);

			




	
	
	
		
 

			




	
	
	
		
 
    // load default settings

			




	
	
	
		
 
    QSettings settings("serialplot", "serialplot");

			




	
	
	
		
 
    loadAllSettings(&settings);

			




	
	
	
		
 

			




	
	
	
		
 
    // ensure command panel has 1 command if none loaded

			




	
	
	
		
 
    if (!commandPanel.numOfCommands())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        commandPanel.newCommandAction()->trigger();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // Important: This should be after newCommandAction is triggered

			




	
	
	
		
 
    // (above) we don't want user to be greeted with command panel on

			




	
	
	
		
 
    // the very first run.

			




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

			




	
	
	
		
 
            {

			




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

			




	
	
	
		
 
            });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::~MainWindow()

			




	
	
	
		
 
{

			




	
	
	
		
 
    // save settings

			




	
	
	
		
 
    QSettings settings("serialplot", "serialplot");

			




	
	
	
		
 
    saveAllSettings(&settings);

			




	
	
	
		
 

			




	
	
	
		
 
    if (serialPort.isOpen())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        serialPort.close();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    delete plotMan;

			




	
	
	
		
 

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
    ui = NULL; // we check if ui is deleted in messageHandler

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::closeEvent(QCloseEvent * event)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (!snapshotMan.isAllSaved())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        auto clickedButton = QMessageBox::warning(

			




        

    



    


    



    



      

      





    
    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