Skip to content

Remove current RHist prototype #18191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hahnjo merged 1 commit into from
Apr 3, 2025
Merged

Remove current RHist prototype #18191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions gui/browsable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTBrowsable
Hist
)

# provider for drawing of v7 histograms on RCanvas

if(root7)
ROOT_LINKER_LIBRARY(ROOTHistDrawProvider
src/RHistDraw7Provider.cxx
DEPENDENCIES
ROOTBrowsable
ROOTGpadv7
ROOTHistDraw
)
endif()

# provider for generic drawing of TObject on TCanvas

ROOT_LINKER_LIBRARY(ROOTObjectDraw6Provider
Expand Down
46 changes: 0 additions & 46 deletions gui/browsable/src/RHistDraw7Provider.cxx
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions gui/browsable/src/RProvider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,10 +509,6 @@ class RDefaultProvider : public RProvider {
RDefaultProvider()
{
// TODO: let read from rootrc or any other files
RegisterClass("ROOT::Experimental::RH1D", "sap-icon://bar-chart", "", "", "libROOTHistDrawProvider");
RegisterClass("ROOT::Experimental::RH2D", "sap-icon://pixelate", "", "", "libROOTHistDrawProvider");
RegisterClass("ROOT::Experimental::RH3D", "sap-icon://product", "", "", "libROOTHistDrawProvider");
RegisterClass("ROOT::Experimental::RCanvas", "sap-icon://business-objects-experience", "", "", "libROOTHistDrawProvider");
RegisterClass("ROOT::RNTuple", "sap-icon://table-chart", "libROOTNTupleBrowseProvider",
"libROOTNTupleDraw6Provider", "libROOTNTupleDraw7Provider");
}
Expand Down
1 change: 0 additions & 1 deletion gui/fitpanelv7/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTFitPanelv7
Gpad
ROOTWebDisplay
ROOTGpadv7
ROOTHistDraw
${EXTRA_DICT_OPTS}
)
5 changes: 0 additions & 5 deletions gui/fitpanelv7/inc/ROOT/RFitPanel.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

#include <ROOT/RCanvas.hxx>

#include "ROOT/RHist.hxx"

#include "TFitResultPtr.h"

#include <memory>
Expand All @@ -43,7 +41,6 @@ class RFitPanel {
std::string fPadName; ///<! v6 pad name in the canvas, where object is (was) drawn

std::shared_ptr<RCanvas> fCanvas; ///<! v7 canvas used to display results
std::shared_ptr<RH1D> fFitHist; ///<! v7 histogram for fitting

std::shared_ptr<ROOT::RWebWindow> fWindow; ///<! configured display
unsigned fConnId{0}; ///<! client connection id
Expand Down Expand Up @@ -110,8 +107,6 @@ public:

void AssignCanvas(std::shared_ptr<RCanvas> &canv);

void AssignHistogram(std::shared_ptr<RH1D> &hist);

/// show FitPanel in specified place
void Show(const RWebDisplayArgs &args = "");

Expand Down
8 changes: 0 additions & 8 deletions gui/fitpanelv7/src/RFitPanel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,6 @@ void RFitPanel::AssignCanvas(std::shared_ptr<RCanvas> &canv)
}
}

////////////////////////////////////////////////////////////////////////////////
/// assign histogram for fitting

void RFitPanel::AssignHistogram(std::shared_ptr<RH1D> &hist)
{
fFitHist = hist;
}

////////////////////////////////////////////////////////////////////////////////
/// Show FitPanel

Expand Down
4 changes: 0 additions & 4 deletions hist/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@

add_subdirectory(hist) # special CMakeLists.txt
add_subdirectory(histpainter) # special CMakeLists.txt
if(root7)
add_subdirectory(histv7) # special CMakeLists.txt
add_subdirectory(histdrawv7) # special CMakeLists.txt
endif()
if (spectrum)
add_subdirectory(spectrum)
add_subdirectory(spectrumpainter) # special CMakeLists.txt
Expand Down
29 changes: 0 additions & 29 deletions hist/histdrawv7/CMakeLists.txt
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions hist/histdrawv7/doc/index.md
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions hist/histdrawv7/inc/LinkDef.h
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions hist/histdrawv7/inc/ROOT/RHistDisplayItem.hxx
View file
Open in desktop

This file was deleted.

Loading
Loading