Changeset 816 in ntrip


Ignore:
Timestamp:
Apr 9, 2008, 3:35:54 PM (16 years ago)
Author:
mervart
Message:

* empty log message *

Location:
trunk/BNS
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNS/bns.cpp

    r812 r816  
    4747  connect(_clkServer, SIGNAL(newConnection()),this, SLOT(slotNewConnection()));
    4848
    49   // Socket for outputting the results
    50   // ---------------------------------
     49  // Socket and file for outputting the results
     50  // -------------------------------------------
    5151  _outSocket = 0;
    52   _outFile   = 0;
    53   QFile outFile(settings.value("outFile").toString());
    54   if (outFile.open(QFile::WriteOnly | QFile::Truncate)) {
    55     _outFile = new QTextStream(&outFile);
     52
     53  QString outFileName = settings.value("outFile").toString();
     54  if (outFileName.isEmpty()) {
     55    _outFile = 0;
     56  }
     57  else {
     58    _outFile = new QFile(outFileName);
     59    if (_outFile->open(QIODevice::WriteOnly)) {
     60      _outStream = new QTextStream(_outFile);
     61    }
    5662  }
    5763
    5864  // Log File
    5965  // --------
    60   _logFile   = 0;
    61   QFile logFile(settings.value("logFile").toString());
    62   if (logFile.open(QFile::WriteOnly | QFile::Truncate)) {
    63     _logFile = new QTextStream(&logFile);
     66  QString logFileName = settings.value("logFile").toString();
     67  if (logFileName.isEmpty()) {
     68    _logFile = 0;
     69  }
     70  else {
     71    _logFile = new QFile(logFileName);
     72    if (_logFile->open(QIODevice::WriteOnly)) {
     73      _logStream = new QTextStream(_logFile);
     74    }
    6475  }
    6576}
    … …  
    7283  ///  delete _clkSocket;
    7384  delete _outSocket;
     85  delete _outStream;
     86  delete _logStream;
    7487  delete _outFile;
    7588  delete _logFile;
    … …  
    95108////////////////////////////////////////////////////////////////////////////
    96109void t_bns::slotMessage(const QByteArray msg) {
    97   if (_logFile) {
    98     *_logFile << msg << endl;
     110  if (_logStream) {
     111    *_logStream << msg << endl;
    99112  }
    100113  emit(newMessage(msg));
    … …  
    104117////////////////////////////////////////////////////////////////////////////
    105118void t_bns::slotError(const QByteArray msg) {
    106   if (_logFile) {
    107     *_logFile << msg << endl;
     119  if (_logStream) {
     120    *_logStream << msg << endl;
    108121  }
    109122  deleteBnsEph();
    … …  
    139152
    140153  QByteArray ans = _outSocket->readLine();
     154
     155  cout << "Ans: >" << ans.data() << "<" << endl;
    141156
    142157  if (ans.indexOf("OK") == -1) {
    … …  
    271286               int(ep->IODC), int(ep->IODE), dClk, rsw(1), rsw(2), rsw(3));
    272287 
    273   if (_outFile) {
    274     *_outFile << line;
     288  if (_outStream) {
     289    *_outStream << line;
    275290  }
    276291  if (_outSocket) {

  • trunk/BNS/bns.h

    r812 r816  
    5252  QTcpSocket*               _clkSocket;
    5353  QTcpSocket*               _outSocket;
    54   QTextStream*              _outFile;
    55   QTextStream*              _logFile;
     54  QFile*                    _outFile;
     55  QFile*                    _logFile;
     56  QTextStream*              _outStream;
     57  QTextStream*              _logStream;
    5658  t_bnseph*                 _bnseph;
    5759  QMutex                    _mutex;

  • trunk/BNS/bns.pro

    r810 r816  
    22# Switch to debug configuration
    33# -----------------------------
    4 ### CONFIG -= release
    5 ### CONFIG += debug
     4CONFIG -= release
     5CONFIG += debug
    66
    77RESOURCES += bns.qrc
Note: See TracChangeset for help on using the changeset viewer.