Commit 79803670 authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

trace selection requires skiptrace

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 4585
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 5eb61d47
...@@ -42,11 +42,12 @@ ...@@ -42,11 +42,12 @@
* - 02/08/2007 V1.5 explain results line * - 02/08/2007 V1.5 explain results line
* - 11/02/2011 V1.6 add definition of traces * - 11/02/2011 V1.6 add definition of traces
* - 20/02/2012 V1.7 read and write any file format (damb) * - 20/02/2012 V1.7 read and write any file format (damb)
* trace selecttion requires skiptrace (thof)
* *
* ============================================================================ * ============================================================================
*/ */
#define SIGFIT_VERSION \ #define SIGFIT_VERSION \
"SIGFIT V1.6 fit signal by trial-signals" "SIGFIT V1.7 fit signal by trial-signals"
#define SIGFIT_CVSID \ #define SIGFIT_CVSID \
"$Id$" "$Id$"
...@@ -375,8 +376,9 @@ int main(int iargc, char* argv[]) ...@@ -375,8 +376,9 @@ int main(int iargc, char* argv[])
while (is.good()) while (is.good())
{ {
Tbundle bundle; Tbundle bundle;
// traces were selected by tracekey bool readthistrace=true;
if (selectedTraces && rangeList.contains(traceNum)) if (selectedTraces) { readthistrace=rangeList.contains(traceNum); }
if (readthistrace)
{ {
if (opt.verbose) if (opt.verbose)
{ {
...@@ -389,20 +391,10 @@ int main(int iargc, char* argv[]) ...@@ -389,20 +391,10 @@ int main(int iargc, char* argv[])
{ {
cout << " " << bundle.header.line().substr(0,69) << endl; cout << " " << bundle.header.line().substr(0,69) << endl;
} }
} else }
// no selection by tracekey -> read every single trace else
{ {
if (opt.verbose) is.skiptrace();
{
cout << "sigfit: Reading trace #" << traceNum << " ..." << endl;
}
is >> bundle;
is >> bundle.header;
bundlevec.push_back(bundle);
if (opt.verbose)
{
cout << " " << bundle.header.line().substr(0,69) << endl;
}
} }
++traceNum; ++traceNum;
} }
......
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