Commit 830bc498 authored by thomas.forbriger's avatar thomas.forbriger

Merge branch 'master' of local git respository

parents 7efe5acb dafd110d
......@@ -3,6 +3,10 @@ this is <CHANGELOG>
Recent development in Seitosh (bug fixes, new features, etc)
------------------------------------------------------------
07.06.2019: ThiesDL1 logger
- commit 96a7a22: provide chronyreport.sh for systems where chronyd has
replaced ntpd
12.04.2019: croposp
- commit a5ce04e: bug fix; workflow was not correct in cases where no PSD
values were requested explicitly
......
......@@ -4,6 +4,8 @@
# ============================================================================
# ThiesDL1
# --------
#
tester
#
# descriptive text files
*_text.h
......
......@@ -31,6 +31,8 @@
#
# ============================================================================
echo "run $0" | /bin/logger -i -t "DL1logger" 2>&1
LOGGERBINARY=$HOME/bin/linux/DL1logger
#DLDEVICE=/dev/ttyUSB0
......@@ -45,9 +47,9 @@ DATATYPES=ascii
MEMORY=$DATADIR/DL1memory
echo stty -F $DLDEVICE $PORTSETTINGS | /bin/logger -i -t "DL1logger $0" 2>&1
stty -F $DLDEVICE $PORTSETTINGS | /bin/logger -i -t "DL1logger $0" 2>&1
stty -F $DLDEVICE -a | /bin/logger -i -t "DL1logger $0" 2>&1
echo stty -F $DLDEVICE $PORTSETTINGS | /bin/logger -i -t "DL1logger" 2>&1
stty -F $DLDEVICE $PORTSETTINGS | /bin/logger -i -t "DL1logger" 2>&1
stty -F $DLDEVICE -a | /bin/logger -i -t "DL1logger" 2>&1
$LOGGERBINARY -port $DLDEVICE -memory $MEMORY \
-datapath $DATAPATH -activepath $ACTIVEPATH \
......
......@@ -2,15 +2,15 @@
# ============================================================================
# configuration file for syslog-ng on DL1 recording host
# ------------------------------------------------------
# 2014-03-27
# 2019-06-19
# ============================================================================
# BFO Thies DL1
destination dl1logall { file("/var/log/dl1logall" fsync(yes) perm(0644)); };
destination dl1log { file("/var/log/dl1log" fsync(yes) perm(0644)); };
destination dl1logremote1 { tcp("192.168.1.41" port(2222)); };
destination dl1logremote2 { tcp("192.168.1.17" port(2222)); };
filter f_dl1 { match('^DL1logger' value(MSGHDR)); };
filter f_dl1_notice { match('^DL1logger' value(MSGHDR)) and not level(info); };
destination dl1logremote2 { tcp("192.168.1.3" port(2222)); };
filter f_dl1 { match("DL1logger"); };
filter f_dl1_notice { match("DL1logger") and not level(info); };
log { source(src); filter(f_dl1); destination(dl1logall); };
log { source(src); filter(f_dl1_notice); destination(dl1log); };
log { source(src); filter(f_dl1); destination(dl1logremote1); };
......
......@@ -2,7 +2,7 @@
# ============================================================================
# configuration file for syslog-ng on host receiving messages from DL1
# --------------------------------------------------------------------
# 2014-03-27
# 2019-06-19
# ============================================================================
#
# BFO Thies DL1
......
......@@ -29,16 +29,24 @@
#
PROGRAMS=DL1logger DL1direct
SHELLSCRIPTS=chronyreport.sh DL1logger.sh DL1sum.sh launchDL1logger.sh \
ntpreport.sh
.PHONY: all
all: install
.PHONY: install
install: $(addprefix $(LOCBINDIR)/,$(PROGRAMS))
install: $(addprefix $(LOCBINDIR)/,$(PROGRAMS)) \
$(addprefix $(LOCSCRIPTDIR)/,$(SHELLSCRIPTS))
$(LOCBINDIR)/%: %
mkdir -pv $(LOCBINDIR)
/bin/mv -fv $< $(LOCBINDIR)
$(LOCSCRIPTDIR)/%: %
mkdir -pv $(LOCSCRIPTDIR)
/bin/mv -fv $< $(LOCSCRIPTDIR)
#----------------------------------------------------------------------
# do not link against shared libraries
......@@ -56,7 +64,7 @@ AUTOSRC=DL1logger_longusage_text.cc DL1logger_notes_text.cc \
SUBOBS=$(patsubst %.cc,%.o,$(AUTOSRC) $(SUBSRC))
ALLSRC=$(AUTOSRC) $(SUBSRC) $(MAINSRC)
AUXFILES=Makefile README COPYING
AUXFILES=Makefile README COPYING crontab
#----------------------------------------------------------------------
......@@ -87,7 +95,7 @@ clean: ;
CHECKVAR=$(if $($(1)),,$(error ERROR: missing variable $(1)))
CHECKVARS=$(foreach var,$(1),$(call CHECKVAR,$(var)))
$(call CHECKVARS,LOCINCLUDEDIR LOCLIBDIR LOCBINDIR)
$(call CHECKVARS,LOCINCLUDEDIR LOCLIBDIR LOCBINDIR LOCSCRIPTDIR)
$(call CHECKVARS,TF_BROWSER TF_WWWBASEDIR)
FLAGS += $(MYFLAGS) -fPIC
......
#!/bin/sh
# this is <chronyreport.sh>
# ----------------------------------------------------------------------------
#
# Copyright (c) 2019 by Thomas Forbriger (BFO Schiltach)
#
# report chrony status
#
# replaces ntpreport.sh on systems where chronyd has replaced ntpd
#
# ----
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# ----
#
# REVISIONS and CHANGES
# 07/06/2019 V1.0 Thomas Forbriger
#
# ============================================================================
#
echo "run $0" | /bin/logger -i -p user.notice -t "DL1logger" 2>&1
echo "check status of time sources" | /bin/logger -i -p user.notice -t "DL1logger" 2>&1
/usr/bin/chronyc sources | /bin/logger -i -p user.notice -t "DL1logger" 2>&1
/usr/bin/chronyc sourcestats | /bin/logger -i -p user.notice -t "DL1logger" 2>&1
# ----- END OF chronyreport.sh -----
......@@ -4,5 +4,6 @@
# ---------------------------
#
10 * * * * /home/dl1/bin/scripts/launchDL1logger.sh 1>>/dev/null 2>&1
50 0 * * * /home/dl1/bin/scripts/ntpreport.sh 1>>/dev/null 2>&1
#50 0 * * * /home/dl1/bin/scripts/ntpreport.sh 1>>/dev/null 2>&1
50 0 * * * /home/dl1/bin/scripts/chronyreport.sh 1>>/dev/null 2>&1
# ----- END OF crontab -----
......@@ -26,11 +26,12 @@
# 19/12/2008 V1.0 Thomas Forbriger
#
# ============================================================================
echo "check logger" | /bin/logger -i -p user.info -t "DL1logger $0" 2>&1
echo "run $0" | /bin/logger -i -p user.info -t "DL1logger" 2>&1
echo "check logger" | /bin/logger -i -p user.info -t "DL1logger" 2>&1
SCRIPTDIR=$HOME/bin/scripts
LOGGERSCRIPT=$SCRIPTDIR/DL1logger.sh
LOGDIR=$HOME/DL1/log
mkdir -pv $LOGDIR | /bin/logger -i -p user.info -t "DL1logger $0" 2>&1
mkdir -pv $LOGDIR | /bin/logger -i -p user.info -t "DL1logger" 2>&1
LOGFILE=$LOGDIR/$(date +'%Y%m%d.%H%M').log
/sbin/checkproc $LOGGERSCRIPT
......@@ -38,7 +39,7 @@ status=$?
if test $status != 0
then
echo "/usr/bin/nohup $LOGGERSCRIPT 2>&1 >> $LOGFILE &" \
| /bin/logger -i -p user.notice -t "DL1logger $0" 2>&1
| /bin/logger -i -p user.notice -t "DL1logger" 2>&1
/usr/bin/nohup $LOGGERSCRIPT >> $LOGFILE 2>&1 &
fi
......
......@@ -27,6 +27,7 @@
#
# ============================================================================
#
echo "check status of NTP peers" | /bin/logger -i -p user.notice -t "DL1logger $0" 2>&1
/usr/sbin/ntpq -p | /bin/logger -i -p user.notice -t "DL1logger $0" 2>&1
echo "run $0" | /bin/logger -p user.notice -i -t "DL1logger" 2>&1
echo "check status of NTP peers" | /bin/logger -i -p user.notice -t "DL1logger" 2>&1
/usr/sbin/ntpq -p | /bin/logger -i -p user.notice -t "DL1logger" 2>&1
# ----- END OF ntpreport.sh -----
#!/bin/sh
# this is <syslogtest.sh>
# ----------------------------------------------------------------------------
#
# Copyright (c) 2019 by Thomas Forbriger (BFO Schiltach)
#
# Test syslog configuration
#
# ----
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# ----
#
# REVISIONS and CHANGES
# 19/06/2019 V1.0 Thomas Forbriger
#
# ============================================================================
#
# produce syslog messages like produced by DL1logger
./tester -syslog "syslog test: $(date)" -v
./tester -syslog "syslog test: $(date)" -loginfo -v
./tester -syslog "syslog test: $(date)" -logemerg -v
#
# produce syslog messages like launchDL1logger.sh and DL1logger.sh
echo "check syslog" | /bin/logger -i -p user.info -t "DL1logger" 2>&1
#
# run chrony check
./chronyreport.sh
#
# ----- END OF syslogtest.sh -----
......@@ -4,11 +4,12 @@
* ----------------------------------------------------------------------------
*
* \author Thomas Forbriger
* \date 24/03/2014
* \since 24/03/2014
* \date 19/06/2019
*
* a small program to test some functions
*
* Copyright (c) 2008, 2014 by Thomas Forbriger (BFO Schiltach)
* Copyright (c) 2008, 2014, 2019 by Thomas Forbriger (BFO Schiltach)
*
* ----
* This program is free software; you can redistribute it and/or modify
......@@ -28,11 +29,12 @@
*
* REVISIONS and CHANGES
* - 28/11/2008 V1.0 Thomas Forbriger
* - 19/06/2019 V1.1 add syslog test function
*
* ============================================================================
*/
#define TESTER_VERSION \
"TESTER V2014-03-24 a small program to test some functions"
"TESTER V2019-06-19 a small program to test some functions"
#include <iostream>
#include <list>
......@@ -42,6 +44,7 @@
#include "thiesdl1.h"
#include "functions.h"
#include "memory.h"
#include "logger.h"
typedef std::list<std::string> Tlistofstring;
......@@ -69,7 +72,8 @@ int main(int iargc, char* argv[])
char usage_text[]=
{
TESTER_VERSION "\n"
"usage: tester" "\n"
"usage: tester [-v] [-pattern p] [-Id] [-checkdatepattern p]" "\n"
" [-checkfileexists f] [-preppath p] [-active]\n"
" or: tester --help|-h" "\n"
};
......@@ -77,6 +81,22 @@ int main(int iargc, char* argv[])
char help_text[]=
{
TESTER_VERSION
"flags:\n"
"-v be verbose\n"
"-active set active flag for dl1::mkpathname in test \"-preppath\"\n"
"-loginfo set syslog level to info\n"
"-logemerg set syslog level to emerg\n"
"\n"
"tests:\n"
"-pattern p test pattern replacement function\n"
" dl1::patsubstdate\n"
"-Id dump list of CVSIDS\n"
"-checkdatepattern p test function\n"
" dl1::datetemplatespresent\n"
"-checkfileexists f test functions in tfxx::file\n"
"-preppath p test function\n"
" dl1::mkpathname\n"
"-syslog s send string \"s\" to syslog\n"
};
// define commandline options
......@@ -99,6 +119,12 @@ int main(int iargc, char* argv[])
{"preppath",arg_yes,"-"},
// 7: set active flag
{"active",arg_no,"-"},
// 8: send string to syslog
{"syslog",arg_yes,"-"},
// 9: set syslog level to info
{"loginfo",arg_no,"-"},
// 10: set syslog level to emerg
{"logemerg",arg_no,"-"},
{NULL}
};
......@@ -121,60 +147,6 @@ int main(int iargc, char* argv[])
exit(0);
}
/*
// dummy operation: print option settings
for (int iopt=0; iopt<2; iopt++)
{
cout << "option: '" << options[iopt].opt_string << "'" << endl;
if (cmdline.optset(iopt)) { cout << " option was set"; }
else { cout << "option was not set"; }
cout << endl;
cout << " argument (string): '" << cmdline.string_arg(iopt) << "'" << endl;
cout << " argument (int): '" << cmdline.int_arg(iopt) << "'" << endl;
cout << " argument (long): '" << cmdline.long_arg(iopt) << "'" << endl;
cout << " argument (float): '" << cmdline.float_arg(iopt) << "'" << endl;
cout << " argument (double): '" << cmdline.double_arg(iopt) << "'" << endl;
cout << " argument (bool): '";
if (cmdline.bool_arg(iopt))
{ cout << "true"; } else { cout << "false"; }
cout << "'" << endl;
}
while (cmdline.extra()) { cout << cmdline.next() << endl; }
// dummy operation: print rest of command line
while (cmdline.extra()) { cout << cmdline.next() << endl; }
*/
/*
std::ostringstream oss;
oss << "This is my first item";
oss << dl1::DL1::EOL;
oss << "This is my second item" << dl1::DL1::EOL;
oss << "and here are some numbers: " << 3 << 6.5 << 1 << dl1::DL1::EOL;
std::string eol(dl1::DL1::EOL);
std::string msg(oss.str());
Tlistofstring v=tfxx::string::split<std::list>(msg, eol, true);
for (Tvecofstring::iterator i=v.begin(); i!=v.end(); ++i)
{
cout << *i << endl;
}
*/
// cout << dl1::dl1samplinginterval.timestring() << endl;
/*
if (cmdline.extra())
{
std::string filename=cmdline.next();
cout << "file " << filename << endl;
dl1::Memory mem(filename);
mem.setdefault("key","Wert");
mem.setdefault("schluessel","Wert und wert und wert");
mem.setdefault("datum","2008/12/05");
}
*/
/*======================================================================*/
if (cmdline.optset(3))
......@@ -239,6 +211,32 @@ int main(int iargc, char* argv[])
cmdline.optset(7));
cout << "file path: " << pathname << endl;
}
/* ====================================================================== */
if (cmdline.optset(8))
{
dl1::Logger::setident("DL1logger");
dl1::Logger::beverbose(cmdline.optset(1));
if (cmdline.optset(9))
{
dl1::Logger(dl1::log_info) << TESTER_VERSION;
dl1::Logger(dl1::log_info) << "logging at info level";
dl1::Logger(dl1::log_info) << cmdline.string_arg(8);
}
else if (cmdline.optset(10))
{
dl1::Logger(dl1::log_emerg) << TESTER_VERSION;
dl1::Logger(dl1::log_emerg) << "logging at emerg level";
dl1::Logger(dl1::log_emerg) << cmdline.string_arg(8);
}
else
{
dl1::Logger() << TESTER_VERSION;
dl1::Logger() << "logging at default level";
dl1::Logger() << cmdline.string_arg(8);
}
}
}
/* ----- END OF tester.cc ----- */
......@@ -16,7 +16,7 @@
* ============================================================================
*/
#define TESTPSDXX_VERSION \
"TESTPSDXX V1.0 test library functions"
"TESTPSDXX V1.1 test library functions"
#include <iostream>
#include <tfxx/commandline.h>
......@@ -31,8 +31,9 @@ using std::endl;
struct Options
{
bool verbose, logfrequency, logindex, logtaper;
int taperindex;
bool verbose, logfrequency, logindex, logtaper, logfreqtable;
int taperindex, nsamples, nperdec;
double fmin;
}; // Options
/* ====================================================================== */
......@@ -57,6 +58,7 @@ int main(int iargc, char* argv[])
{
TESTPSDXX_VERSION "\n"
"usage: testpsdxx [-lf] [-li] [-lt [i]]" "\n"
" [-tab] [-fmin f] [-nsamples n] [-nperdec n]\n"
" or: testpsdxx --help|-h" "\n"
};
......@@ -67,6 +69,11 @@ int main(int iargc, char* argv[])
"-li test function class LogIndex\n"
"-lt [i] test function class LogTaper, center taper on\n"
" frequency with index i on logarithmic scale\n"
"-tab test function log_frequency with adjustable parameters\n"
"\n"
"-fmin f set frequency interval on linear scale to f\n"
"-nsamples n set number of samples to n\n"
"-nperdec n set number of values per decade to n\n"
};
// define commandline options
......@@ -83,6 +90,14 @@ int main(int iargc, char* argv[])
{"li",arg_no,"-"},
// 4: log taper
{"lt",arg_opt,"5"},
// 5: log scale with adjusted parameters
{"tab",arg_no,"-"},
// 6: smallest frequency
{"fmin",arg_yes,"0.1"},
// 7: number of samples
{"nsamples",arg_yes,"10000"},
// 8: number of values per decade
{"nperdec",arg_yes,"5"},
{NULL}
};
......@@ -110,6 +125,10 @@ int main(int iargc, char* argv[])
opt.logindex=cmdline.optset(3);
opt.logtaper=cmdline.optset(4);
opt.taperindex=cmdline.int_arg(4);
opt.logfreqtable=cmdline.optset(5);
opt.fmin=cmdline.double_arg(6);
opt.nsamples=cmdline.int_arg(7);
opt.nperdec=cmdline.int_arg(8);
if (opt.logfrequency)
{
......@@ -166,6 +185,23 @@ int main(int iargc, char* argv[])
}
cerr << PSDXX_value( logt.sum() ) << endl;
} // if (opt.logtaper)
/* ---------------------------------------------------------------------- */
if (opt.logfreqtable)
{
cout << "test log_frequency with adjustable parameters" << endl;
cout << " " << PSDXX_value( opt.fmin ) << endl;
cout << " " << PSDXX_value( opt.nsamples ) << endl;
cout << " " << PSDXX_value( opt.nperdec ) << endl;
CODE( psd::TDseries ls1=psd::log_frequency(opt.fmin,opt.nsamples,opt.nperdec) );
DUMP( ls1 );
for (int i=ls1.f(); i<=ls1.l(); ++i)
{
cout << "i=" << i << " f=" << ls1(i) << " nu= " <<
std::log(ls1(i)/ls1(ls1.f()))/std::log(10.) << endl;
}
} // if (opt.logfreqtable)
}
/* ----- END OF testpsdxx.cc ----- */
......@@ -29,11 +29,12 @@
*
* REVISIONS and CHANGES
* - 13/02/2008 V1.0 Thomas Forbriger
* - 15/05/2019 V1.1 support adjustment of character height
*
* ============================================================================
*/
#define STUPLO_CONSTANTSOPTIONS_CC_VERSION \
"STUPLO_CONSTANTSOPTIONS_CC V1.0 "
"STUPLO_CONSTANTSOPTIONS_CC V1.1"
#include "constants.h"
......@@ -99,6 +100,8 @@ namespace stuplo {
{"datesep",arg_no,"."},
// 27: distance of ordinate unit label from graph box edge
{"lyd",arg_yes,"2.2"},
// 28: standard character height
{"ch",arg_yes,"1."},
{NULL}
};
......
......@@ -28,11 +28,12 @@
*
* REVISIONS and CHANGES
* - 08/08/2008 V1.0 Thomas Forbriger
* - 15/05/2019 V1.1 support adjustment of character height
*
* ============================================================================
*/
#define STUPLO_GLOBALSETTINGS_CC_VERSION \
"STUPLO_GLOBALSETTINGS_CC V1.0 "
"STUPLO_GLOBALSETTINGS_CC V1.1"
#include "globalsettings.h"
......@@ -64,7 +65,8 @@ namespace stuplo {
Mlabr(false),
Mlabh(0.05),
Mtitle(""),
Mdatesep(".")
Mdatesep("."),
Mch(1.)
{ } // GlobalSettings::Globalsettings()
/*----------------------------------------------------------------------*/
......@@ -88,6 +90,9 @@ namespace stuplo {
//! set command line option 6: line width for time scale
void GlobalSettings::set_lwts(const int& n)
{ Mlwts=n; }
//! set command line option 28: character height for time scale
void GlobalSettings::set_ch(const double &v)
{ Mch=v; }
//! set command line option 7: character height for time scale
void GlobalSettings::set_chts(const double &v)
{ Mchts=v; }
......
......@@ -29,6 +29,7 @@
* REVISIONS and CHANGES
* - 08/08/2008 V1.0 Thomas Forbriger
* - 17/03/2015 V1.1 adjust libpgplotxx interface
* - 15/05/2019 V1.2 support adjustment of character height
*
* ============================================================================
*/
......@@ -37,7 +38,7 @@
#ifndef STUPLO_GLOBALSETTINGS_H_VERSION
#define STUPLO_GLOBALSETTINGS_H_VERSION \
"STUPLO_GLOBALSETTINGS_H V1.1 (17-03-2015)"
"STUPLO_GLOBALSETTINGS_H V1.2 (2019-05-15)"
#include <string>
#include <pgplotxx/xpgplotxx.h>
......@@ -108,11 +109,14 @@ namespace stuplo {
void set_datesep(const std::string& s);
//! set command line option 27: distance between box and ordinate label
void set_lyd(const double& d);
//! set command line option 28: standard character height
void set_ch(const double& v);
/*----------------------------------------------------------------------*/
// read functions
// --------------
double lyd() const { return Mlyd; }
double chy() const { return Mchy; }
double ch() const { return Mch; }
private:
/*! mode flags
* ==========
......@@ -143,6 +147,8 @@ namespace stuplo {
/*! grid and frame style
* ====================
*/
//! standard character height
double Mch;
//! line width for time scale
int Mlwts;
//! character height for time scale
......
......@@ -60,6 +60,8 @@
## -lwyg l set line width for ordinate grid lines
## no ordinate grid lines are plotted if option is not set
## -lwys l set line width ordinate scale
-ch h set character height for elements for which no specific height
can be set
#
# title control options
-title n set title for plot to 'n'
......
......@@ -30,11 +30,12 @@
* - 30/01/2007 V1.0 Thomas Forbriger
* - 23/10/2009 V1.1 introduced prepend annotations
* - 05/03/2015 V1.2 take description texts from text files
* - 15/05/2019 V1.3 support adjustment of character height
*
* ============================================================================
*/
#define STUPLOXX_VERSION \
"STUPLOXX V1.2 Plot time series data"
"STUPLOXX V1.3 Plot time series data"
#include <unistd.h>
#include <stdlib.h>
......@@ -196,6 +197,7 @@ int main(int iargc, char* argv[])
globalsettings.set_labr(cmdline.optset(25));
globalsettings.set_datesep(cmdline.string_arg(26));
globalsettings.set_lyd(cmdline.double_arg(27));
globalsettings.set_ch(cmdline.double_arg(28));
/*----------------------------------------------------------------------*
* step 3: extract command line parameters
......
......@@ -50,6 +50,7 @@ usage: stuploxx [-v] [-D] [-device dev]
# [-lwys l]
# options to control plot title
[-title t] [-tstitle v]
[-ch h]
# options to control panel labels
[-labu] [-labc] [-labe] [-labh v] [-labr]
# further options
......
......@@ -32,11 +32,12 @@
* - 10/04/2008 V1.1 when chart stepping: replot old sample at new offset
* - 18/01/2011 V1.2 pgplot::Trange::total() was renamed
* - 17/03/2015 V1.3 adjust libpgplotxx interface
* - 15/05/2019 V1.4 support adjustment of character height
*
* ============================================================================
*/
#define STUPLO_WINDOWPANEL_CC_VERSION \
"STUPLO_WINDOWPANEL_CC V1.1 (17-03-2015)"
"STUPLO_WINDOWPANEL_CC V1.4 (2019-05-15)"
#include <tfxx/error.h>
#include <tfxx/misc.h>
......@@ -165,8 +166,10 @@ namespace stuplo {
boxstyle.setmode(Fxlabels, Fxselect);
boxstyle.setmode(Fxticks, Fselect|Fticksinvert|Fticksminor|Fticksmajor);
boxstyle.setmode(Fxtime, Fselect|Ftimesuper|Ftimemod24|Ftimeomitzeros);
dev.sch(globalsettings.ch());
boxstyle(dev);
}
dev.sch(globalsettings.ch());
dev.mtxt("B", 2.8, 0.5, 0.5, Mlabel.c_str());
dev.unsa();
} // void TimeAxisWindowPanel::plot() const
......@@ -215,6 +218,7 @@ namespace stuplo {
boxstyle.setmode(Fylabels, Fselect, false);
boxstyle.setmode(Fyticks, Fselect, false);
}
dev.sch(globalsettings.ch());
boxstyle(dev);
// print ordinate scale
dev.save();
......@@ -359,6 +363,7 @@ namespace stuplo {
dev.unsa();
if (ylabel != std::string(Cstringnotspecified))
{
dev.sch(globalsettings.ch());
dev.mtxt("L", globalsettings.lyd(), 0.5, 0.5, ylabel.c_str());
}
} // if (Mpanel.ntraces()>0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment