Commit 2129df10 authored by thomas.forbriger's avatar thomas.forbriger
Browse files

Merge branch 'master' into cross

parents 5d8cee82 bfd8a465
......@@ -9,6 +9,9 @@ Recent development in Seitosh (bug fixes, new features, etc)
reading and writing of any of the specific classes may be displayed, without
the need to implement specific debug functions.
Fix (d0d054df6): use signed integer when addressing series elements in
oasciistream output function.
16.11.2016 (840f7e310): stuplo, stuplox
Provide new option -st which adjusts sample time relative to source time.
......
......@@ -124,8 +124,12 @@ namespace datrw {
void oasciistream::writetrace(const Tdseries::Tcoc& series)
{
DATRW_debug(Mdebug, "oasciistream::writetrace (double)",
DATRW_value(series.f()) << ", "
DATRW_value(series.l()) << ", "
DATRW_value(Mprecision));
this->writetraceheader(series.size(),ascii::keydouble);
for (unsigned int i=series.first(); i<=series.last(); ++i)
for (int i=series.first(); i<=series.last(); ++i)
{
Mos.precision(Mprecision);
Mos << series(i) << "\n";
......@@ -137,8 +141,12 @@ namespace datrw {
void oasciistream::writetrace(const Tfseries::Tcoc& series)
{
DATRW_debug(Mdebug, "oasciistream::writetrace (float)",
DATRW_value(series.f()) << ", "
DATRW_value(series.l()) << ", "
DATRW_value(Mprecision));
this->writetraceheader(series.size(),ascii::keyfloat);
for (unsigned int i=series.first(); i<=series.last(); ++i)
for (int i=series.first(); i<=series.last(); ++i)
{
Mos.precision(Mprecision);
Mos << series(i) << "\n";
......@@ -150,8 +158,11 @@ namespace datrw {
void oasciistream::writetrace(const Tiseries::Tcoc& series)
{
DATRW_debug(Mdebug, "oasciistream::writetrace (int)",
DATRW_value(series.f()) << ", "
DATRW_value(series.l()));
this->writetraceheader(series.size(),ascii::keyint);
for (unsigned int i=series.first(); i<=series.last(); ++i)
for (int i=series.first(); i<=series.last(); ++i)
{
Mos << series(i) << "\n";
}
......
......@@ -48,6 +48,7 @@ namespace datrw {
* \param providesd \c true, if stream provides \c double type series
* \param providesf \c true, if stream provides \c float type series
* \param providesi \c true, if stream provides \c int type series
* \param debug \c true, to select debug mode on a base class level
*/
idatstream::idatstream(std::istream& is,
const bool& providesd,
......
......@@ -82,6 +82,7 @@ namespace datrw {
* defines receiver properties; this parameter is stored and
* returned to the user upon request through
* datrw::odatstream::handlesinfo()
* \param debug set debug mode on a base class level
*/
odatstream::odatstream(std::ostream& os,
const Edatatype& datatype,
......
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