Changeset 7442 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/05/05 16:36:41 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEnv.cc (modified) (8 diffs)
• MEnv.h (modified) (3 diffs)
• MTime.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -37 +37 @@
 #include <TObjString.h>
 
+#include <TPave.h>
 #include <TAttText.h>
-#include <TAttFill.h>
-#include <TAttLine.h>
+//#include <TAttFill.h>
+//#include <TAttLine.h>
 #include <TAttMarker.h>
 
@@ -68 +69 @@
         fChecked.Add(new TObjString(name));
     return TEnv::GetValue(name, dflt);
+}
+
+Int_t MEnv::GetFillStyle(const char *name, Int_t dftl)
+{
+    TString str = GetValue(name, "");
+    str = str.Strip(TString::kBoth);
+    if (str.IsNull())
+        return dftl;
+
+    str.ToLower();
+
+    switch (str.Hash())
+    {
+    case (unsigned)-1920099718/*2374867578*/: return 0;// hollow
+    case 764279305:  return 1001;// solid
+    case 1854683492: return 2001; // hatch
+    }
+
+    return str.EndsWith("%") ? 4000+str.Atoi() : str.Atoi();
 }
 
@@ -106 +126 @@
 TString MEnv::Compile(TString str, const char *post) const
 {
-    if (!str.IsNull() && str[str.Length()-1]!='.')
+    if (!str.IsNull() && !str.EndsWith("."))
         str += ".";
 
@@ -165 +185 @@
 
     const Color_t col = GetColor(color, dftl->GetFillColor());
-    const Style_t sty = GetValue(style, dftl->GetFillStyle());
-
+    const Style_t sty = GetFillStyle(style, dftl->GetFillStyle());
+ 
     fill.SetFillColor(col);
     fill.SetFillStyle(sty);
@@ -187 +207 @@
     marker.SetMarkerStyle(sty);
     marker.SetMarkerSize(siz);
+}
+
+void MEnv::GetAttPave(const char *str, TPave &pave, TPave *dftl)
+{
+    const TString post(str);
+
+    TString name(pave.GetName());
+    if (!name.IsNull() && name!=pave.ClassName())
+        name = Compile(name, post);
+
+    GetAttLine(name, pave, dftl);
+    GetAttFill(name, pave, dftl);
+
+    const TString corner = Compile(name, "CornerRadius");
+    const TString border = Compile(name, "BorderSize");
+    const TString option = Compile(name, "Option");
+
+    if (!dftl)
+        dftl = &pave;
+
+    const Double_t cor = GetValue(corner, dftl->GetCornerRadius());
+    const Int_t    bor = GetValue(border, dftl->GetBorderSize());
+
+    pave.SetCornerRadius(cor);
+    pave.SetBorderSize(bor);
+
+    TString  opt = GetValue(option, dftl->GetOption());
+    opt.ToLower();
+
+    const Bool_t has = pave.GetCornerRadius()>0;
+
+    if (has && !opt.Contains("arc"))
+        opt += "arc";
+
+    if (!has && opt.Contains("arc"))
+        opt.ReplaceAll("arc", "");
+
+    pave.SetOption(opt);
+
 }
 
@@ -204 +263 @@
     //TAttTextEditor   *line = dynamic_cast<TAttTextEditor*>(obj);
 
+    TPave      *pave = dynamic_cast<TPave*>(/*(TAttLine*)*/obj);
     TAttLine   *line = dynamic_cast<TAttLine*>(/*(TAttLine*)*/obj);
     TAttText   *text = dynamic_cast<TAttText*>(/*(TAttText*)*/obj);
@@ -210 +270 @@
 
     cout << line << " " << text << " " << fill << " " << mark << endl;
+
+    if (pave)
+    {
+        GetAttPave(name, *pave, dynamic_cast<TPave*>(dftl));
+        return;
+    }
 
     if (line)
@@ -228 +294 @@
     TIter Next(GetTable());
     TObject *o=0;
+
     while ((o=Next()))
         if (!fChecked.FindObject(o->GetName()))

trunk/MagicSoft/Mars/mbase/MEnv.h

@@ -14 +14 @@
 class TAttText;
 class TAttFill;
+class TPave;
 
 class MEnv : public TEnv
@@ -30 +31 @@
 
     Int_t       GetColor(const char *name, Int_t dftl);
+    Int_t       GetFillStyle(const char *name, Int_t dftl);
 
     void        GetAttributes(const char *name, TObject *obj, TObject *dftl=0);
@@ -36 +38 @@
     void        GetAttFill(const char *name, TAttFill &fill, TAttFill *dftl=0);
     void        GetAttMarker(const char *name, TAttMarker &marker, TAttMarker *dftl=0);
+    void        GetAttPave(const char *name, TPave &pave, TPave *dftl=0);
 
     void PrintUntouched() const;

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -532 +532 @@
 // The maximum size of the return string is 128 (incl. NULL)
 //
-// For dates before 1.1.1902  a null string is returned
+// For dates before 1. 1.1902  a null string is returned
 // For dates after 31.12.2037 a null string is returned
 //