Commit 98a1aab6 authored by Antoine Lemasson's avatar Antoine Lemasson
Browse files

See last commit

parent 5eb9568e
......@@ -38,7 +38,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread -Wno-unused-paramete
# root
INCLUDE_DIRECTORIES( ${ROOT_INCLUDE_DIR} )
LINK_DIRECTORIES( ${ROOT_LIBRARY_DIR} )
SET(EXTRA_EXTERNAL_LIBRARIES ${EXTRA_EXTERNAL_LIBRARIES} Matrix)
SET(EXTRA_EXTERNAL_LIBRARIES ${EXTRA_EXTERNAL_LIBRARIES} Matrix Rint)
# gw
set(EXTRA_INTERNAL_LIBRARIES GWPHYSICS )
......
......@@ -1052,7 +1052,7 @@ Bool_t CXCanvas::HandleKey(Int_t px, Int_t py)
gCopyObject->Delete();
gCopyObject = nullptr;
}
if (fSelected) {
if (!fSelected->InheritsFrom(CXCanvas::Class_Name())) {
gCopyObject = fSelected->Clone();
gDrawOptions = fSelected->GetDrawOption();
}
......
......@@ -27,6 +27,7 @@ struct GammaTransition{
TString SpinI;
TString SpinF;
TString NucName;
TString LifeTime;
};
class CXGammaSearch: public TGTransientFrame
......
#include <iostream>
#include <iomanip>
#include "TApplication.h"
#include "TRint.h"
#include "TGClient.h"
#include "TString.h"
#include "TEnv.h"
......@@ -10,7 +10,7 @@
using namespace std;
TApplication *theApp;
TRint *theApp;
CXMainWindow *fCXMainWindow;
class TInterruptHandler : public TSignalHandler {
......@@ -45,19 +45,18 @@ int main(int argc, char **argv)
cout << " * HELLO -- You are Running CubixPlayer *\n";
cout << " **********************************************\n";
theApp = new TApplication("App", &argc, argv);
theApp = new TRint("App", &argc, argv,NULL,0);
// make sure that the Gpad and GUI libs are loaded
TApplication::NeedGraphicsLibs();
gApplication->InitializeGraphics();
TRint::NeedGraphicsLibs();
// TApplication::NeedGraphicsLibs();
// gApplication->InitializeGraphics();
fCXMainWindow = new CXMainWindow(gClient->GetRoot(), 1300, 600 );
theApp->Run(true);
theApp->Run(false);
if (fCXMainWindow) {
delete (fCXMainWindow); // make sure that the Gpad and GUI libs are loaded
TApplication::NeedGraphicsLibs();
gApplication->InitializeGraphics();
fCXMainWindow->CloseWindow();
fCXMainWindow = nullptr;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment