Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
IPNL_GAMMA
gammaware
Commits
13cbbe65
Commit
13cbbe65
authored
Apr 14, 2019
by
Antoine Lemasson
Committed by
Jérémie Dudouet
Jun 27, 2019
Browse files
See last commit
parent
5538a9bd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
src/root/gui/cubix/CMakeLists.txt
src/root/gui/cubix/CMakeLists.txt
+1
-1
src/root/gui/cubix/src/CXCanvas.cpp
src/root/gui/cubix/src/CXCanvas.cpp
+1
-1
src/root/gui/cubix/src/CXGammaSearch.h
src/root/gui/cubix/src/CXGammaSearch.h
+1
-0
src/root/gui/cubix/src/Cubix.cpp
src/root/gui/cubix/src/Cubix.cpp
+8
-9
No files found.
src/root/gui/cubix/CMakeLists.txt
View file @
13cbbe65
...
...
@@ -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
)
...
...
src/root/gui/cubix/src/CXCanvas.cpp
View file @
13cbbe65
...
...
@@ -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
();
}
...
...
src/root/gui/cubix/src/CXGammaSearch.h
View file @
13cbbe65
...
...
@@ -27,6 +27,7 @@ struct GammaTransition{
TString
SpinI
;
TString
SpinF
;
TString
NucName
;
TString
LifeTime
;
};
class
CXGammaSearch
:
public
TGTransientFrame
...
...
src/root/gui/cubix/src/Cubix.cpp
View file @
13cbbe65
#include <iostream>
#include <iomanip>
#include "T
Application
.h"
#include "T
Rint
.h"
#include "TGClient.h"
#include "TString.h"
#include "TEnv.h"
...
...
@@ -10,7 +10,7 @@
using
namespace
std
;
T
Application
*
theApp
;
T
Rint
*
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
T
Application
(
"App"
,
&
argc
,
argv
);
theApp
=
new
T
Rint
(
"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
(
tru
e
);
theApp
->
Run
(
fals
e
);
if
(
fCXMainWindow
)
{
delete
(
fCXMainWindow
);
// make sure that the Gpad and GUI libs are loaded
TApplication
::
NeedGraphicsLibs
();
gApplication
->
InitializeGraphics
();
fCXMainWindow
->
CloseWindow
();
fCXMainWindow
=
nullptr
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment