Changeset 7264 for trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

Timestamp:

08/05/05 18:13:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz, 03/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
-!   Author(s): Robert Wagner, 08/2004 <mailto:rwagner@mppmu.mpg.de>
 !
-!   Copyright: MAGIC Software Development, 2002-2004
+!   Copyright: MAGIC Software Development, 2002-2005
 !
 !
@@ -121 +120 @@
 //     http://heasarc.gsfc.nasa.gov/W3Browse/star-catalog/
 //
+//  Class Version 2:
+//    + MAttLine fAttLineSky;    // Line Style and color for sky coordinates
+//    + MAttLine fAttLineLocal;  // Line Style and color for local coordinates
+//    + added new base class TAttMarker
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MAstroCatalog.h"
@@ -154 +158 @@
 #endif
 
+ClassImp(MAttLine);
 ClassImp(MAstroCatalog);
 
@@ -170 +175 @@
 
     fToolTip = gROOT->IsBatch() || !gClient ? 0 : new TGToolTip(0, "", 0);
+
+    fAttLineSky.SetLineStyle(kDashDotted);
+    fAttLineLocal.SetLineStyle(kDashDotted);
+
+    fAttLineSky.SetLineColor(kRed);
+    fAttLineLocal.SetLineColor(kBlue);
+
+    SetMarkerColor(kBlack);
+    SetMarkerStyle(kCircle);
 }
 
@@ -221 +235 @@
 // --------------------------------------------------------------------------
 //
-// return int correspoding to TSubString
-//
-Int_t MAstroCatalog::atoi(const TSubString &sub)
-{
-    return atoi(TString(sub));
-}
-
-// --------------------------------------------------------------------------
-//
-// return float correspoding to TSubString
-//
-Float_t MAstroCatalog::atof(const TSubString &sub)
-{
-    return atof(TString(sub));
-}
-
-// --------------------------------------------------------------------------
-//
 // return int correspoding to TString
 //
 Int_t MAstroCatalog::atoi(const TString &s)
 {
-    return std::atoi(s);
+    return const_cast<TString&>(s).Atoi();
 }
 
@@ -252 +248 @@
 Float_t MAstroCatalog::atof(const TString &s)
 {
-    return std::atof(s);
+    return const_cast<TString&>(s).Atof();
 }
 
@@ -678 +674 @@
 {
     if (gPad)
-        SetRangePad(o);
+        SetRangePad(o);
 
     if (TestBit(kHasChanged))
@@ -748 +744 @@
 
     // draw star on the camera display
-    TMarker *tip=new TMarker(x, y, col<0 ? kDot : kFullDotMedium);;
-    tip->SetMarkerColor(col);
+    TMarker *tip=new TMarker(x, y, kDot);
+    TAttMarker::Copy(*tip);
+
     fMapG.Add(tip, new TString(str));
 
-    if (!resize)
-        return;
-
-    tip->SetMarkerSize((10 - (mag>1 ? mag : 1))/15);
-    tip->SetMarkerStyle(kCircle);
+    if (resize)
+        tip->SetMarkerSize((10 - (mag>1 ? mag : 1))/15);
 }
 
@@ -870 +864 @@
 
     TLine *line = new TLine(v0.X(), v0.Y(), v1.X(), v1.Y());
-    line->SetLineStyle(kDashDotted); //kDashed, kDotted, kDashDotted
-    line->SetLineColor(kWhite+type*2);
+    if (type==1)
+        dynamic_cast<TAttLine&>(fAttLineSky).Copy(dynamic_cast<TAttLine&>(*line));
+    else
+        dynamic_cast<TAttLine&>(fAttLineLocal).Copy(dynamic_cast<TAttLine&>(*line));
     fMapG.Add(line);
 
@@ -1152 +1148 @@
     const Bool_t yellow = o.Contains("yellow",  TString::kIgnoreCase) && !white;
 
+    if (white)
+        SetMarkerColor(kWhite);
+
     // X is vice versa, because ra is defined anti-clockwise
     mirx || mirror ? ResetBit(kMirrorX) : SetBit(kMirrorX);
@@ -1208 +1207 @@
 // --------------------------------------------------------------------------
 //
-// First delete all gui elements.
-// Set the correct range of the pad.
-// Create all gui primitives
-// If "this" is not in the current pad add it to the current pad.
-// Reset vit kHasChanged
-//
+// Bends some pointers into the right direction...
+// Calls TAttLine::SetLineAttributes and connects some signals
+// to the gui to recreate the gui elements if something has changed.
+//
+void MAstroCatalog::SetLineAttributes(MAttLine &att)
+{
+    if (!gPad)
+        return;
+
+    gPad->SetSelected(&att);
+    gROOT->SetSelectedPrimitive(&att);
+
+    att.SetLineAttributes();
+
+    TQObject::Connect("TGColorSelect", "ColorSelected(Pixel_t)", "MAstroCatalog", this, "ForceUpdate()");
+    TQObject::Connect("TGListBox",     "Selected(Int_t)",        "MAstroCatalog", this, "ForceUpdate()");
+}
+
+// --------------------------------------------------------------------------
+//
+// Calls TAttMarker::SetMarkerAttributes and connects some signals
+// to the gui to recreate the gui elements if something has changed.
+//
+void MAstroCatalog::SetMarkerAttributes()
+{
+    if (!gPad)
+        return;
+
+    TAttMarker::SetMarkerAttributes();
+
+    // Make sure that if something is changed the gui elements
+    // are recreated
+    TQObject::Connect("TGedMarkerSelect", "MarkerSelected(Style_t)", "MAstroCatalog", this, "ForceUpdate()");
+    TQObject::Connect("TGColorSelect",    "ColorSelected(Pixel_t)",  "MAstroCatalog", this, "ForceUpdate()");
+    TQObject::Connect("TGListBox",        "Selected(Int_t)",         "MAstroCatalog", this, "ForceUpdate()");
+}
+
 void MAstroCatalog::DrawPrimitives(Option_t *o)
 {