Changeset 924


Ignore:
Timestamp:
09/06/01 10:59:19 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy
Files:
12 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/Changelog

    r921 r924  
    11                                                                  -*-*- END -*-*-
     2 2001/09/06 - Thomas Bretz:
     3
     4   * MCosy.[cc,h]
     5     - moved to main
     6     - moved logging files to log dir
     7     
     8   * MStarguider.[h,cc]
     9     - moved to main
     10   
     11   * Starguider.[h,cc]:
     12     - renamed to MGStarguider.[h,cc]
     13     - moved to gui dir
     14     
     15   * cosy.cc:
     16     - moved logging file to log dir
     17     
     18   * starg.cc:
     19     - removed InitGui stuff
     20
     21
     22
    223 2001/08/30 - Thomas Bretz:
    324 

  • trunk/MagicSoft/Cosy/Makefile

    r914 r924  
    2323SOLIB    =
    2424CINT     = M
    25 INCLUDES = -I. -Iincl -Ibase -Igui -Idevdrv -Icandrv -Ivideodev -Icatalog
     25INCLUDES = -I. -Imain  -Ibase -Icandrv -Iincl -Igui -Ivideodev -Icatalog
    2626LIBS     = -lpng -lz -L/usr/X11R6/lib -lpthread
    2727
    … …  
    3838#
    3939SUBDIRS = \
     40        main     \
    4041        gui      \
    4142        candrv   \
    … …  
    5253.SUFFIXES: .c .cc .h .o
    5354
    54 SRCFILES = MCosy.cc Starguider.cc
     55SRCFILES =
    5556
    5657SRCS    = $(SRCFILES)
    … …  
    112113        @cd catalog; make mrproper; cd ..
    113114        @echo "cd .."
     115        @echo "cd main"
     116        @cd main; make mrproper; cd ..
     117        @echo "cd .."
    114118
    115119tar:    mrproper

  • trunk/MagicSoft/Cosy/cosy.cc

    r920 r924  
    1 #include "MCosy.h"
    2 
    31#include <iomanip.h>
    42#include <fstream.h>
    … …  
    97#include <TApplication.h>
    108
     9#include "MCosy.h"
    1110#include "MLogManip.h"
    1211#include "base/timer.h"
    … …  
    2322    // this must move to MGCosy !!!! (or MApplication)
    2423    //
    25     MLog lout("cosy.log", kTRUE);
     24    MLog lout("log/cosy.log", kTRUE);
    2625
    2726    clog("Starting Cosy at " << time.GetTimeStr() << " ...");

  • trunk/MagicSoft/Cosy/devdrv/shaftencoder.h

    r921 r924  
    5959    void DisplayVal();
    6060
    61     bool IsPosHasChanged() const { return fPosHasChanged; }
     61    bool PosHasChanged() const { return fPosHasChanged; }
    6262    void ResetPosHasChanged() { fPosHasChanged = false; }
    6363};

  • trunk/MagicSoft/Cosy/gui/Makefile

    r913 r924  
    2020# @endcode
    2121
    22 INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl -I../catalog
     22INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl \
     23           -I../catalog -I../videodev
    2324
    2425# @code
    … …  
    3839           MGAccuracy.cc \
    3940           MGVelocity.cc \
     41           MGStarguider.cc \
    4042           MGSkyPosition.cc
    4143

  • trunk/MagicSoft/Cosy/starg.cc

    r738 r924  
    44#include <TApplication.h>
    55
    6 #include "Starguider.h"
     6#include "MGStarguider.h"
    77
    88/* ---------------------------------------------------------------------- */
    99
    10 extern void InitGui();
    11 VoidFuncPtr_t initfuncs[] = { InitGui, 0 };
     10//extern void InitGui();
     11//VoidFuncPtr_t initfuncs[] = { InitGui, 0 };
    1212
    1313int main(int argc, char **argv)
    1414{
    15     TROOT root("GUI", "GUI test environement", initfuncs);
     15    TROOT root("GUI", "GUI test environement"); //, initfuncs);
    1616
    1717    TApplication app("Starguider", &argc, argv);
    1818
    19     Starguider starg;
     19    MGStarguider starg;
    2020
    2121    starg.Loop(0);
Note: See TracChangeset for help on using the changeset viewer.