Changeset 2068 for trunk


Ignore:
Timestamp:
05/05/03 17:01:06 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Cosy/Changelog

    r2019 r2068  
    11                                                                  -*-*- END -*-*-
     2 2003/05/05 - Thomas Bretz
     3
     4   * gui/MGCosy.[h,cc]:
     5     - exchanged TGListBox for logging by TGTextView
     6
     7
     8
    29 2003/04/28 - Thomas Bretz
    310
  • trunk/MagicSoft/Cosy/gui/MGCosy.cc

    r1953 r2068  
    1010#include <TGTab.h>         // TGTab
    1111#include <TGMenu.h>        // TGPopupMenu
    12 #include <TGButton.h>      // TGButton
     12#include <TGFrame.h>       // TGGroupFrame
    1313#include <TSystem.h>       // gSystem
    1414#include <TGLabel.h>       // TGLabel
    15 #include <TGListBox.h>     // TGListBox
     15#include <TG3DLine.h>      // TGHorizontal3DLine (TGSplitter)
     16#include <TGButton.h>      // TGButton
     17#include <TGTextView.h>    // TGTextView
    1618#include <TGComboBox.h>    // TGComboBox
    17 #include <TG3DLine.h>      // TGHorizontal3DLine (TGSplitter)
    1819#include <TGTextEntry.h>   // TGTextEntry
    19 #include <TGFrame.h>       // TGGroupFrame
    2020#include <TApplication.h>  // gApplication
    2121
     
    621621    fList = new MGList;
    622622
     623    fFont = gVirtualX->LoadQueryFont("7x13bold");
     624
    623625#ifdef DEBUG
    624626    cout << "MGCosy: Creating Menu" << endl;
     
    647649    cout << "MGCosy: Creating MGAccuracy" << endl;
    648650#endif
    649     fAccuracy    = new MGAccuracy   (f1, 300);
     651    fAccuracy = new MGAccuracy(f1, 300);
    650652#ifdef DEBUG
    651653    cout << "MGCosy: Creating MGVelocity" << endl;
    652654#endif
    653     fVelocity    = new MGVelocity   (f2, "Velocity [\"/min]", 300);
     655    fVelocity = new MGVelocity(f2, "Velocity [\"/min]", 300);
    654656//    fOffset      = new MGVelocity   (f, "Offset se-re [']", 300);
    655657
     
    663665#endif
    664666    TGGroupFrame *frame = new TGGroupFrame(f2, "Status");
    665     frame->Resize(300, 300);
    666667    fList->Add(frame);
    667668
    668669#ifdef DEBUG
    669     cout << "MGCosy: Creating TGListBox" << endl;
    670 #endif
    671     fLog = new TGListBox(f2, -1, kSunkenFrame);  //kSunkenFrame|kDoubleBorder,
    672     fLog->Resize(300, 300);
    673     fLog->ChangeBackground(TGFrame::GetBlackPixel());
     670    cout << "MGCosy: Creating TGTextView" << endl;
     671#endif
     672    fLog = new TGTextView(f2, 300, 300);
     673    if (fFont)
     674        fLog->SetFont(fFont);
    674675    fList->Add(fLog);
    675676
     
    743744MGCosy::~MGCosy()
    744745{
     746#ifdef DEBUG
    745747    cout << "MGCosy::~MGCosy called." << endl;
    746 
     748#endif
    747749    delete fLayMenuBar;
    748750    delete fLayMenuItem;
    749 
     751#ifdef DEBUG
    750752    cout << "Deleting MGCosy::fList" << endl;
    751 
     753#endif
    752754    delete fList;
    753 
     755#ifdef DEBUG
     756    cout << "Deleting MGCosy::fFont" << endl;
     757#endif
     758    if (fFont)
     759        gVirtualX->DeleteFont(fFont);
     760#ifdef DEBUG
    754761    cout << "MGCosy::~MGCosy done." << endl;
     762#endif
    755763}
    756764
     
    971979    //    stat&kTracking ? fOffset->MapWindow()   : fOffset->UnmapWindow();
    972980
     981/*
    973982    if (fLog->TestBit(kHasChanged))
    974983    {
     
    976985        fLog->Layout();
    977986        fLog->ResetBit(kHasChanged);
    978     }
     987    }*/
    979988}
    980989// ======================================================================
  • trunk/MagicSoft/Cosy/gui/MGCosy.h

    r1953 r2068  
    1616class TIterator;
    1717
     18class TGTab;
    1819class TGLabel;
     20class TGMenuBar;
     21class TGTextView;
    1922class TGPopupMenu;
    20 class TGMenuBar;
    21 class TGHorizontal3DLine;
    2223class TGLayoutHints;
    2324class TGCompositeFrame;
    24 class TGTab;
    25 class TGListBox;
     25class TGHorizontal3DLine;
    2626
    2727class ZdAz;
     
    2929class MsgQueue;
    3030
     31class MGList;
    3132class MGImage;
    32 class MGList;
     33class MGAccuracy;
     34class MGVelocity;
    3335class MGCoordinates;
    3436class MGSkyPosition;
    35 class MGAccuracy;
    36 class MGVelocity;
    3737
    3838class MGCosy : public TGMainFrame
     
    9595    TGLabel *fAvailSe3;
    9696
    97     TGListBox *fLog;
     97    TGTextView *fLog;
     98
     99    FontStruct_t fFont;
    98100
    99101    void CreateMenu();
     
    126128    TGLabel *GetLabel3() const { return fLabel3; }
    127129
    128     TGListBox *GetLog() const { return fLog; }
     130    TGTextView *GetLog() const { return fLog; }
    129131
    130132    void Update(ZdAz pos, ZdAz acc, ZdAz vel, ZdAz off, RaDec radec, ZdAz soll, UInt_t stat, UInt_t stat2);
Note: See TracChangeset for help on using the changeset viewer.