Import Geant4 11.1.0.beta source tree
This commit is contained in:
@@ -140,13 +140,27 @@ G4AnalysisMessengerHelper::CreateGetCommand(G4UImessenger* messenger) const
|
||||
|
||||
std::unique_ptr<G4UIcommand> command(
|
||||
new G4UIcommand(Update("/analysis/HNTYPE_/get"), messenger));
|
||||
command->SetGuidance(Update("Get the address of the NDIM_D LOBJECT of given id"));
|
||||
command->SetGuidance(Update("Get the address of the NDIM_D LOBJECT of given id.\n"
|
||||
"This command is only for Geant4 internal use."));
|
||||
command->SetParameter(parId);
|
||||
command->AvailableForStates(G4State_Idle, G4State_GeomClosed, G4State_EventProc);
|
||||
|
||||
return command;
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
std::unique_ptr<G4UIcommand>
|
||||
G4AnalysisMessengerHelper::CreateGetVectorCommand(G4UImessenger* messenger) const
|
||||
{
|
||||
std::unique_ptr<G4UIcommand> command(
|
||||
new G4UIcommand(Update("/analysis/HNTYPE_/getVector"), messenger));
|
||||
command->SetGuidance(Update("Get the address of the NDIM_D LOBJECT vector.\n"
|
||||
"This command is only for Geant4 internal use."));
|
||||
command->AvailableForStates(G4State_Idle, G4State_GeomClosed, G4State_EventProc);
|
||||
|
||||
return command;
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
std::unique_ptr<G4UIcommand>
|
||||
G4AnalysisMessengerHelper::CreateSetTitleCommand(G4UImessenger* messenger) const
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
#include "G4ios.hh"
|
||||
|
||||
#if defined(TOOLS_USE_FREETYPE)
|
||||
#include "tools/sg/text_freetype"
|
||||
#include "tools/xml/xml_style"
|
||||
#include "toolx/sg/text_freetype"
|
||||
#include "toolx/xml/xml_style"
|
||||
#include "tools/xml/wrap_viewplot_fonts_google_style"
|
||||
//inlib/xml/viewplot.style file embeded in an inline function.
|
||||
#include "tools/font/lato_regular_ttf"
|
||||
@@ -137,7 +137,7 @@ bool load_embeded_styles(tools::xml::styles& a_styles) {
|
||||
tools::replace(s,"@@back_slash@@","\\");
|
||||
ss += s + "\n";
|
||||
}
|
||||
return tools::xml::load_style_string(a_styles,ss);
|
||||
return toolx::xml::load_style_string(a_styles,ss);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -162,7 +162,7 @@ G4PlotManager::G4PlotManager(const G4AnalysisManagerState& state)
|
||||
// unsigned int ww = 2000; //to have better antialising on freetype fonts.
|
||||
// float A4 = 29.7f/21.0f;
|
||||
// unsigned int wh = (unsigned int)(float(ww)*A4*0.80);
|
||||
static tools::sg::text_freetype ttf;
|
||||
static toolx::sg::text_freetype ttf;
|
||||
ttf.add_embedded_font(tools::sg::font_lato_regular_ttf(),tools::font::lato_regular_ttf);
|
||||
ttf.add_embedded_font(tools::sg::font_roboto_bold_ttf(),tools::font::roboto_bold_ttf);
|
||||
fViewer = std::make_unique<tools::viewplot>(G4cout, ttf,
|
||||
|
||||
Reference in New Issue
Block a user