Changeset 2514 for trunk


Ignore:
Timestamp:
11/14/03 14:07:13 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/Changelog

    r2407 r2514  
    11                                                                  -*-*- END -*-*-
     2 2003/11/14 - Thomas Bretz (La Palma)
     3
     4   * gui/MGCosy.cc:
     5     - replaced a wrong 'h' (dec) by 'd'
     6     
     7   * gui/MGImage.[h,cc]:
     8     - replaced 32 by 24
     9     
     10   * tcpip/MCeCoCom.[h,cc]:
     11     - added fHumidity and fTemperature
     12     
     13   * tcpip/MTcpIpIO.cc:
     14     - added DEBUG directive
     15
     16
     17
    218 2003/10/20 - Thomas Bretz
    319 
    … …  
    3046
    3147
    32      
     48
    3349 2003/10/15 - Thomas Bretz (La Palma)
    3450 

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

    r2384 r2514  
    215215
    216216    fRaEst  = new TGLabel(f, "+000h 00.0m");
    217     fDecEst = new TGLabel(f, "+000h 00.0m");
     217    fDecEst = new TGLabel(f, "+000d 00.0m");
    218218    fRaSoll = new TGLabel(f, "+000h 00.0m");
    219     fDecSoll = new TGLabel(f, "+000h 00.0m");
    220     fZdSoll = new TGLabel(f, "+000h 00.0m");
    221     fAzSoll = new TGLabel(f, "+000h 00.0m");
     219    fDecSoll = new TGLabel(f, "+000d 00.0m");
     220    fZdSoll = new TGLabel(f, "+000d 00.0m");
     221    fAzSoll = new TGLabel(f, "+000d 00.0m");
    222222    fRaEst->SetTextJustify(kTextRight);
    223223    fDecEst->SetTextJustify(kTextRight);
    … …  
    931931        deci = (int)test.Dec();
    932932        //sprintf(text, "%c%dd %.1fm", rd.Dec()<0?'-':'+' , abs((int)rd.Dec()), 0.1*(abs((int)test.Dec())%600));
    933         sprintf(text, "%c%dh %.1fm", sd, d, dm);
     933        sprintf(text, "%c%dd %.1fm", sd, d, dm);
    934934        fDecEst->SetText(new TGString(text));
    935935    }
    … …  
    961961        decs = (int)test.Dec();
    962962        //sprintf(text, "%c%dd %.1fm", radec.Dec()<0?'-':'+' , abs((int)radec.Dec()), 0.1*(abs((int)test.Dec())%600));
    963         sprintf(text, "%c%dh %.1fm", sd, d, dm);
     963        sprintf(text, "%c%dd %.1fm", sd, d, dm);
    964964        fDecSoll->SetText(new TGString(text));
    965965    }

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

    r2388 r2514  
    9696}
    9797
    98 void MGImage::DrawImg32(char *d, char *s, char *e)
     98void MGImage::DrawImg24(char *d, char *s, char *e)
    9999{
    100100    // d=destination, s=source, e=end
    … …  
    110110}
    111111
    112 void MGImage::DrawColImg32(char *d, char *s1, char *s2, char *e)
     112void MGImage::DrawColImg24(char *d, char *s1, char *s2, char *e)
    113113{
    114114    // d=destination, s1=source1, s2=source2, e=end
    … …  
    147147        DrawImg16((unsigned short*)fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
    148148        break;
    149     case 32:
    150         DrawImg32(fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
     149    case 24:
     150        DrawImg24(fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
    151151        break;
    152152    default:
    … …  
    179179    switch (gVirtualX->GetDepth())
    180180    {
    181     case 32:
     181    case 24:
    182182        DrawColImg32(fImage->data, (char*)gbuf, (char*)cbuf, (char*)(gbuf+fWidth*fHeight));
    183183        break;

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

    r2388 r2514  
    3636
    3737    void DrawImg16(unsigned short *d, char *s, char *e);
    38     void DrawImg32(char *d, char *s, char *e);
    39     void DrawColImg32(char *d, char *s1, char *s2, char *e);
     38    void DrawImg24(char *d, char *s, char *e);
     39    void DrawColImg24(char *d, char *s1, char *s2, char *e);
    4040
    4141public:

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

    r2384 r2514  
    6565        cout << "Hum: " << hum << "%" << endl;
    6666
     67        fHumidity = hum;
     68        fTemperature = temp;
     69
    6770        fComStat = kCmdReceived;
    6871        return true;

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

    r2384 r2514  
    3131    ComStatus_t fComStat; // communication status
    3232
     33    Float_t fHumidity;    // [%]
     34    Float_t fTemperature; // degrees celsius
     35
    3336    virtual bool InterpreteCmd(TString cmd, TString str);
    3437
    … …  
    4346    bool Send(const char *str);
    4447    void SetStatus(Byte_t s) { fStatus=s; }
     48
     49    Float_t GetHumidity() const { return fHumidity; }
     50    Float_t GetTemperature() const { return fTemperature; }
    4551};
    4652

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

    r2384 r2514  
    66#include <TSocket.h>
    77#include <TServerSocket.h>
     8
     9#undef DEBUG
    810
    911using namespace std;
    … …  
    7173        return false;
    7274    }
    73 
     75#ifdef DEBUG
    7476    cout << "Tx: " << msg << flush;
    75 
     77#endif
    7678    return true;
    7779}
Note: See TracChangeset for help on using the changeset viewer.