Update the level scheme representation in advanced visualization

src/root/physics/BaseLSPlayer.cpp

@@ -245,6 +245,21 @@ Bool_t BaseLSPlayer::Disconnect(TCanvas *canvas)
 	return localCanvas != 0x0;
 } 
 
+void BaseLSPlayer::RefreshLinks()
+{
+    for(int i=0 ; i<GetLinkList().GetEntries() ; i++) {
+        if(GetLinkList().At(i)->InheritsFrom("Gw::Link")) {
+            Link* link = static_cast<Link*>(GetLinkList().At(i));
+
+            link->RefreshPoints();
+            link->Paint();
+        }
+    }
+
+    gPad->Modified();
+    gPad->Update();
+}
+
 //__________________________________________________________
 void BaseLSPlayer::HandleMovement(Int_t eventType, Int_t eventX, Int_t eventY, TObject* select)
 { 
@@ -254,19 +269,7 @@ void BaseLSPlayer::HandleMovement(Int_t eventType, Int_t eventX, Int_t eventY, T
    pad->cd(); 
 
    if (eventType == kButton1Up) {
-
-       for(int i=0 ; i<GetLinkList().GetEntries() ; i++)
-       {
-           if(GetLinkList().At(i)->InheritsFrom("Gw::Link"))
-           {
-               Link* link = static_cast<Link*>(GetLinkList().At(i));
-
-               link->RefreshPoints();
-               link->Paint();
-           }
-       }
-       gPad->Modified();
-       gPad->Update();
+       RefreshLinks();
    }
 
    if (eventType == kMouseMotion) {
@@ -684,6 +687,9 @@ void BaseLSPlayer::Draw(Option_t *opt)
   }
   
   if ( TVirtualPad::Pad() != 0 ) {  // in principle, gpad exists
+
+    TVirtualPad::Pad()->Connect("RangeAxisChanged()", "BaseLSPlayer", this, "RefreshLinks()");
+
     TVirtualPad::Pad()->GetRange(xRminOld, yRminOld, xRmaxOld, yRmaxOld);
     
     xminOld = GetXMin(xRminOld, xRmaxOld); 
@@ -802,20 +808,22 @@ Int_t BaseLSPlayer::ImportLevelScheme(const Char_t* filename, Option_t* opt)
   
   TString Options(opt);
 
-  bool Noverbose = Options.Contains("NV");
-  Options.ReplaceAll("NV","");
+  bool Noverbose = Options.Contains("NoVerbose");
+  Options.ReplaceAll("NoVerbose","");
+  Bool_t NoGraphical = Options.Contains("NoGraphical");
+  Options.ReplaceAll("NoGraphical","");
 
   if ( fname.EndsWith(".ags") ) {
     RadLevelSchemeReader reader(filename, Options.Data());
     ok= reader.Import(*fLevelScheme);
-    DoStyle(kRadware);
+    if(!NoGraphical) DoStyle(kRadware);
   }	
   
   if ( fname.EndsWith(".ens") ) {
     EnsdfLevelSchemeReader reader(filename, Options.Data());
     if(Noverbose) reader.SetQuietMode();
     ok = reader.Import(*fLevelScheme);
-    DoStyle(kEnsdf);
+    if(!NoGraphical) DoStyle(kEnsdf);
   }
   
   return ok;
@@ -941,7 +949,7 @@ void LSaxis::ExecuteEvent(Int_t eventType, Int_t eventX, Int_t eventY)
 //__________________________________________________________
 void LSaxis::SetRange(Int_t ymin, Int_t ymax, Int_t xmin, Int_t xmax)
 {
-   TVirtualPad* pad = TVirtualPad::Pad();
+   TPad* pad = (TPad*)TVirtualPad::Pad();
    pad->cd(); 
    
    SetWmin(ymin);
@@ -966,12 +974,14 @@ void LSaxis::SetRange(Int_t ymin, Int_t ymax, Int_t xmin, Int_t xmax)
    fLastY2Zoom = ymax;
    fLastX1Zoom = xmin;
    fLastX2Zoom = xmax;
+
+   pad->RangeAxisChanged();
 }
 
 //__________________________________________________________
 void LSaxis::UnZoom()
 {
-   TVirtualPad* pad = TVirtualPad::Pad();
+   TPad* pad = (TPad*)TVirtualPad::Pad();
    pad->cd(); 
    
    SetWmin(fLastY1Zoom);
@@ -986,7 +996,8 @@ void LSaxis::UnZoom()
    SetY1(yMin); SetY2(yMax);
 
    pad->Range(pad->GetX1(), yRmin, pad->GetX2(), yRmax);
-   pad->Modified(true);
+   pad->Modified();
+   pad->RangeAxisChanged();
 }
 
 ClassImp(BaseLSPlayer)

src/root/physics/BaseLSPlayer.h

@@ -251,6 +251,8 @@ namespace Gw {
         
         LSaxis *GetLSAxis(){return fAxis;}
 
+        virtual void RefreshLinks();
+
     protected:
         
         //! set/get fLastX/fLastY

src/root/physics/GLSPlayer.cpp

@@ -203,7 +203,7 @@ void GLSPlayer::Draw(Option_t *opt)
 }
 
 //__________________________________________________________
-void GLSPlayer::AddGroundLevel(Int_t z, Int_t a, Option_t* opt, Float_t energy, Float_t errEnergy)
+NuclearLevel *GLSPlayer::AddGroundLevel(Int_t z, Int_t a, Option_t* opt, Float_t energy, Float_t errEnergy)
 {
     // add ground state level
     fLog.SetProcessMethod( "AddGroundLevel(Int_t, Int_t, Option_t*, Float_t, Float_t )");
@@ -243,7 +243,7 @@ void GLSPlayer::AddGroundLevel(Int_t z, Int_t a, Option_t* opt, Float_t energy,
     TVirtualPad* pad = TVirtualPad::Pad();
     if (!pad) {
         fLog << error << "Pad not existing" << dolog;
-        return;
+        return nullptr;
     }
     
     pad->cd();
@@ -296,6 +296,8 @@ void GLSPlayer::AddGroundLevel(Int_t z, Int_t a, Option_t* opt, Float_t energy,
     fLevelScheme->Draw("ground");
 	
     fLog << dolog;
+
+    return level;
 }
 
 //__________________________________________________________
@@ -1146,13 +1148,13 @@ void GLSPlayer::MoveCascade(Float_t mv, Bool_t lastLevel)
 }
 
 //__________________________________________________________
-void GLSPlayer::AddLevel(Float_t energy, Float_t errEnergy, const Char_t* dJp)
+NuclearLevel *GLSPlayer::AddLevel(Float_t energy, Float_t errEnergy, const Char_t* dJp)
 {
     fLog.SetProcessMethod("AddLevel(Float_t, Float_t, const Char_t* )");
     
     if (GetCurrentLevel() == 0) {
         fLog << error << "No level selected" << dolog;
-        return;
+        return nullptr;
     }
     
     //! this is the treatment of the spin / parity inside opt
@@ -1170,7 +1172,7 @@ void GLSPlayer::AddLevel(Float_t energy, Float_t errEnergy, const Char_t* dJp)
         parity = "+";
         parity_offset = spin.Index("+");
     }
-    spin.Remove(parity_offset);
+    spin.Remove(parity_offset,1);
     
     TList* levels = &GetLevelList();
     
@@ -1206,6 +1208,8 @@ void GLSPlayer::AddLevel(Float_t energy, Float_t errEnergy, const Char_t* dJp)
     fLevelScheme->Draw();
 	
     fLog << dolog;
+
+    return level;
 }
 
 //__________________________________________________________

src/root/physics/GLSPlayer.h

@@ -118,10 +118,10 @@ namespace Gw {
         virtual void AddFirstLevel(Float_t energy = 300, Float_t errEnergy = 1, const Char_t* jp = "0+", Option_t* opt = "left");  // *MENU={Hierarchy="LS/AddFirstLevel"}*
         
         //! Add new level to the current cascade
-        virtual void AddLevel(Float_t energy = 300, Float_t errEnergy = 1, const Char_t* dJp = "0/1+");  // *MENU={Hierarchy="LS/AddLevel"}*
+        virtual NuclearLevel *AddLevel(Float_t energy = 300, Float_t errEnergy = 1, const Char_t* dJp = "0/1+");  // *MENU={Hierarchy="LS/AddLevel"}*
         
         //! Add ground state level
-        virtual void AddGroundLevel(Int_t z = 66, Int_t a = 152, Option_t* opt = "0/1+", Float_t energy = 0, Float_t errEnergy = 1); //*MENU={Hierarchy="LS/AddGroundLevel"}*
+        virtual NuclearLevel *AddGroundLevel(Int_t z = 66, Int_t a = 152, Option_t* opt = "0/1+", Float_t energy = 0, Float_t errEnergy = 1); //*MENU={Hierarchy="LS/AddGroundLevel"}*
         
         //! Add arrows to the LS between two selected levels
         virtual void AddArrow(Option_t* opt = "|>");  // *MENU={Hierarchy="LS/AddArrow"}*

src/root/physics/Link.cpp

@@ -332,8 +332,11 @@ void Link::SetAdvancedStylePoints(Double_t xi, Double_t xf)
 
     //equation droite reliant xi a xf : yd = ad*x + bd
 
-    Double_t b1 = bd - GetStrength().Get()*StrenghtFact*MetricFact * sqrt(ad*ad + 1); // yd1 = ad*x+b1
-    Double_t b2 = bd + GetStrength().Get()*StrenghtFact*MetricFact * sqrt(ad*ad + 1); // yd2 = ad*x+b2
+    Double_t Strenght = GetStrength().Get();
+    if(Strenght<5) Strenght = 5;
+
+    Double_t b1 = bd - Strenght*StrenghtFact*MetricFact * sqrt(ad*ad + 1); // yd1 = ad*x+b1
+    Double_t b2 = bd + Strenght*StrenghtFact*MetricFact * sqrt(ad*ad + 1); // yd2 = ad*x+b2
 
     Double_t x_p1 = (yi-b1)/ad;
 
@@ -386,9 +389,9 @@ void Link::SetAdvancedStylePoints(Double_t xi, Double_t xf)
           GetLabel(i).SetY(height);
         }
 
-        GetLabel(0).SetX(xi/MetricFact+(xf/MetricFact-xi/MetricFact)/2. - GetStrength().Get());
+        GetLabel(0).SetX(xi/MetricFact+(xf/MetricFact-xi/MetricFact)/2. - Strenght);
         GetLabel(1).SetX(xi/MetricFact+(xf/MetricFact-xi/MetricFact)/2.);
-        GetLabel(2).SetX(xi/MetricFact+(xf/MetricFact-xi/MetricFact)/2. + GetStrength().Get());
+        GetLabel(2).SetX(xi/MetricFact+(xf/MetricFact-xi/MetricFact)/2. + Strenght);
 
 
 //        GetLabel(0).SetX(GetX()[1] - TMath::Abs(GetIL()->GetX2() - GetIL()->GetX1())*0.25);
@@ -411,6 +414,17 @@ Int_t Link::Compare(const TObject* obj) const
   }
 }
 
+//__________________________________________________________
+void Link::RefreshPoints()
+{
+    if(fArrowStyle==0) {
+        SetPoints(GetX()[0]+(GetX()[2]-(GetX()[0]))/2.,GetX()[5]);
+    }
+    else if(fArrowStyle==1) {
+        SetPoints(GetX()[0]+(GetX()[2]-(GetX()[0]))/2.,GetX()[5]);
+    }
+}
+
 //__________________________________________________________
 void Link::UpdatePoints()
 {

src/root/physics/Link.h

@@ -134,7 +134,7 @@ public:
     virtual void SetVertical(){SetPoints((GetX()[5]+GetX()[1])/2.,(GetX()[5]+GetX()[1])/2.);} //*MENU*
     virtual void SetAmbiguous(Bool_t isambiguous = true); //*MENU*
     virtual Bool_t IsAmbiguous(){return fIsAmbiguous;}
-    virtual void RefreshPoints() {SetPoints(GetX()[0]+(GetX()[2]-(GetX()[0]))/2.,GetX()[5]);}
+    virtual void RefreshPoints();
 
     //! to set points from the levels and the Strength 
     virtual void SetPoints();