Changeset 2514 for trunk/MagicSoft/Cosy/gui

Timestamp:

11/14/03 14:07:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGCosy.cc (modified) (3 diffs)
• MGImage.cc (modified) (4 diffs)
• MGImage.h (modified) (1 diff)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -215 +215 @@
 
     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 +931 @@
         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 +961 @@
         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));
     }

trunk/MagicSoft/Cosy/gui/MGImage.cc

@@ -96 +96 @@
 }
 
-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 +110 @@
 }
 
-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 +147 @@
         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 +179 @@
     switch (gVirtualX->GetDepth())
     {
-    case 32:
+    case 24:
         DrawColImg32(fImage->data, (char*)gbuf, (char*)cbuf, (char*)(gbuf+fWidth*fHeight));
         break;

trunk/MagicSoft/Cosy/gui/MGImage.h

@@ -36 +36 @@
 
     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: