Skip to content
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.

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

New release #66

Merged
merged 77 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
bea1ab5
feat: fix loading and prepare objects to be placed on canvas by algor…
brauliorivas Jun 24, 2024
7714291
feat: fix loading and prepare objects to be placed on canvas by algor…
brauliorivas Jun 24, 2024
c252b87
Merge branch 'feat/mc-reco-view' of github.com:brauliorivas/dmx into …
brauliorivas Jun 24, 2024
8f6f45d
add more links and begin with random positions
brauliorivas Jun 25, 2024
b66f72d
feat: fix loading and prepare objects to be placed on canvas by algor…
brauliorivas Jun 24, 2024
cd887e5
add more links and begin with random positions
brauliorivas Jun 25, 2024
94088a8
Merge branch 'feat/mc-reco-view' of github.com:brauliorivas/dmx into …
brauliorivas Jun 25, 2024
67db9c2
feat: fix loading and prepare objects to be placed on canvas by algor…
brauliorivas Jun 24, 2024
34c8c0c
add more links and begin with random positions
brauliorivas Jun 25, 2024
ac1632e
fix filtering with new logic and test
brauliorivas Jun 26, 2024
e8affde
fix conflict
brauliorivas Jun 26, 2024
b236c65
Merge branch 'feat/contact-modal' into feat/mc-reco-view
brauliorivas Jun 26, 2024
b030b93
give enough space on limits
brauliorivas Jun 26, 2024
8c0135c
Merge branch 'feat/contact-modal' into feat/mc-reco-view
brauliorivas Jun 26, 2024
6022e7d
visualize recoparticles in a tree like structure
brauliorivas Jun 27, 2024
ea0b7a6
Merge branch 'main' into feat/mc-reco-view
brauliorivas Jun 29, 2024
322759f
build 3 views for visualizations
brauliorivas Jun 30, 2024
1229aac
add proper name for views
brauliorivas Jun 30, 2024
16288eb
add back filters (temporary solution)
brauliorivas Jun 30, 2024
0dc5988
fix pdg toggle for mcparticle tree view
brauliorivas Jul 1, 2024
8279495
add view for cluster, track and mc with each one
brauliorivas Jul 3, 2024
c8c2caf
fix exports for tests
brauliorivas Jul 3, 2024
3bf0b3e
add views for 1:many relations and draw different objects with differ…
brauliorivas Jul 4, 2024
a617726
merge reco particle view with cluster and tracks
brauliorivas Jul 7, 2024
9b592d2
fix associations views when different heights
brauliorivas Jul 7, 2024
4806d73
show momentum, energy and charge for reco particle
brauliorivas Jul 7, 2024
de191b1
show filters only on mc view
brauliorivas Jul 7, 2024
e650135
Merge pull request #48 from brauliorivas/feat/view-cluster-track
kjvbrt Jul 9, 2024
8dc35d1
initial views for particleid and vertex
brauliorivas Jul 10, 2024
bc5e1a2
add startvertex to same view as recoparticle-cluster-track
brauliorivas Jul 11, 2024
6cb7a15
show basic properties from ParticleID
brauliorivas Jul 11, 2024
67255ec
todo: fix when changing original x,y from object
brauliorivas Jul 11, 2024
3d93f29
add switcher between release and main
brauliorivas Jul 12, 2024
fa4fbbd
show switcher on home page instead of modal
brauliorivas Jul 12, 2024
bc2b522
Merge pull request #55 from brauliorivas/feat/view-partid-vertex
brauliorivas Jul 12, 2024
d2b072d
create helper function to draw object header
brauliorivas Jul 12, 2024
824c6dd
write object name on top
brauliorivas Jul 12, 2024
abff17c
adjust test according to new mcparticle height
brauliorivas Jul 12, 2024
fb30b71
load collection name into object
brauliorivas Jul 12, 2024
ec335b9
detect when mouse is over an object
brauliorivas Jul 12, 2024
1de96be
show collection name from object when hovered
brauliorivas Jul 12, 2024
3c93128
remove log
brauliorivas Jul 12, 2024
db4f5a3
improve hover effect
brauliorivas Jul 12, 2024
3073c29
move further left text
brauliorivas Jul 12, 2024
185d36a
basic information modal for empty view
brauliorivas Jul 12, 2024
e29441d
show info modal when empty
brauliorivas Jul 12, 2024
d79f237
change duration of input modal + show on missing views
brauliorivas Jul 12, 2024
b18a577
Adding full sim example file
kjvbrt Jul 12, 2024
4d051b0
Adding file sizes
kjvbrt Jul 12, 2024
2ab2e89
improve functionality when checking for empty view
brauliorivas Jul 13, 2024
3c45990
change cursor on mouse over
brauliorivas Jul 13, 2024
4910729
simplify if statement
brauliorivas Jul 14, 2024
05371cc
show basic informationabout the current view inside the modal
brauliorivas Jul 14, 2024
92cc302
display simulator status for MCParticle on mouse over together with c…
brauliorivas Jul 14, 2024
1fcfeab
move mappings from SimStatus into new file to fix tests
brauliorivas Jul 14, 2024
c8ad0fd
add switcher between release and main
brauliorivas Jul 12, 2024
a588bfd
show switcher on home page instead of modal
brauliorivas Jul 12, 2024
b9d7f73
simplify if statement
brauliorivas Jul 15, 2024
5f881c4
rename main to develop
brauliorivas Jul 15, 2024
ddefeb3
fix merge conflict
brauliorivas Jul 15, 2024
28b2d70
parse bitfield according to @tmadlener bitwise operations
brauliorivas Jul 15, 2024
873c4f3
select view information by default when visualizing
brauliorivas Jul 15, 2024
f67d480
show first This View button
brauliorivas Jul 15, 2024
2a0f9f9
use html for descriptions
brauliorivas Jul 15, 2024
0281cbd
wrap words in span to use html color styling
brauliorivas Jul 15, 2024
598f8ce
remove commas to save space
brauliorivas Jul 16, 2024
136f20a
add more vertical space for collection type title
brauliorivas Jul 17, 2024
6e03d82
hide about eede button at beginning
brauliorivas Jul 17, 2024
07291a8
set view name on info button
brauliorivas Jul 17, 2024
669cc24
Merge pull request #58 from key4hep/feat/object-title
brauliorivas Jul 17, 2024
0270a1d
Merge pull request #59 from key4hep/feat/object-hover-info
brauliorivas Jul 17, 2024
c578a9b
Merge pull request #56 from brauliorivas/feat/switch-deploy
brauliorivas Jul 17, 2024
c296ca6
Merge branch 'main' into feat/empty-view-alert
brauliorivas Jul 17, 2024
f294357
Merge pull request #61 from key4hep/feat/empty-view-alert
brauliorivas Jul 17, 2024
4474702
Merge branch 'main' into feat/view-info-section
brauliorivas Jul 17, 2024
2659b8f
Merge pull request #62 from key4hep/feat/view-info-section
brauliorivas Jul 17, 2024
e856a9a
Merge pull request #60 from kjvbrt/multifiles
brauliorivas Jul 17, 2024
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
18 changes: 18 additions & 0 deletions css/empty-view.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#empty-view {
display: none;
align-items: center;
background-color: #e1e1e1;
padding: 10px;
position: fixed;
z-index: 1;
height: 30px;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
border-radius: 5px;
border: 1px solid #000;
}

#empty-view p {
margin-left: 10px;
}
37 changes: 37 additions & 0 deletions css/information.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,40 @@
.info-modal-content {
width: 100%;
}

#information-buttons {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
margin-top: 10px;
}

.information-button {
background-color: #fff;
padding: 5px;
border-radius: 5px;
border: 1px solid black;
margin: 0 5px;
}

.information-button:hover {
cursor: pointer;
background-color: #c5c5c5;
}

#information-button {
background-color: #c5c5c5;
}

#view-information-button {
display: none;
}

#information-button {
display: none;
}

#view-information-content {
display: none;
}
32 changes: 32 additions & 0 deletions css/switch-deploy.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#switch-deploy {
position: fixed;
left: 10px;
bottom: 10px;
display: flex;
flex-direction: row;
align-items: center;
z-index: 1;
background-color: #fff;
padding: 5px;
border-radius: 5px;
border: 1px solid #000;
}

#switch-deploy-button {
cursor: pointer;
background-color: #fff;
border: 1px solid #000;
padding: 5px;
border-radius: 5px;
font-family: sans-serif;
font-size: 14px;
}

#switch-deploy-button:hover {
background-color: #c5c5c5;
cursor: pointer;
}

#switch-deploy-text {
margin: 0 7px 0 0;
}
61 changes: 61 additions & 0 deletions css/views.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#available-views {
display: flex;
flex-wrap: wrap;
flex-direction: row;
justify-content: flex-start;
align-items: center;
padding: 8px;
max-height: 90px;
overflow-y: auto;
}

.view-button {
background-color: #f1f1f1;
border: 1px solid #000;
border-radius: 5px;
padding: 8px;
margin: 8px;
cursor: pointer;
height: fit-content;
}

#views {
display: none;
flex-direction: column;
position: fixed;
top: 25%;
left: 10px;
width: fit-content;
height: 50%;
background-color: #e1e1e1;
padding: 15px;
border: 1px solid #000;
border-radius: 5px;
}

#view-selector {
display: flex;
flex-direction: column;
justify-content: flex-start;
overflow-y: auto;
overflow-x: hidden;
width: fit-content;
}

.view-selector-menu::-webkit-scrollbar {
width: 7px;
}

.view-selector-menu::-webkit-scrollbar-track {
background: #e1e1e1;
border-radius: 5px;
}

.view-selector-menu::-webkit-scrollbar-thumb {
background: #afafaf;
border-radius: 5px;
}

.view-selector-menu::-webkit-scrollbar-thumb:hover {
background: #858585;
}
5 changes: 5 additions & 0 deletions img/blue-info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
147 changes: 94 additions & 53 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<link rel="stylesheet" href="css/event.css">
<link rel="stylesheet" href="css/information.css">
<link rel="stylesheet" href="css/contact.css">
<link rel="stylesheet" href="css/views.css">
<link rel="stylesheet" href="css/empty-view.css">
<link rel="stylesheet" href="css/switch-deploy.css">
</head>

<body>
Expand All @@ -33,14 +36,23 @@
<div class="mb-20">
<label class="mr-10" for="input-file">Select EDM4hep JSON:</label>
<input id="input-file" name="input-file" type="file" accept=".json">
<p class="small-text ml-20">Example input file (right click to save): <a
href="https://fccsw.web.cern.ch/fccsw/eede/p8_ee_ZH_ecm240.edm4hep.json">p8_ee_ZH_ecm240.edm4hep.json</a>
<p class="small-text ml-20">Example input files (right click to save):
<ul class="small-text">
<li>
Delphes: <a href="https://fccsw.web.cern.ch/fccsw/eede/p8_ee_ZH_ecm240.edm4hep.json">p8_ee_ZH_ecm240.edm4hep.json</a> [5.6 MB]
</li>
<li>
Full Sim: <a href="https://fccsw.web.cern.ch/fccsw/eede/wzp6_ee_mumuH_ecm240_CLD_RECO.edm4hep.json">wzp6_ee_mumuH_ecm240_CLD_RECO.edm4hep.json</a> [28 MB]
</li>
</ul>
</p>
</div>
<div id="event-selector">
<label class="mr-10" for="event-number">Select event number:</label>
<select name="event-number" id="event-number"></select>
</div>
<div id="available-views" class="view-selector-menu">
</div>
<br>
<div class="align-right">
<button id="visualize-button">Visualize</button>
Expand Down Expand Up @@ -95,64 +107,93 @@
<div class="info-modal-content">
<span class="logo-letter e1">e</span><span class="logo-letter e2">e</span><span
class="logo-letter d">d</span><span class="logo-letter e3">E</span>
<p>Welcome to eede, an EDM4hep Event Data Explorer. Learn more about eede on the <a
href="https://github.com/key4hep/eede/wiki" target="_blank" rel="noopener noreferrer">wiki</a>.
Want to learn more about EDM4hep? Check out the <a href="https://edm4hep.web.cern.ch" target="_blank"
rel="noopener noreferrer">EDM4hep</a> website.
</p>
<p>
Found a bug or have a feature request? Open a new <a href="https://github.com/key4hep/eede/issues"
target="_blank" rel="noopener noreferrer">issue</a>.
</p>
<p>Contact:</p>
<ul>
<li class="contact-element">Juraj Smiesko:
<address class="email">
<a href="mailto:[email protected]">
<img src="img/juraj-email.webp" alt="juraj-email" height="21px" />
</a>
</address>
<button class="copy-email-button" data-email="[email protected]">
<abbr title="Copy to Clipboard">
<img src="img/copy.svg" alt="Copy" width="16" height="16" />
</abbr>
</button>

