Skip to content
This repository has been archived by the owner on Feb 9, 2022. It is now read-only.

Commit

Permalink
Implemented up to right before plotting modeling.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggirelli
ggirelli committed May 23, 2019
1 parent 90ebfc0 commit 445d1f0
Show file tree
Hide file tree
Showing 4 changed files with 544 additions and 25 deletions.
41 changes: 20 additions & 21 deletions app-model.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<link rel="stylesheet" href="css/main.css">

<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/ggirelli/wave2color/src/get_color.js" crossorigin="anonymous"></script>
<script src="js/main.js"></script>
<script src="js/main-model.js"></script>
</head>
<body>
<div class="row">
Expand All @@ -37,7 +37,6 @@ <h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas
<ul class="nav justify-content-end">
<li class="nav-item"><a class="nav-link" href="app.html"><i class="fas fa-home"></i> Home</a></li>
<li class="nav-item"><a class="nav-link disabled" href="#"><i class="fas fa-wave-square"></i> Model</a></li>
<li class="nav-item"><a class="nav-link" href="#"><i class="fas fa-sliders-h"></i> Settings</a></li>
</ul>
</header>
<article class="col col-10 offset-1"><div class="row">
Expand All @@ -59,41 +58,41 @@ <h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas
<div id="d3wrapper">
<svg></svg>
</div>
<div class="alert alert-light mb-0"><input type="checkbox" id="model-trigger" name="model-trigger" data-toggle="toggle" data-size="sm" data-onstyle="info" /> <label onclick="$('#model-trigger').bootstrapToggle('toggle')">Model source/fluorophore intensity through the selected filters.</label></div>
<div class="alert alert-light mb-0"><input type="checkbox" id="model-trigger" name="model-trigger" data-toggle="toggle" data-size="sm" data-onstyle="info" /> <label onclick="$('#model-trigger').bootstrapToggle('toggle')">Model source/fluorophore intensity through the selected filters.</label><br /><small>You must select one of each of source, excitation/emission fitler, and fluorophore to be able to model the spectra throught the optical configuration.</small></div>
</div>
</div>
</div>

<div id="selection" class="col-12 mb-4">
<div id="selection" class="col-12 mb-3">
<div class="row">
<div class="col col-3">
<div class="card mb-1">
<div class="card-header text-right">Selected Source <i class="far fa-hand-pointer"></i></div>
<div class="card-body">
<div class="card-header text-right">Selected Source <i class="far fa-lightbulb"></i></div>
<div class="card-body sources selection">
<a class="btn btn-block btn-light disabled">unselected</a>
</div>
</div>
</div>
<div class="col col-3">
<div class="card mb-1">
<div class="card-header text-right">Selected Excitation Filter <i class="far fa-hand-pointer"></i></div>
<div class="card-body">
<div class="card-header text-right">Selected Excitation Filter <i class="fas fa-filter"></i></div>
<div class="card-body ex-filters selection">
<a class="btn btn-block btn-light disabled">unselected</a>
</div>
</div>
</div>
<div class="col col-3">
<div class="card mb-1">
<div class="card-header text-right">Selected Fluorophore<i class="far fa-hand-pointer"></i></div>
<div class="card-body">
<div class="card-header text-right">Selected Fluorophore <i class="fas fa-tint"></i></div>
<div class="card-body fluorophores selection">
<a class="btn btn-block btn-light disabled">unselected</a>
</div>
</div>
</div>
<div class="col col-3">
<div class="card mb-1">
<div class="card-header text-right">Selected Emission Filter<i class="far fa-hand-pointer"></i></div>
<div class="card-body">
<div class="card-header text-right">Selected Emission Filter <i class="fas fa-filter"></i></div>
<div class="card-body em-filters selection">
<a class="btn btn-block btn-light disabled">unselected</a>
</div>
</div>
Expand All @@ -102,7 +101,7 @@ <h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas
<p class="mb-1"><small><i class="far fa-hand-pointer"></i> Click on a selected feature to remove it from the current selection.</small></p>
</div>

