Changeset - 6862f9405cdb
Parent rev.
Child rev.
[Not reviewed]
feature/command-line-options
0 3 0
Mehmet Aslan - 7 years ago 2019-04-04 03:23:29
aaslan-mehmet@hotmail.com
Nonexisting configuration file log changed and handled.
Minor name changes and fixes.
3 files changed with 13 insertions and 11 deletions:
CMakeLists.txt
1
1
src/main.cpp
1
1
src/mainwindow.cpp
11
9
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -157,49 +157,49 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
 
# Enable C++11 support, fail if not supported
 
include(CheckCXXCompilerFlag)
 
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 
if(COMPILER_SUPPORTS_CXX11)
 
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
elseif(COMPILER_SUPPORTS_CXX0X)
 
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
else()
 
  message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 
endif()
 

			




	
	
	
		
 
# default version

			




	
	
	
		
 
set(VERSION_STRING "0.10.0")

			




	
	
	
		
 
set(VERSION_REVISION "0")

			




	
	
	
		
 

			




	
	
	
		
 
# get revision number from mercurial and parse version string

			




	
	
	
		
 
include(GetVersion)

			




	
	
	
		
 

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_STRING=\\\"${VERSION_STRING}\\\" ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_MAJOR=${VERSION_MAJOR} ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_MINOR=${VERSION_MINOR} ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_PATCH=${VERSION_PATCH} ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_REVISION=\\\"${VERSION_REVISION}\\\" ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROGRAM_NAME_STRING=\\\"${PROGRAM_NAME}\\\" ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROGRAM_NAME=\\\"${PROGRAM_NAME}\\\" ")

			




	
	
	
		
 

			




	
	
	
		
 
# add make run target

			




	
	
	
		
 
add_custom_target(run

			




	
	
	
		
 
    COMMAND ${PROGRAM_NAME}

			




	
	
	
		
 
    DEPENDS ${PROGRAM_NAME}

			




	
	
	
		
 
    WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}

			




	
	
	
		
 
)

			




	
	
	
		
 

			




	
	
	
		
 
# installing

			




	
	
	
		
 
install(TARGETS ${PROGRAM_NAME} DESTINATION bin)

			




	
	
	
		
 

			




	
	
	
		
 
# for windows put libraries to install directory

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
  file(GLOB WINDOWS_INSTALL_LIBRARIES

			




	
	
	
		
 
    "${CMAKE_BINARY_DIR}/windows_install_libraries/*.*")

			




	
	
	
		
 
  install(FILES ${WINDOWS_INSTALL_LIBRARIES} DESTINATION bin)

			




	
	
	
		
 
endif (WIN32)

			




	
	
	
		
 

			




	
	
	
		
 
# prepare menu item and icon

			




	
	
	
		
 
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/misc/program_name.desktop.in"

			




	
	
	
		
 
  "${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop")

			




	
	
	
		
 
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/misc/program_name.png"

			




	
	
	
		
 
  "${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png" COPYONLY)

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -49,42 +49,42 @@ void messageHandler(QtMsgType type, cons

			




	
	
	
		
 
            logString = "[Error] " + msg;

			




	
	
	
		
 
            break;

			




	
	
	
		
 
        case QtFatalMsg:

			




	
	
	
		
 
            logString = "[Fatal] " + msg;

			




	
	
	
		
 
            break;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    std::cerr << logString.toStdString() << std::endl;

			




	
	
	
		
 

			




	
	
	
		
 
    if (pMainWindow != nullptr)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // TODO: don't call MainWindow::messageHandler if window is destroyed

			




	
	
	
		
 
        pMainWindow->messageHandler(type, logString, msg);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (type == QtFatalMsg)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        __builtin_trap();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int main(int argc, char *argv[])

			




	
	
	
		
 
{

			




	
	
	
		
 
    QApplication a(argc, argv);

			




	
	
	
		
 
    QApplication::setApplicationName(PROGRAM_NAME_STRING);

			




	
	
	
		
 
    QApplication::setApplicationName(PROGRAM_NAME);

			




	
	
	
		
 
    QApplication::setApplicationVersion(VERSION_STRING);

			




	
	
	
		
 

			




	
	
	
		
 
    qInstallMessageHandler(messageHandler);

			




	
	
	
		
 
    MainWindow w;

			




	
	
	
		
 
    pMainWindow = &w;

			




	
	
	
		
 

			




	
	
	
		
 
    ToolTipFilter ttf;

			




	
	
	
		
 
    a.installEventFilter(&ttf);

			




	
	
	
		
 

			




	
	
	
		
 
    // log application information

			




	
	
	
		
 
    qDebug() << "SerialPlot" << VERSION_STRING;

			




	
	
	
		
 
    qDebug() << "Revision" << VERSION_REVISION;

			




	
	
	
		
 

			




	
	
	
		
 
    w.show();

			




	
	
	
		
 

			




	
	
	
		
 
    return a.exec();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,48 +14,49 @@

			




	
	
	
		
 
  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 "mainwindow.h"

			




	
	
	
		
 
#include "ui_mainwindow.h"

			




	
	
	
		
 
#include <QByteArray>

			




	
	
	
		
 
#include <QApplication>

			




	
	
	
		
 
#include <QFileDialog>

			




	
	
	
		
 
#include <QMessageBox>

			




	
	
	
		
 
#include <QFile>

			




	
	
	
		
 
#include <QTextStream>

			




	
	
	
		
 
#include <QMenu>

			




	
	
	
		
 
#include <QDesktopServices>

			




	
	
	
		
 
#include <QMap>

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include <QCommandLineParser>

			




	
	
	
		
 
#include <QFileInfo>

			




	
	
	
		
 
#include <qwt_plot.h>

			




	
	
	
		
 
#include <limits.h>

			




	
	
	
		
 
#include <cmath>

			




	
	
	
		
 
#include <iostream>

			




	
	
	
		
 
#include <cstdlib>

			




	
	
	
		
 

			




	
	
	
		
 
#include <plot.h>

			




	
	
	
		
 
#include <barplot.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebufferseries.h"

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "defines.h"

			




	
	
	
		
 
#include "version.h"

			




	
	
	
		
 
#include "setting_defines.h"

			




	
	
	
		
 

			




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

			




	
	
	
		
 
#include <QtPlugin>

			




	
	
	
		
 
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
// TODO: depends on tab insertion order, a better solution would be to use object names

			




	
	
	
		
 
const QMap<int, QString> panelSettingMap({

			




	
	
	
		
 
        {0, "Port"},

			




	
	
	
		
 
        {1, "DataFormat"},

			




	
	
	
		
 
        {2, "Plot"},

			




	
	
	
		
 
        {3, "Commands"},

			




	
	
	
		
 
        {4, "Record"},

			




	
	
	
		
 
        {5, "TextView"},

			




	
	
	
		
 
        {6, "Log"}

			




	
	
		
 
@@ -232,100 +233,100 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
                      plotControlPanel.xMin(), plotControlPanel.xMax());

			




	
	
	
		
 
    plotMan->setNumOfSamples(numOfSamples);

			




	
	
	
		
 
    plotMan->setPlotWidth(plotControlPanel.plotWidth());

			




	
	
	
		
 

			




	
	
	
		
 
    // Init sps (sample per second) counter

			




	
	
	
		
 
    spsLabel.setText("0sps");

			




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

			




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

			




	
	
	
		
 
    connect(&sampleCounter, &SampleCounter::spsChanged,

			




	
	
	
		
 
            this, &MainWindow::onSpsChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    // init demo

			




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

			




	
	
	
		
 
                     this, &MainWindow::enableDemo);

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                     plotMan, &PlotManager::showDemoIndicator);

			




	
	
	
		
 

			




	
	
	
		
 
    // init stream connections

			




	
	
	
		
 
    connect(&dataFormatPanel, &DataFormatPanel::sourceChanged,

			




	
	
	
		
 
            this, &MainWindow::onSourceChanged);

			




	
	
	
		
 
    onSourceChanged(dataFormatPanel.activeSource());

			




	
	
	
		
 

			




	
	
	
		
 
    // load default settings

			




	
	
	
		
 
    QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING);

			




	
	
	
		
 
    QSettings settings(PROGRAM_NAME, PROGRAM_NAME);

			




	
	
	
		
 
    loadAllSettings(&settings);

			




	
	
	
		
 

			




	
	
	
		
 
    handleCommandLineOptions(*QApplication::instance());

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    handleCommandLineOptions(*QApplication::instance());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::~MainWindow()

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (serialPort.isOpen())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        serialPort.close();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    delete plotMan;

			




	
	
	
		
 

			




	
	
	
		
 
    delete ui;

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::closeEvent(QCloseEvent * event)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // save snapshots

			




	
	
	
		
 
    if (!snapshotMan.isAllSaved())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        auto clickedButton = QMessageBox::warning(

			




	
	
	
		
 
            this, "Closing SerialPlot",

			




	
	
	
		
 
            "There are un-saved snapshots. If you close you will loose the data.",

			




	
	
	
		
 
            QMessageBox::Discard, QMessageBox::Cancel);

			




	
	
	
		
 
        if (clickedButton == QMessageBox::Cancel)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            event->ignore();

			




	
	
	
		
 
            return;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // save settings

			




	
	
	
		
 
    QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING);

			




	
	
	
		
 
    QSettings settings(PROGRAM_NAME, PROGRAM_NAME);

			




	
	
	
		
 
    saveAllSettings(&settings);

			




	
	
	
		
 
    settings.sync();

			




	
	
	
		
 

			




	
	
	
		
 
    if (settings.status() != QSettings::NoError)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QString errorText;

			




	
	
	
		
 

			




	
	
	
		
 
        if (settings.status() == QSettings::AccessError)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            QString file = settings.fileName();

			




	
	
	
		
 
            errorText = QString("Serialplot cannot save settings due to access error. \

			




	
	
	
		
 
This happens if you have run serialplot as root (with sudo for ex.) previously. \

			




	
	
	
		
 
Try fixing the permissions of file: %1, or just delete it.").arg(file);

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else

			




	
	
	
		
 
        {

			




	
	
	
		
 
            errorText = QString("Serialplot cannot save settings due to unknown error: %1").\

			




	
	
	
		
 
                arg(settings.status());

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        auto button = QMessageBox::critical(

			




	
	
	
		
 
            NULL,

			




	
	
	
		
 
            "Failed to save settings!", errorText,

			




	
	
	
		
 
            QMessageBox::Cancel | QMessageBox::Ok);

			




	
	
		
 
@@ -580,67 +581,68 @@ void MainWindow::onSaveSettings()

			




	
	
	
		
 
        saveAllSettings(&settings);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onLoadSettings()

			




	
	
	
		
 
{

			




	
	
	
		
 
    QString fileName = QFileDialog::getOpenFileName(

			




	
	
	
		
 
        this, tr("Load Settings"), QString(), "INI (*.ini)");

			




	
	
	
		
 

			




	
	
	
		
 
    if (!fileName.isNull()) // user canceled

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QSettings settings(fileName, QSettings::IniFormat);

			




	
	
	
		
 
        loadAllSettings(&settings);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::handleCommandLineOptions(const QCoreApplication &app)

			




	
	
	
		
 
{

			




	
	
	
		
 
    QCommandLineParser parser;

			




	
	
	
		
 
    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsCompactedShortOptions);

			




	
	
	
		
 
    parser.setApplicationDescription("Small and simple software for plotting data from serial port in realtime.");

			




	
	
	
		
 
    parser.addHelpOption();

			




	
	
	
		
 
    parser.addVersionOption();

			




	
	
	
		
 

			




	
	
	
		
 
    QCommandLineOption loadOpt({"l", "load"}, "Load settings from file.", "filename");

			




	
	
	
		
 
    QCommandLineOption configOpt({"c", "config"}, "Load configuration from file.", "filename");

			




	
	
	
		
 
    QCommandLineOption portOpt({"p", "port"}, "Set port name.", "port name");

			




	
	
	
		
 
    QCommandLineOption baudrateOpt({"b" ,"baudrate"}, "Set port baud rate.", "baud rate");

			




	
	
	
		
 
    QCommandLineOption openPortOpt({"o", "open"}, "Open serial port.");

			




	
	
	
		
 

			




	
	
	
		
 
    parser.addOption(loadOpt);

			




	
	
	
		
 
    parser.addOption(configOpt);

			




	
	
	
		
 
    parser.addOption(portOpt);

			




	
	
	
		
 
    parser.addOption(baudrateOpt);

			




	
	
	
		
 
    parser.addOption(openPortOpt);

			




	
	
	
		
 

			




	
	
	
		
 
    parser.process(app);

			




	
	
	
		
 

			




	
	
	
		
 
    if (parser.isSet(loadOpt))

			




	
	
	
		
 
    if (parser.isSet(configOpt))

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QString fileName = parser.value(loadOpt);

			




	
	
	
		
 
        QString fileName = parser.value(configOpt);

			




	
	
	
		
 
        QFileInfo fileInfo(fileName);

			




	
	
	
		
 

			




	
	
	
		
 
        if (fileInfo.exists() && fileInfo.isFile())

			




	
	
	
		
 
        {

			




	
	
	
		
 
            QSettings settings(fileName, QSettings::IniFormat);

			




	
	
	
		
 
            loadAllSettings(&settings);

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else

			




	
	
	
		
 
        {

			




	
	
	
		
 
            qWarning() << "Ini file not exist";

			




	
	
	
		
 
            qCritical() << "Configuration file not exist. Closing application.";

			




	
	
	
		
 
            std::exit(1);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (parser.isSet(portOpt))

			




	
	
	
		
 
    {

			




	
	
	
		
 
        portControl.selectPort(parser.value(portOpt));

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (parser.isSet(baudrateOpt))

			




	
	
	
		
 
    {

			




	
	
	
		
 
        portControl.selectBaudrate(parser.value(baudrateOpt));

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (parser.isSet(openPortOpt))

			




	
	
	
		
 
    {

			




	
	
	
		
 
        portControl.openPort();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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