diff --git a/src/global.h b/src/global.h index 0a4cd3d1..7e20b385 100755 --- a/src/global.h +++ b/src/global.h @@ -92,12 +92,8 @@ LED bar: lbr // file name for logging file #define DEFAULT_LOG_FILE_NAME "Jamulussrvlog.txt" -/* History Definitions ****************************************************************/ -// default number of history items to store -#define NUM_ITEMS_HISTORY 6400 -// default oldest item to draw -#define MAX_DAYS_HISTORY 60 -/* *** */ +// Default oldest item to draw in history graph (days ago) +#define DEFAULT_DAYS_HISTORY 60 // default server address #define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de" diff --git a/src/historygraph.cpp b/src/historygraph.cpp index b6243113..6c118245 100644 --- a/src/historygraph.cpp +++ b/src/historygraph.cpp @@ -27,11 +27,10 @@ /* Abstract class *************************************************************/ -AHistoryGraph::AHistoryGraph( const int iNumItemsHistory, - const int iMaxDaysHistory ) : +AHistoryGraph::AHistoryGraph( const int iMaxDaysHistory ) : sFileName ( "" ), bDoHistory ( false ), - vHistoryDataFifo ( iNumItemsHistory ), + vHistoryDataFifo ( NUM_ITEMS_HISTORY ), iNumTicksX ( 0 ), // number of days in history iHistMaxDays ( iMaxDaysHistory ), @@ -300,9 +299,8 @@ void AHistoryGraph::AddMarker ( const SHistoryData& curHistoryData ) /* JPEG History Graph implementation ******************************************/ -CJpegHistoryGraph::CJpegHistoryGraph( const int iNumItemsHistory, - const int iMaxDaysHistory ) : - AHistoryGraph ( iNumItemsHistory, iMaxDaysHistory ), +CJpegHistoryGraph::CJpegHistoryGraph( const int iMaxDaysHistory ) : + AHistoryGraph ( iMaxDaysHistory ), PlotPixmap ( 1, 1, QImage::Format_RGB32 ), iAxisFontWeight ( -1 ) { @@ -406,9 +404,8 @@ void CJpegHistoryGraph::point ( const unsigned int x, const unsigned int y, cons /* SVG History Graph implementation *******************************************/ -CSvgHistoryGraph::CSvgHistoryGraph( const int iNumItemsHistory, - const int iMaxDaysHistory ) : - AHistoryGraph ( iNumItemsHistory, iMaxDaysHistory ), +CSvgHistoryGraph::CSvgHistoryGraph( const int iMaxDaysHistory ) : + AHistoryGraph ( iMaxDaysHistory ), svgImage ( "" ), svgStreamWriter ( &svgImage ) { diff --git a/src/historygraph.h b/src/historygraph.h index a7b5b5c7..c60ed6d6 100644 --- a/src/historygraph.h +++ b/src/historygraph.h @@ -42,6 +42,11 @@ #include +/* Definitions ****************************************************************/ +// number of history items to store +#define NUM_ITEMS_HISTORY 20000 + + /* Interface ******************************************************************/ class AHistoryGraph { @@ -53,8 +58,7 @@ public: HIT_SERVER_STOP }; - AHistoryGraph( const int iNumItemsHistory, - const int iMaxDaysHistory ); + AHistoryGraph( const int iMaxDaysHistory ); ~AHistoryGraph() { } void Start ( const QString& sNewFileName ); @@ -135,8 +139,7 @@ class CJpegHistoryGraph : public QObject, virtual public AHistoryGraph Q_OBJECT public: - CJpegHistoryGraph( const int iNumItemsHistory, - const int iMaxDaysHistory ); + CJpegHistoryGraph( const int iMaxDaysHistory ); virtual void Update ( ); protected: @@ -160,8 +163,7 @@ class CSvgHistoryGraph : public QObject, virtual public AHistoryGraph Q_OBJECT public: - CSvgHistoryGraph( const int iNumItemsHistory, - const int iMaxDaysHistory ); + CSvgHistoryGraph( const int iMaxDaysHistory ); virtual void Update(); protected: diff --git a/src/main.cpp b/src/main.cpp index e43f1a28..a4506fe5 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -53,8 +53,7 @@ int main ( int argc, char** argv ) bool bCentServPingServerInList = false; bool bNoAutoJackConnect = false; int iNumServerChannels = DEFAULT_USED_NUM_CHANNELS; - int iNumItemsHistory = NUM_ITEMS_HISTORY; - int iMaxDaysHistory = MAX_DAYS_HISTORY; + int iMaxDaysHistory = DEFAULT_DAYS_HISTORY; int iCtrlMIDIChannel = INVALID_MIDI_CH; quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER; ELicenceType eLicenceType = LT_NO_LICENCE; @@ -131,25 +130,6 @@ int main ( int argc, char** argv ) } - // Maximum items in history display ------------------------------------ - if ( GetNumericArgument ( tsConsole, - argc, - argv, - i, - "-I", - "--histitems", - 1, - 65535, - rDbleArgument ) ) - { - iNumItemsHistory = static_cast ( rDbleArgument ); - - tsConsole << "- maximum items in history display: " - << iNumItemsHistory << endl; - - continue; - } - // Maximum days in history display ------------------------------------ if ( GetNumericArgument ( tsConsole, @@ -537,7 +517,6 @@ int main ( int argc, char** argv ) // Server: // actual server object CServer Server ( iNumServerChannels, - iNumItemsHistory, iMaxDaysHistory, strLoggingFileName, iPortNumber, @@ -653,7 +632,6 @@ QString UsageArguments ( char **argv ) " -w, --welcomemessage welcome message on connect (server only)\n" " -y, --history enable connection history and set file\n" " name (server only)\n" - " -I, --histitems number of history items to display (server only)\n" " -D, --histdays number of days of history to display (server only)\n" " -z, --startminimized start minimizied (server only)\n" " --ctrlmidich MIDI controller channel to listen (client only)" diff --git a/src/server.cpp b/src/server.cpp index dbd38c3c..d49c6954 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -198,7 +198,6 @@ void CHighPrecisionTimer::run() // CServer implementation ****************************************************** CServer::CServer ( const int iNewMaxNumChan, - const int iNumItemsHistory, const int iMaxDaysHistory, const QString& strLoggingFileName, const quint16 iPortNumber, @@ -214,7 +213,7 @@ CServer::CServer ( const int iNewMaxNumChan, const ELicenceType eNLicenceType ) : iMaxNumChannels ( iNewMaxNumChan ), Socket ( this, iPortNumber ), - Logging ( iNumItemsHistory, iMaxDaysHistory ), + Logging ( iMaxDaysHistory ), JamRecorder ( strRecordingDirName ), bEnableRecording ( !strRecordingDirName.isEmpty() ), bWriteStatusHTMLFile ( false ), diff --git a/src/server.h b/src/server.h index 749e3a77..2e83c45e 100755 --- a/src/server.h +++ b/src/server.h @@ -119,7 +119,6 @@ class CServer : public QObject public: CServer ( const int iNewMaxNumChan, - const int iNumItemsHistory, const int iMaxDaysHistory, const QString& strLoggingFileName, const quint16 iPortNumber, diff --git a/src/serverlogging.cpp b/src/serverlogging.cpp index 5ad56e09..e3c42a4d 100755 --- a/src/serverlogging.cpp +++ b/src/serverlogging.cpp @@ -25,10 +25,9 @@ #include "serverlogging.h" // Server logging -------------------------------------------------------------- -CServerLogging::CServerLogging( const int iNumItemsHistory, - const int iMaxDaysHistory ) : - JpegHistoryGraph ( iNumItemsHistory, iMaxDaysHistory ), - SvgHistoryGraph ( iNumItemsHistory, iMaxDaysHistory ), +CServerLogging::CServerLogging( const int iMaxDaysHistory ) : + JpegHistoryGraph ( iMaxDaysHistory ), + SvgHistoryGraph ( iMaxDaysHistory ), bDoLogging ( false ), File ( DEFAULT_LOG_FILE_NAME ) { diff --git a/src/serverlogging.h b/src/serverlogging.h index 5c5a9f19..fbef06e3 100755 --- a/src/serverlogging.h +++ b/src/serverlogging.h @@ -38,8 +38,7 @@ class CServerLogging { public: - CServerLogging( const int iNumItemsHistory, - const int iMaxDaysHistory ); + CServerLogging( const int iMaxDaysHistory ); virtual ~CServerLogging();