eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

better command line argument parsing, added command line argument to specify init file location

Browse source
This commit is contained in:
Volker Fischer 2007-09-09 09:50:22 +00:00
parent d49a2b2731
commit aedf6202bd
4 changed files with 205 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/global.h
View file

@ -161,6 +161,12 @@ public:
/* Prototypes for global functions ********************************************/
// command line parsing, TODO do not declare functions globally but in a class
std::string UsageArguments ( char **argv );
bool GetFlagArgument ( int, char **argv, int &i, std::string strShortOpt, std::string strLongOpt );
bool GetStringArgument ( int argc, char **argv, int &i, std::string strShortOpt, std::string strLongOpt, std::string & strArg );
bool GetNumericArgument ( int argc, char **argv, int &i, std::string strShortOpt, std::string strLongOpt, double rRangeStart, double rRangeStop, double & rValue);
// posting a window message
void PostWinMessage ( const _MESSAGE_IDENT MessID, const int iMessageParam = 0,
const int iChanNum = 0 );

180
src/main.cpp
View file

@ -23,6 +23,7 @@
\******************************************************************************/
#include <qapplication.h>
#include <iostream>
#include "global.h"
#include "llconclientdlg.h"
#include "llconserverdlg.h"
@ -36,40 +37,71 @@ QApplication* pApp = NULL;
int main ( int argc, char** argv )
{
std::string strArgument;
/* check if server or client application shall be started */
bool bIsClient = true;
bool bUseGUI = true;
bool bUseServerLogging = false;
std::string strIniFileName = "";
/* QT docu: argv()[0] is the program name, argv()[1] is the first
argument and argv()[argc()-1] is the last argument */
if ( argc > 1 )
argument and argv()[argc()-1] is the last argument.
Start with first argument, therefore "i = 1" */
for ( int i = 1; i < argc; i++ )
{
std::string strShortOpt;
/* "-s": start server with GUI enabled */
strShortOpt = "-s";
if ( !strShortOpt.compare ( argv[1] ) )
/* Server mode flag ------------------------------------------------------- */
if ( GetFlagArgument ( argc, argv, i, "-s", "--server" ) == TRUE )
{
bIsClient = false;
cerr << "server ";
continue;
}
/* "-sn": start server with GUI disabled (no GUI used) */
strShortOpt = "-sn";
if ( !strShortOpt.compare ( argv[1] ) )
/* Use GUI flag ----------------------------------------------------------- */
if ( GetFlagArgument ( argc, argv, i, "-n", "--nogui" ) == TRUE )
{
bIsClient = false;
bUseGUI = false;
cerr << "nogui ";
continue;
}
/* "-sln": start server with GUI disabled and logging enabled */
strShortOpt = "-sln";
if ( !strShortOpt.compare ( argv[1] ) )
/* Use logging flag ------------------------------------------------------- */
if ( GetFlagArgument ( argc, argv, i, "-l", "--log" ) == TRUE )
{
bIsClient = false;
bUseGUI = false;
bUseServerLogging = true;
cerr << "logging ";
continue;
}
/* Initialization file ---------------------------------------------------- */
if ( GetStringArgument ( argc, argv, i, "-i", "--inifile", strArgument ) == TRUE )
{
strIniFileName = strArgument;
continue;
}
/* Help (usage) flag ------------------------------------------------------ */
if ( ( !strcmp ( argv[i], "--help" ) ) ||
( !strcmp ( argv[i], "-h" ) ) || ( !strcmp ( argv[i], "-?" ) ) )
{
const std::string strHelp = UsageArguments(argv);
cerr << strHelp;
exit ( 1 );
}
/* Unknown option --------------------------------------------------------- */
cerr << argv[0] << ": ";
cerr << "Unknown option '" << argv[i] << "' -- use '--help' for help"
<< endl;
exit ( 1 );
}
/* Application object */
@ -77,31 +109,31 @@ int main ( int argc, char** argv )
if ( bIsClient )
{
/* client */
// client
// actual client object
CClient Client;
// load settings from init-file
CSettings Settings ( &Client );
Settings.Load ();
Settings.Load ( strIniFileName );
// GUI object
CLlconClientDlg ClientDlg ( &Client, 0, 0, FALSE, Qt::WStyle_MinMax );
/* Set main window */
// set main window
app.setMainWidget ( &ClientDlg );
pApp = &app; /* Needed for post-event routine */
pApp = &app; // Needed for post-event routine
/* Show dialog */
// show dialog
ClientDlg.show();
app.exec();
/* Save settings to init-file */
Settings.Save();
// save settings to init-file
Settings.Save ( strIniFileName );
}
else
{
/* server */
// server
// actual server object
CServer Server ( bUseServerLogging );
@ -111,11 +143,11 @@ int main ( int argc, char** argv )
CLlconServerDlg ServerDlg ( &Server, 0, 0, FALSE,
Qt::WStyle_MinMax );
/* Set main window */
// set main window
app.setMainWidget ( &ServerDlg );
pApp = &app; /* Needed for post-event routine */
pApp = &app; // needed for post-event routine
/* Show dialog */
// show dialog
ServerDlg.show();
app.exec();
}
@ -130,16 +162,106 @@ int main ( int argc, char** argv )
return 0;
}
/******************************************************************************\
* Command Line Argument Parsing *
\******************************************************************************/
std::string UsageArguments ( char **argv )
{
return
"Usage: " + std::string ( argv[0] ) + " [option] [argument]\n"
"Recognized options:\n"
" -s, --server start server\n"
" -n, --nogui disable GUI (only avaiable for server)\n"
" -l, --log enable logging\n"
" -i, --inifile initialization file name (only available for client)\n"
" -h, -?, --help this help text\n"
"Example: " + std::string ( argv[0] ) + " -l -inifile myinifile.ini\n";
}
bool GetFlagArgument ( int, char **argv, int &i,
std::string strShortOpt, std::string strLongOpt )
{
if ( ( !strShortOpt.compare ( argv[i] ) ) || ( !strLongOpt.compare ( argv[i] ) ) )
{
return true;
}
else
{
return false;
}
}
bool GetStringArgument ( int argc, char **argv, int &i,
std::string strShortOpt, std::string strLongOpt,
std::string & strArg )
{
if ( ( !strShortOpt.compare ( argv[i] ) ) || ( !strLongOpt.compare ( argv[i] ) ) )
{
if ( ++i >= argc )
{
cerr << argv[0] << ": ";
cerr << "'" << strLongOpt << "' needs a string argument" << endl;
exit ( 1 );
}
strArg = argv[i];
return true;
}
else
{
return false;
}
}
bool GetNumericArgument ( int argc, char **argv, int &i,
std::string strShortOpt, std::string strLongOpt,
double rRangeStart, double rRangeStop,
double & rValue)
{
if ( ( !strShortOpt.compare ( argv[i] ) ) || ( !strLongOpt.compare ( argv[i] ) ) )
{
if ( ++i >= argc )
{
cerr << argv[0] << ": ";
cerr << "'" << strLongOpt << "' needs a numeric argument between "
<< rRangeStart << " and " << rRangeStop << endl;
exit ( 1 );
}
char *p;
rValue = strtod ( argv[i], &p );
if ( *p || rValue < rRangeStart || rValue > rRangeStop )
{
cerr << argv[0] << ": ";
cerr << "'" << strLongOpt << "' needs a numeric argument between "
<< rRangeStart << " and " << rRangeStop << endl;
exit ( 1 );
}
return true;
}
else
{
return false;
}
}
/******************************************************************************\
* Window Message System *
\******************************************************************************/
void PostWinMessage ( const _MESSAGE_IDENT MessID, const int iMessageParam,
const int iChanNum )
{
/* In case of simulation no events should be generated */
// first check if application is initialized
if ( pApp != NULL )
{
CLlconEvent* LlconEv =
new CLlconEvent ( MessID, iMessageParam, iChanNum );
/* Qt will delete the event object when done */
// Qt will delete the event object when done
QThread::postEvent ( pApp->mainWidget(), LlconEv );
}
}