<div id="input" class="col-12">
<div id="input" class="col-12 mb-4">
<div class="card">
<div class="card-header"><i class="fas fa-sign-in-alt"></i> Input</div>
<div class="card-body">
Expand All @@ -112,36 +111,36 @@ <h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas
<div class="card-header" id="headingOne"><h2 class="mb-0">
<button class="btn btn-link collapsed btn-block text-left text-dark" type="button" data-toggle="collapse" data-target="#sources" aria-expanded="true" aria-controls="sources"><i class="fa fa-lightbulb"></i> Sources</button>
</h2></div>
<div id="sources" class="collapse" aria-labelledby="headingOne" data-parent="#accordion-settings"><div class="card-body">
<div id="sources" class="sources collapse" aria-labelledby="headingOne" data-parent="#accordion-settings"><div class="card-body">
<small>Click to add to current selection.</small>
<div class="settings option-list"></div>
<div class="input option-list"></div>
</div></div>
</div>
<div class="card">
<div class="card-header" id="headingOne"><h2 class="mb-0">
<button class="btn btn-link collapsed btn-block text-left text-dark" type="button" data-toggle="collapse" data-target="#ex-filters" aria-expanded="true" aria-controls="ex-filters"><i class="fas fa-filter"></i> Excitation Filters</button>
</h2></div>
<div id="ex-filters" class="collapse" aria-labelledby="headingOne" data-parent="#accordion-settings"><div class="card-body">
<div id="ex-filters" class="ex-filters collapse" aria-labelledby="headingOne" data-parent="#accordion-settings"><div class="card-body">
<small>Click to add to current selection.</small>
<div class="settings option-list"></div>
<div class="input option-list"></div>
</div></div>
</div>
<div class="card">
<div class="card-header" id="headingTwo"><h2 class="mb-0">
<button class="btn btn-link collapsed btn-block text-left text-dark" type="button" data-toggle="collapse" data-target="#fluorophores" aria-expanded="false" aria-controls="fluorophores"><i class="fas fa-tint"></i> Fluorophores</button>
</h2></div>
<div id="fluorophores" class="collapse" aria-labelledby="headingTwo" data-parent="#accordion-settings"><div class="card-body">
<div id="fluorophores" class="fluorophores collapse" aria-labelledby="headingTwo" data-parent="#accordion-settings"><div class="card-body">
<small>Click to add to current selection.</small>
<div class="settings option-list"></div>
<div class="input option-list"></div>
</div></div>
</div>
<div class="card">
<div class="card-header" id="headingOne"><h2 class="mb-0">
<button class="btn btn-link collapsed btn-block text-left text-dark" type="button" data-toggle="collapse" data-target="#em-filters" aria-expanded="true" aria-controls="em-filters"><i class="fas fa-filter"></i> Emission Filters</button>
</h2></div>
<div id="em-filters" class="collapse" aria-labelledby="headingOne" data-parent="#accordion-settings"><div class="card-body">
<div id="em-filters" class="em-filters collapse" aria-labelledby="headingOne" data-parent="#accordion-settings"><div class="card-body">
<small>Click to add to current selection.</small>
<div class="settings option-list"></div>
<div class="input option-list"></div>
</div></div>
</div>
</div>
Expand Down
5 changes: 2 additions & 3 deletions app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@
<h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas fa-microscope" onClick="javascript:wave=prompt('Insert wavelength (in nm) or \'reset\' to reset.');color = wave == 'reset' ? 'white' : get_color(wave); $('body').css('background-color', color);"></i></h1>

<ul class="nav justify-content-end">
<li class="nav-item"><a class="nav-link disabled" href="#"><i class="fas fa-home"></i> Home</a></li>
<li class="nav-item"><a class="nav-link" href="app-model.html"><i class="fas fa-wave-square"></i> Model</a></li>
<li class="nav-item"><a class="nav-link" href="#"><i class="fas fa-sliders-h"></i> Settings</a></li>
<li class="nav-item"><a class="nav-link disabled" href=""><i class="fas fa-home"></i> Home</a></li>
<!--<li class="nav-item"><a class="nav-link" href="app-model.html"><i class="fas fa-wave-square"></i> Model</a></li>-->
</ul>
</header>
<article class="col col-10 offset-1"><div class="row">
Expand Down
2 changes: 1 addition & 1 deletion css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ h1 {
background-color: #efefef;
}

.option-list a.btn span.fluColor {
a.btn span.fluColor {
display: inline-block;
margin-right: 0.5em;
width: 1em;
Expand Down
Loading

0 comments on commit 445d1f0

Please sign in to comment.