</li>
<li class="contact-element">Thomas Madlener:
<address class="email">
<a href="mailto:[email protected]">
<img src="img/thomas-email.webp" alt="thomas-email" height="21px" />
</a>
</address>
<button class="copy-email-button" data-email="[email protected]">
<abbr title="Copy to Clipboard">
<img src="img/copy.svg" alt="Copy" width="16" height="16" />
</abbr>
</button>
</li>
<li class="contact-element">Braulio Rivas:
<address class="email">
<a href="mailto:[email protected]">
<img src="img/braulio-email.webp" alt="braulio-email" height="21px" />
</a>
</address>
<button class="copy-email-button" data-email="[email protected]">
<abbr title="Copy to Clipboard">
<img src="img/copy.svg" alt="Copy" width="16" height="16" />
</abbr>
</button>
</li>
</ul>
<div id="information-buttons">
<button id="view-information-button" class="information-button">This view</button>
<button id="information-button" class="information-button">About eede</button>
</div>
<div id="information-options">
<div id="information-content">
<p>Welcome to eede, an EDM4hep Event Data Explorer. Learn more about eede on the <a
href="https://github.com/key4hep/eede/wiki" target="_blank" rel="noopener noreferrer">wiki</a>.
Want to learn more about EDM4hep? Check out the <a href="https://edm4hep.web.cern.ch" target="_blank"
rel="noopener noreferrer">EDM4hep</a> website.
</p>
<p>
Found a bug or have a feature request? Open a new <a href="https://github.com/key4hep/eede/issues"
target="_blank" rel="noopener noreferrer">issue</a>.
</p>
<p>Contact:</p>
<ul>
<li class="contact-element">Juraj Smiesko:
<address class="email">
<a href="mailto:[email protected]">
<img src="img/juraj-email.webp" alt="juraj-email" height="21px" />
</a>
</address>
<button class="copy-email-button" data-email="[email protected]">
<abbr title="Copy to Clipboard">
<img src="img/copy.svg" alt="Copy" width="16" height="16" />
</abbr>
</button>

</li>
<li class="contact-element">Thomas Madlener:
<address class="email">
<a href="mailto:[email protected]">
<img src="img/thomas-email.webp" alt="thomas-email" height="21px" />
</a>
</address>
<button class="copy-email-button" data-email="[email protected]">
<abbr title="Copy to Clipboard">
<img src="img/copy.svg" alt="Copy" width="16" height="16" />
</abbr>
</button>
</li>
<li class="contact-element">Braulio Rivas:
<address class="email">
<a href="mailto:[email protected]">
<img src="img/braulio-email.webp" alt="braulio-email" height="21px" />
</a>
</address>
<button class="copy-email-button" data-email="[email protected]">
<abbr title="Copy to Clipboard">
<img src="img/copy.svg" alt="Copy" width="16" height="16" />
</abbr>
</button>
</li>
</ul>
</div>
<div id="view-information-content">
<h2 id="view-title-info"></h2>
<div id="view-description-info"></div>
</div>
</div>
</div>
</div>

<div id="views">
<p>Select a view:</p>
<div id="view-selector" class="view-selector-menu"></div>
</div>

<div id="empty-view">
<img src="img/blue-info.svg" alt="Empty view" width="20" height="20" />
<p>This view has no elements</p>
</div>

<div id="switch-deploy">
<p id="switch-deploy-text">Switch to</p>
<button id="switch-deploy-button">release</button>
</div>

<canvas id="canvas" width="100vw" height="100vh"></canvas>

<script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js" type="text/javascript"></script>
<script type="module" src="js/main.js"></script>
<script type="module" src="js/menu/filter/filter.js"></script>
<script type="module" src="js/information.js"></script>
<script type="module" src="js/views/views.js"></script>
<script type="module" src="js/menu/filter/filter.js"></script>
<script type="module" src="js/switch-deploy.js"></script>
</body>

</html>
</html>
Loading
Loading