Changeset 8820

Timestamp:

01/19/08 12:55:11 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• devdrv/shaftencoder.cc (modified) (3 diffs)
• gui/MGCosy.h (modified) (1 diff)
• gui/MGEmbeddedCanvas.cc (modified) (1 diff)
• gui/MGEmbeddedCanvas.h (modified) (1 diff)

trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

@@ -15 +15 @@
 
 ShaftEncoder::ShaftEncoder(const BYTE_t nodeid, const char *name, MLog &out)
-    : NodeDrv(nodeid, name, out), fPos(0), fVel(0), fAcc(0),
-    fTurn(0), fDirection(kUndefined), fHysteresisPos(0), fHysteresisNeg(0),
-    fLabel(NULL), fUpdPos(0), fPosHasChanged(false), fDirHasChanged(false),
-    fReport(NULL),
-    /*fTwin(0), fIsUpdated(kFALSE),*/
-      fMotor(0), fOffset(0), fDirChangedPos(0)
+    : NodeDrv(nodeid, name, out),
+    fPos(0), fVel(0), fAcc(0), fTurn(0), fTicks(0),
+    fDirection(kUndefined), fHysteresisPos(0), fHysteresisNeg(0),
+    fLabel(NULL), fUpdPos(0),
+    fPosHasChanged(false), fDirHasChanged(false),
+    fReport(NULL), fMotor(0), fOffset(0), fDirChangedPos(0)
 {
 }
@@ -186 +186 @@
     }
 
-    char text[21];
+    char text[21]="";
     if (pos!=fUpdPos && fLabel)
     {
@@ -314 +314 @@
     }
 
-    if (multipos>GetPos()) fDirection = kForward;
-    else if (multipos<GetPos()) fDirection = kBackward;
-    else fDirection = kUndefined;
+    if (multipos>GetPos())
+        fDirection = kForward;
+    else
+        if (multipos<GetPos())
+            fDirection = kBackward;
+        else
+            fDirection = kUndefined;
 
 

trunk/MagicSoft/Cosy/gui/MGCosy.h

@@ -18 +18 @@
 class TGTab;
 class TGLabel;
-class TGMenuBar;
 class TGTextView;
 class TGPopupMenu;

trunk/MagicSoft/Cosy/gui/MGEmbeddedCanvas.cc

@@ -117 +117 @@
 {
     TList &list = *fCanvas->GetListOfPrimitives();
-    list.ForEach(TObject, SetBit)(kNoContextMenu);
+    list.R__FOR_EACH(TObject, SetBit)(kNoContextMenu);
 
     fCanvas->SetBit(kNoContextMenu);

trunk/MagicSoft/Cosy/gui/MGEmbeddedCanvas.h

@@ -1 +1 @@
 #ifndef COSY_MGEmbeddedCanvas
 #define COSY_MGEmbeddedCanvas
-
-//
-// This File contains the declaration of the MGCoordinates-class
-//
-//   Author: Thomas Bretz
-//   Version: V1.0 (1-8-2000)
-
 
 #ifndef ROOT_TRootEmbeddedCanvas