Changeset - 8a90fdbd636c
Parent rev.
Child rev.
[Not reviewed]
feature/command-line-options
0 3 0
Mehmet Aslan - 7 years ago 2019-03-30 06:04:21
aaslan-mehmet@hotmail.com
ApplicationName get from PROGRAM_NAME macro in CMakeLists.txt
Default settings name get from PROGRAM_NAME macro in CMakeLists.txt
3 files changed with 4 insertions and 3 deletions:
CMakeLists.txt
1
src/main.cpp
1
1
src/mainwindow.cpp
2
2
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -169,24 +169,25 @@ 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}\\\" ")

			




	
	
	
		
 

			




	
	
	
		
 
# 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

			




        

    


    
    

    

        

                

                    src/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -27,25 +27,25 @@

			




	
	
	
		
 
MainWindow* pMainWindow;

			




	
	
	
		
 

			




	
	
	
		
 
void messageHandler(QtMsgType type, const QMessageLogContext &context,

			




	
	
	
		
 
                    const QString &msg)

			




	
	
	
		
 
{

			




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

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
{

			




	
	
	
		
 
    QApplication a(argc, argv);

			




	
	
	
		
 
    QApplication::setApplicationName("SerialPlot");

			




	
	
	
		
 
    QApplication::setApplicationName(PROGRAM_NAME_STRING);

			




	
	
	
		
 
    QApplication::setApplicationVersion(VERSION_STRING);

			




	
	
	
		
 
    MainWindow w;

			




	
	
	
		
 
    pMainWindow = &w;

			




	
	
	
		
 

			




	
	
	
		
 
    qInstallMessageHandler(messageHandler);

			




	
	
	
		
 
    w.handleCommandLineOptions(a);

			




	
	
	
		
 

			




	
	
	
		
 
    ToolTipFilter ttf;

			




	
	
	
		
 
    a.installEventFilter(&ttf);

			




	
	
	
		
 

			




	
	
	
		
 
    // log application information

			




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

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -244,25 +244,25 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
    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("serialplot", "serialplot");

			




	
	
	
		
 
    QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING);

			




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

			




	
	
		
 
@@ -293,25 +293,25 @@ void MainWindow::closeEvent(QCloseEvent 

			




	
	
	
		
 
        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("serialplot", "serialplot");

			




	
	
	
		
 
    QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING);

			




	
	
	
		
 
    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. \

			




        

    



    


    



    



      

      





    
    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