Changeset 8378 for trunk/MagicSoft/Cosy


Ignore:
Timestamp:
03/14/07 19:19:45 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/Changelog

    r8377 r8378  
    1010     gui/MGSkyPosition.cc, main/MBending.cc, main/MStargHistograms.cc,
    1111     base/coord.h, main/MCaos.cc, main/MCosy.cc, main/MPointing.cc,
    12      main/MStarguider.cc, main/MTracking.cc:
     12     main/MStarguider.cc, main/MTracking.cc, videodev/FilterLed.cc,
     13     videodev/PixClient.cc, videodev/PngReader.cc, videodev/Writer.cc:
    1314     - replaced obsolete .h by C++ headers
    1415     - added namespace std
    … …  
    2122     - fixed warning about overwriting of Print()
    2223
    23    * base/MTimeout.cc, candrv/nodedrv.cc, devdrv/macs.cc:
    24      - fixed default argument is declaration
     24   * base/MTimeout.cc, candrv/nodedrv.cc, devdrv/macs.cc,
     25     tcpip/MCeCoCom.cc:
     26     - fixed default argument in declaration
    2527
    2628   * catalog/StarCatalog.cc, gui/MGAccuracy.cc, main/MCaos.[h,cc],
    … …  
    3133   * gui/MGCoordinate.cc, gui/MGCosy.cc:
    3234     - fixed a warning about double declaration
     35
     36   * tcpip/MCeCoCom.h:
     37     - renamed Send to SendRep
     38
     39   * tcpip/MDriveCom.cc:
     40     - replaced Send by SendRep
     41
     42   * tcpip/MTcpIpIO.cc:
     43     - added missing return
    3344
    3445

  • trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

    r6844 r8378  
    9191}
    9292
    93 bool MCeCoCom::Send(const char *cmd, const char *str, bool force=kFALSE)
     93bool MCeCoCom::SendRep(const char *cmd, const char *str, bool force)
    9494{
    9595    MTime t;

  • trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

    r4865 r8378  
    4949    }
    5050
    51     bool Send(const char *cmd, const char *str, bool force);
     51    bool SendRep(const char *cmd, const char *str, bool force);
    5252    void SetStatus(Byte_t s) { fStatus=s; }
    5353

  • trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

    r7788 r8378  
    262262    str += txt.Print("%08.3f", er.Az());
    263263
    264     return Send("DRIVE-REPORT", str, kFALSE);
     264    return SendRep("DRIVE-REPORT", str, kFALSE);
    265265}
    266266
    267267bool MDriveCom::SendStatus(const char *stat)
    268268{
    269     return Send("DRIVE-STATUS", stat, kFALSE);
     269    return SendRep("DRIVE-STATUS", stat, kFALSE);
    270270}
    271271
    … …  
    302302    str += txt.Print("%04d ", num);               //number of detected stars
    303303
    304     return Send("STARG-REPORT", str, kTRUE);
    305 }
     304    return SendRep("STARG-REPORT", str, kTRUE);
     305}

  • trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

    r7790 r8378  
    112112{
    113113    cout << "Rx: " << str << flush;
     114    return true;
    114115}
    115116

  • trunk/MagicSoft/Cosy/videodev/PixClient.cc

    r1802 r8378  
    11#include "PixClient.h"
    22
    3 #include <iostream.h>
     3#include <iostream>
     4
     5using namespace std;
    46
    57void PixClient::ProcessFrame(const unsigned long n, byte *img,

  • trunk/MagicSoft/Cosy/videodev/PngReader.cc

    r1804 r8378  
    22#include "PixClient.h"
    33
    4 #include <iostream.h>
     4#include <iostream>
    55#include <stdio.h>
    66#include <stdlib.h>
    … …  
    2323
    2424ClassImp(PngReader);
     25
     26using namespace std;
    2527
    2628char *PngReader::GetImg(unsigned int frame)

  • trunk/MagicSoft/Cosy/videodev/Writer.cc

    r4888 r8378  
    11#include "Writer.h"
    22
    3 #include <iostream.h> // cout
    4 #include <fstream.h>  // ofstream
     3#include <iostream> // cout
     4#include <fstream>  // ofstream
    55
    66#include <stdio.h>    // FILE
    … …  
    1111
    1212ClassImp(Writer);
     13
     14using namespace std;
    1315
    1416void Writer::Png(const char *fname, const byte *buf,
Note: See TracChangeset for help on using the changeset viewer.