Index: /trunk/MagicSoft/Cosy/Changelog
===================================================================
--- /trunk/MagicSoft/Cosy/Changelog	(revision 2513)
+++ /trunk/MagicSoft/Cosy/Changelog	(revision 2514)
@@ -1,3 +1,19 @@
                                                                   -*-*- END -*-*-
+ 2003/11/14 - Thomas Bretz (La Palma)
+
+   * gui/MGCosy.cc:
+     - replaced a wrong 'h' (dec) by 'd'
+     
+   * gui/MGImage.[h,cc]:
+     - replaced 32 by 24
+     
+   * tcpip/MCeCoCom.[h,cc]:
+     - added fHumidity and fTemperature
+     
+   * tcpip/MTcpIpIO.cc:
+     - added DEBUG directive
+
+
+
  2003/10/20 - Thomas Bretz
  
@@ -30,5 +46,5 @@
 
 
-     
+
  2003/10/15 - Thomas Bretz (La Palma)
  
Index: /trunk/MagicSoft/Cosy/gui/MGCosy.cc
===================================================================
--- /trunk/MagicSoft/Cosy/gui/MGCosy.cc	(revision 2513)
+++ /trunk/MagicSoft/Cosy/gui/MGCosy.cc	(revision 2514)
@@ -215,9 +215,9 @@
 
     fRaEst  = new TGLabel(f, "+000h 00.0m");
-    fDecEst = new TGLabel(f, "+000h 00.0m");
+    fDecEst = new TGLabel(f, "+000d 00.0m");
     fRaSoll = new TGLabel(f, "+000h 00.0m");
-    fDecSoll = new TGLabel(f, "+000h 00.0m");
-    fZdSoll = new TGLabel(f, "+000h 00.0m");
-    fAzSoll = new TGLabel(f, "+000h 00.0m");
+    fDecSoll = new TGLabel(f, "+000d 00.0m");
+    fZdSoll = new TGLabel(f, "+000d 00.0m");
+    fAzSoll = new TGLabel(f, "+000d 00.0m");
     fRaEst->SetTextJustify(kTextRight);
     fDecEst->SetTextJustify(kTextRight);
@@ -931,5 +931,5 @@
         deci = (int)test.Dec();
         //sprintf(text, "%c%dd %.1fm", rd.Dec()<0?'-':'+' , abs((int)rd.Dec()), 0.1*(abs((int)test.Dec())%600));
-        sprintf(text, "%c%dh %.1fm", sd, d, dm);
+        sprintf(text, "%c%dd %.1fm", sd, d, dm);
         fDecEst->SetText(new TGString(text));
     }
@@ -961,5 +961,5 @@
         decs = (int)test.Dec();
         //sprintf(text, "%c%dd %.1fm", radec.Dec()<0?'-':'+' , abs((int)radec.Dec()), 0.1*(abs((int)test.Dec())%600));
-        sprintf(text, "%c%dh %.1fm", sd, d, dm);
+        sprintf(text, "%c%dd %.1fm", sd, d, dm);
         fDecSoll->SetText(new TGString(text));
     }
Index: /trunk/MagicSoft/Cosy/gui/MGImage.cc
===================================================================
--- /trunk/MagicSoft/Cosy/gui/MGImage.cc	(revision 2513)
+++ /trunk/MagicSoft/Cosy/gui/MGImage.cc	(revision 2514)
@@ -96,5 +96,5 @@
 }
 
-void MGImage::DrawImg32(char *d, char *s, char *e)
+void MGImage::DrawImg24(char *d, char *s, char *e)
 {
     // d=destination, s=source, e=end
@@ -110,5 +110,5 @@
 }
 
-void MGImage::DrawColImg32(char *d, char *s1, char *s2, char *e)
+void MGImage::DrawColImg24(char *d, char *s1, char *s2, char *e)
 {
     // d=destination, s1=source1, s2=source2, e=end
@@ -147,6 +147,6 @@
         DrawImg16((unsigned short*)fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
         break;
-    case 32:
-        DrawImg32(fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
+    case 24:
+        DrawImg24(fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
         break;
     default:
@@ -179,5 +179,5 @@
     switch (gVirtualX->GetDepth())
     {
-    case 32:
+    case 24:
         DrawColImg32(fImage->data, (char*)gbuf, (char*)cbuf, (char*)(gbuf+fWidth*fHeight));
         break;
Index: /trunk/MagicSoft/Cosy/gui/MGImage.h
===================================================================
--- /trunk/MagicSoft/Cosy/gui/MGImage.h	(revision 2513)
+++ /trunk/MagicSoft/Cosy/gui/MGImage.h	(revision 2514)
@@ -36,6 +36,6 @@
 
     void DrawImg16(unsigned short *d, char *s, char *e);
-    void DrawImg32(char *d, char *s, char *e);
-    void DrawColImg32(char *d, char *s1, char *s2, char *e);
+    void DrawImg24(char *d, char *s, char *e);
+    void DrawColImg24(char *d, char *s1, char *s2, char *e);
 
 public:
Index: /trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc
===================================================================
--- /trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc	(revision 2513)
+++ /trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc	(revision 2514)
@@ -65,4 +65,7 @@
         cout << "Hum: " << hum << "%" << endl;
 
+        fHumidity = hum;
+        fTemperature = temp;
+
         fComStat = kCmdReceived;
         return true;
Index: /trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h
===================================================================
--- /trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h	(revision 2513)
+++ /trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h	(revision 2514)
@@ -31,4 +31,7 @@
     ComStatus_t fComStat; // communication status
 
+    Float_t fHumidity;    // [%]
+    Float_t fTemperature; // degrees celsius
+
     virtual bool InterpreteCmd(TString cmd, TString str);
 
@@ -43,4 +46,7 @@
     bool Send(const char *str);
     void SetStatus(Byte_t s) { fStatus=s; }
+
+    Float_t GetHumidity() const { return fHumidity; }
+    Float_t GetTemperature() const { return fTemperature; }
 };
 
Index: /trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc
===================================================================
--- /trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc	(revision 2513)
+++ /trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc	(revision 2514)
@@ -6,4 +6,6 @@
 #include <TSocket.h>
 #include <TServerSocket.h>
+
+#undef DEBUG
 
 using namespace std;
@@ -71,7 +73,7 @@
         return false;
     }
-
+#ifdef DEBUG
     cout << "Tx: " << msg << flush;
-
+#endif
     return true;
 }