webgui: introduced TCheckedMenuItem class

Only this class requires checked state, base class - not

graf2d/gpad/inc/LinkDef.h

@@ -40,6 +40,7 @@
 #pragma link C++ class ROOT::Experimental::TUniqueDisplayItem<TPad>+;
 #pragma link C++ class ROOT::Experimental::TOrdinaryDisplayItem<TH1>+;
 #pragma link C++ class ROOT::Experimental::Detail::TMenuItem+;
+#pragma link C++ class ROOT::Experimental::Detail::TCheckedMenuItem+;
 #pragma link C++ class std::vector<ROOT::Experimental::Detail::TMenuItem*>+;
 #pragma link C++ class ROOT::Experimental::TMenuItems+;
 #endif

graf2d/gpad/v7/inc/ROOT/TMenuItem.hxx

@@ -29,12 +29,9 @@ namespace Detail {
 
 class TMenuItem {
 protected:
-   enum ECheckedState { kNotDefined = -1, kOff = 0, kOn = 1 };
-
-   std::string fName;                    ///<  name of the menu item
-   std::string fTitle;                   ///<  title of menu item
-   ECheckedState fChecked = kNotDefined; ///< -1 not exists, 0 - off, 1 - on
-   std::string fExec;                    ///< execute when item is activated
+   std::string fName;  ///<  name of the menu item
+   std::string fTitle; ///<  title of menu item
+   std::string fExec;  ///< execute when item is activated
 public:
    /** Default constructor */
    TMenuItem() = default;
@@ -42,16 +39,7 @@ public:
    /** Create menu item with the name and title
     *  name used to display item in the object context menu,
     *  title shown as hint info for that item  */
-   TMenuItem(const std::string &name, const std::string &title)
-      : fName(name), fTitle(title), fChecked(kNotDefined), fExec()
-   {
-   }
-
-   /** Set checked state for the item, default is none */
-   void SetChecked(bool on = true) { fChecked = on ? kOff : kOn; }
-
-   /** Disable checked state of the menu item */
-   void DisableChecked() { fChecked = kNotDefined; }
+   TMenuItem(const std::string &name, const std::string &title) : fName(name), fTitle(title), fExec() {}
 
    /** Set execution string with all required arguments,
     * which will be executed when menu item is selected  */
@@ -64,6 +52,27 @@ public:
    const std::string &GetExec() const { return fExec; }
 };
 
+class TCheckedMenuItem : public TMenuItem {
+protected:
+   bool fChecked = false; ///< -1 not exists, 0 - off, 1 - on
+public:
+   /** Default constructor */
+   TCheckedMenuItem() = default;
+
+   /** Create menu item with the name and title
+    *  name used to display item in the object context menu,
+    *  title shown as hint info for that item  */
+   TCheckedMenuItem(const std::string &name, const std::string &title, bool checked = false)
+      : TMenuItem(name, title), fChecked(checked)
+   {
+   }
+
+   /** Set checked state for the item, default is none */
+   void SetChecked(bool on = true) { fChecked = on; }
+
+   bool IsChecked() const { return fChecked; }
+};
+
 } // namespace Detail
 
 ///////////////////////////////////////////////////////////////////////
@@ -88,8 +97,7 @@ public:
 
    void AddChkMenuItem(const std::string &name, const std::string &title, bool checked, const std::string &toggle)
    {
-      Detail::TMenuItem *item = new Detail::TMenuItem(name, title);
-      item->SetChecked(checked);
+      Detail::TCheckedMenuItem *item = new Detail::TCheckedMenuItem(name, title, checked);
       item->SetExec(toggle);
       Add(item);
    }

graf2d/gpad/v7/src/TMenuItem.cxx

@@ -35,7 +35,7 @@ std::string ROOT::Experimental::TMenuItems::ProduceJSON()
    // FIXME: got problem with std::list<TMenuItem>, can be generic TBufferJSON
    TString res = TBufferJSON::ConvertToJSON(&fItems, cl);
 
-   // printf("Got JSON %s\n", res.Data());
+   printf("Got JSON %s\n", res.Data());
 
    return res.Data();
 }