36
src/settings.cpp
View file

@ -26,28 +26,36 @@
/* Implementation *************************************************************/
void CSettings::Load()
void CSettings::Load ( std::string sFileName )
{
/* load settings from init-file */
ReadIniFile();
ReadIniFile ( sFileName );
}
void CSettings::Save()
void CSettings::Save ( std::string sFileName )
{
/* write settings in init-file */
WriteIniFile();
WriteIniFile ( sFileName );
}
/* Read and write init-file ***************************************************/
void CSettings::ReadIniFile()
void CSettings::ReadIniFile ( std::string sFileName )
{
int iValue;
bool bValue;
INIFile ini;
/* Load data from init-file */
INIFile ini = LoadIni ( LLCON_INIT_FILE_NAME );
// load data from init-file
if ( !sFileName.empty() )
{
ini = LoadIni ( sFileName.c_str() );
}
else
{
// use default file name
ini = LoadIni ( LLCON_INIT_FILE_NAME );
}
// IP address
pClient->strIPAddress = GetIniSetting ( ini, "Client", "ipaddress" );
@ -104,7 +112,7 @@ void CSettings::ReadIniFile()
}
}
void CSettings::WriteIniFile()
void CSettings::WriteIniFile ( std::string sFileName )
{
INIFile ini;
@ -139,8 +147,16 @@ void CSettings::WriteIniFile()
SetNumericIniSet ( ini, "Client", "netwbusifactout", pClient->GetNetwBufSizeFactOut() );
/* Save settings in init-file */
// save settings in init-file
if ( !sFileName.empty() )
{
SaveIni ( ini, sFileName.c_str() );
}
else
{
// use default file name
SaveIni ( ini, LLCON_INIT_FILE_NAME );
}
}
bool CSettings::GetNumericIniSet ( INIFile& theINI, string strSection,

8
src/settings.h
View file

@ -47,12 +47,12 @@ class CSettings
public:
CSettings ( CClient* pNCliP ) : pClient ( pNCliP ) {}
void Load();
void Save();
void Load ( std::string sFileName = "" );
void Save ( std::string sFileName = "" );
protected:
void ReadIniFile();
void WriteIniFile();
void ReadIniFile ( std::string sFileName );
void WriteIniFile ( std::string sFileName );
// function declarations for stlini code written by Robert Kesterson
struct StlIniCompareStringNoCase