Changeset 8847


Ignore:
Timestamp:
01/31/08 13:58:30 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy
Files:
6 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/Changelog

    r8844 r8847  
    1111     videodev/Camera.[h,cc]:
    1212     - renamed MyThreadX to MThread
     13
     14   * Makefile:
     15     - removed include of mvideo
     16
     17   * videodev/Makefile:
     18     - removed include of mvideo
     19     - added class MVideo
     20
     21   * videodev/MVideo.[h,cc]:
     22     - added
     23
     24   * base/coord.h, base/log.h, base/threads.h:
     25     - obsolete -> removed
     26
     27   * catalog/SaoFile.h, catalog/SlaPlanets.h, catalog/SlaStars.[h,cc],
     28     catalog/Slalib.[h,cc], catalog/StarCatalog.h, gui/MGAccuracy.cc,
     29     gui/MGCoordinates.cc, gui/MGCosy.cc, gui/MGPngReader.cc,
     30     gui/MGSkyPosition.cc, gui/MGVelocity.cc, main/MStargHistograms.[h,cc],
     31     main/MStarguider.cc, main/MTracking.h, tcpip/MDriveCom.cc,
     32     tpoint/TPointIncl.h:
     33     - revised includes
     34     - revised global defines in header files
     35
     36   * videodev/Writer.[h,cc]:
     37     - revised includes
     38     - replaced XY by TVector2
    1339
    1440

  • trunk/MagicSoft/Cosy/catalog/SlaPlanets.h

    r1758 r8847  
    1 #ifndef SLAPLANETS_H
    2 #define SLAPLANETS_H
     1#ifndef COSY_SlaPlanets
     2#define COSY_SlaPlanets
    33
    4 #ifndef SLALIB_H
     4#ifndef COSY_Slalib
    55#include "Slalib.h"
     6#endif
     7
     8#ifndef MARS_MPointing
     9#include "MPointing.h"
    610#endif
    711

  • trunk/MagicSoft/Cosy/catalog/SlaStars.cc

    r8818 r8847  
    22
    33#include "slalib.h"
     4
     5#include "MPointing.h"
    46
    57ClassImp(SlaStars);

  • trunk/MagicSoft/Cosy/catalog/SlaStars.h

    r2615 r8847  
    1 #ifndef SLASTARS_H
    2 #define SLASTARS_H
     1#ifndef COSY_SlaStars
     2#define COSY_SlaStars
    33
     4#ifndef COSY_Slalib
    45#include "Slalib.h"
     6#endif
    57
    6 #include "coord.h"
     8#ifndef MARS_MPointing
     9#include "MPointing.h"
     10#endif
    711
    812class SlaStars : public Slalib

  • trunk/MagicSoft/Cosy/catalog/Slalib.cc

    r8818 r8847  
    44#include <iostream>  // cout
    55
    6 #include "coord.h"
     6#include "MPointing.h"
    77
    88#include "slalib.h"

  • trunk/MagicSoft/Cosy/catalog/Slalib.h

    r3897 r8847  
    1 #ifndef SLALIB_H
    2 #define SLALIB_H
     1#ifndef COSY_Slalib
     2#define COSY_Slalib
    33
    4 #include <TROOT.h>
     4#ifndef MARS_MTime
     5#include "MTime.h"
     6#endif
    57
    6 #include "coord.h"
    7 #include "MTime.h"
     8#ifndef MARS_MObservatory
    89#include "MObservatory.h"
     10#endif
     11
     12class ZdAz;
    913
    1014class Slalib : public MObservatory

  • trunk/MagicSoft/Cosy/catalog/StarCatalog.h

    r8818 r8847  
    88#include <GuiTypes.h>
    99#endif
    10 #ifndef SAOFILE_H
    11 #include "SaoFile.h"
    12 #endif
    13 #ifndef SLASTARS_H
     10#ifndef COSY_SlaStars
    1411#include "SlaStars.h"
    1512#endif
    16 
    17 #include "coord.h"
    1813
    1914typedef unsigned char byte;

  • trunk/MagicSoft/Cosy/gui/MGAccuracy.cc

    r8376 r8847  
    1111#include <TCanvas.h>
    1212
    13 #include "coord.h"
    1413#include "MTime.h"
    1514#include "MAstro.h"
     15#include "MPointing.h"
    1616
    1717ClassImp(MGAccuracy);

  • trunk/MagicSoft/Cosy/gui/MGCoordinates.cc

    r8376 r8847  
    1010
    1111#include "MGCoordinate.h"
    12 #include "coord.h"
    1312
    1413ClassImp(MGCoordinates);

  • trunk/MagicSoft/Cosy/gui/MGCosy.cc

    r8838 r8847  
    33#include <iomanip>
    44#include <fstream>
    5 
    6 #include <TROOT.h>
    75
    86#include <TGTab.h>         // TGTab
    … …  
    3634
    3735#include "SlaStars.h"
    38 /*
    39 #include "msgqueue.h"
    40 #include "coord.h"
    41 #include "slalib.h"
    42 */
    4336
    4437#define DEBUG

  • trunk/MagicSoft/Cosy/gui/MGPngReader.cc

    r8814 r8847  
    66
    77#include <TTimer.h>
     8
     9#include <TH1.h>
     10#include <TH2.h>
     11#include <TGraph.h>
     12#include <TCanvas.h>
     13
     14#include <TFile.h>
     15#include <TTree.h>
     16#include <TBranch.h>
    817
    918#include <TGMenu.h>
    … …  
    1726#include "MGDispCoordinates.h"
    1827
    19 #include "coord.h"
    20 
    2128#include "StarCatalog.h"
    2229
    … …  
    2835
    2936#include "MStarList.h"
    30 
    31 #include <TH1.h>
    32 #include <TH2.h>
    33 #include <TGraph.h>
    34 #include <TCanvas.h>
    35 
    36 #include <TFile.h>
    37 #include <TTree.h>
    38 #include <TBranch.h>
    3937
    4038#include "Led.h"

  • trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

    r8818 r8847  
    1515#include <TCanvas.h>
    1616
    17 #include "coord.h"
    1817#include "MAstro.h"
    1918#include "SlaStars.h"

  • trunk/MagicSoft/Cosy/gui/MGVelocity.cc

    r4076 r8847  
    1818#include <TCanvas.h>
    1919
    20 #include "coord.h"
    21 
    2220ClassImp(MGVelocity);
    2321

  • trunk/MagicSoft/Cosy/main/MStargHistograms.cc

    r8376 r8847  
    1313
    1414#include "MTime.h"
     15#include "MPointing.h"
    1516
    1617#include "Led.h"
    … …  
    2021#include "FilterLed.h"
    2122#include "MStarList.h"
    22 
    23 #include "coord.h"
    2423
    2524using namespace std;

  • trunk/MagicSoft/Cosy/main/MStargHistograms.h

    r7764 r8847  
    4040    MStargHistograms() : fFile(NULL)
    4141    {
    42  
    43     }
    44 
    45     ~MStargHistograms()
    46     {
    47    
    4842    }
    4943
    … …  
    5145              Ring &center, /*ZdAz &centerzdaz,*/ ZdAz &star, Double_t bright,
    5246              const ZdAz &pos, const MTime &t);
    53    
     47
    5448    void OpenFile();
    5549    void CloseFile();

  • trunk/MagicSoft/Cosy/main/MStarguider.cc

    r8838 r8847  
    3939#include "MGImage.h"
    4040#include "MGCoordinates.h"
    41 
    42 #include "coord.h"
    4341
    4442#include "Camera.h"

  • trunk/MagicSoft/Cosy/main/MTracking.h

    r8843 r8847  
    11#ifndef COSY_MTracking
    22#define COSY_MTracking
    3 
    4 #include "coord.h"
    53
    64#ifndef COSY_MSlewing
    … …  
    1210#endif
    1311
     12class RaDec;
    1413class SlaStars;
    1514

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

    r8378 r8847  
    33#include <iostream>
    44
    5 #include "coord.h"
    65#include "MAstro.h"
    76#include "MCosy.h"

  • trunk/MagicSoft/Cosy/tpoint/TPointIncl.h

    r8823 r8847  
    11#ifndef __CINT__
    22
    3 #include "coord.h"
    4 
    53#endif // __CINT__

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

    r8378 r8847  
    44#include <fstream>  // ofstream
    55
     6#include <TVector2.h>
     7
    68#include <stdio.h>    // FILE
    79#include <png.h>
    8 #include <coord.h>
    910
    1011#include "MTime.h"
    … …  
    1516
    1617void Writer::Png(const char *fname, const byte *buf,
    17                  struct timeval *date, const XY xy)
     18                 struct timeval *date, const TVector2 xy)
    1819{
    1920    MTime t(*date);
    … …  
    139140}
    140141
    141 void Writer::Ppm(const char *fname, const byte *img, struct timeval *date, const XY xy)
     142void Writer::Ppm(const char *fname, const byte *img, struct timeval *date, const TVector2 xy)
    142143{
    143144    TString name = fname;

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

    r8810 r8847  
    99#endif
    1010
    11 #ifndef COORD_H
    12 #include <coord.h>
    13 #endif
     11class TVector2;
    1412
    1513typedef unsigned char byte;
    … …  
    2220    virtual ~Writer() { }
    2321
    24     static void Ppm(const char *fname, const byte *img, struct timeval *date, const XY xy);
    25     static void Png(const char *fname, const byte *buf, struct timeval *date, const XY xy);
     22    static void Ppm(const char *fname, const byte *img, struct timeval *date, const TVector2 xy);
     23    static void Png(const char *fname, const byte *buf, struct timeval *date, const TVector2 xy);
    2624
    2725    ClassDef(Writer, 0)
Note: See TracChangeset for help on using the changeset viewer.