Ignore:
Timestamp:
03/02/03 16:55:47 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy/gui
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/gui/GuiLinkDef.h

    r1109 r1802  
    1919#pragma link C++ class MGCosy+;
    2020#pragma link C++ class MGStarguider+;
     21#pragma link C++ class MGPngReader+;
    2122
    2223#endif

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

    r1758 r1802  
    7373
    7474MGStarguider::MGStarguider(MObservatory::LocationName_t key)
    75 : Camera(), TGMainFrame(gClient->GetRoot(), 768, 700), fObservatory(key), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2)
    76 {
    77     gVirtualX->GrabButton(fId, kButton2, /*kButtonPressMask|kButtonReleaseMask|*/kNone, kNone, kNone, kNone);
     75: TGMainFrame(gClient->GetRoot(), 768, 700), fObservatory(key), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2)
     76{
     77    gVirtualX->GrabButton(fId, kButton2, 0, 0, 0, 0, kTRUE);
    7878
    7979
    … …  
    233233MGStarguider::~MGStarguider()
    234234{
     235    gVirtualX->GrabButton(0, kButton2, 0, 0, 0, 0, kFALSE);
     236
    235237    fTimer->TurnOff();
    236238    delete fTimer;
    … …  
    252254    cout << "EventDisplay::CloseWindow: Exit Application Loop." << endl;
    253255
    254     ExitLoop();
     256    /*ExitLoop();*/
     257    //cout << "FIXME: ExitLoop not called!!!!!!" << endl;
    255258
    256259    gSystem->ExitLoop();

  • trunk/MagicSoft/Cosy/gui/MGStarguider.h

    r1758 r1802  
    55#include <TGFrame.h>
    66#endif
    7 #ifndef CAMERA_H
    8 #include "Camera.h"
    9 #endif
     7#include "PixClient.h"
    108
    119#include "MGList.h"
    … …  
    3129class MStarList;
    3230
    33 class MGStarguider : public Camera, public TGMainFrame
     31class MGStarguider : public PixClient, public TGMainFrame
    3432{
    3533private:

  • trunk/MagicSoft/Cosy/gui/Makefile

    r1110 r1802  
    2121
    2222INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl \
    23            -I../catalog -I../videodev -I../main
     23           -I../catalog -I../videodev -I../main -I../caos
    2424
    2525# @code
    … …  
    4040           MGVelocity.cc \
    4141           MGStarguider.cc \
    42            MGSkyPosition.cc
     42           MGPngReader.cc \
     43           MGSkyPosition.cc \
     44           MGMenu.cc
    4345
    4446SRCS        = $(SRCFILES)
Note: See TracChangeset for help on using the changeset viewer.