himbeere/open-organism-observer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

remove some random lines

Browse source
This commit is contained in:
lukas fricke 2025-02-25 18:12:16 +01:00
parent 01efcfad5d
commit 9acd5d7d2c
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
observe_bact.html
View file

@ -27,18 +27,11 @@
z-index:10; z-index:10;
width: 100%; width: 100%;
} }
#canvas-debug{
position:absolute;
z-index:10;
width: 20em;
opacity: 100%;
}
#photo { #photo {
position:absolute; position:absolute;
z-index:5; z-index:5;
width: 100%; width: 100%;
} }
#canvas-temp{ #canvas-temp{
@ -117,13 +110,13 @@
<select class="form-select" name="sample_chooser" id = "sample_chooser"></select> <select class="form-select" name="sample_chooser" id = "sample_chooser"></select>
</div> </div>
</div> </div>
<!-- the output div is used to display the video, the photo and the canvas where you can draw in (and measure) your organisms. --> <!-- the output div is used to display the video, the photo and the canvas where you can draw in (and measure) your organisms. -->
<div id="output" class="row"> <div id="output" class="row">
<div id = "video_container" class="col-9"> <div id = "video_container" class="col-9">
<img id="photo" alt="The screen capture will appear in this box." ></img> <img id="photo" alt="The screen capture will appear in this box." ></img>
<canvas id="canvas-draw"></canvas> <canvas id="canvas-draw"></canvas>
<video autoplay="true" id="video"></video> <video autoplay="true" id="video"></video>
</div> </div>
<div id = "control-elements" class="col-3"> <div id = "control-elements" class="col-3">
@ -137,7 +130,6 @@
<input class="form-control" type="number" id="Bacilli_count" <input class="form-control" type="number" id="Bacilli_count"
name="Bacilli_count" value=0> name="Bacilli_count" value=0>
</input> </input>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -206,14 +198,12 @@
<th> <th>
Choose bacterium Type Choose bacterium Type
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
<button class="btn btn-primary float-end" onclick="submit_FoV();">submit FoV</button> <button class="btn btn-primary float-end" onclick="submit_FoV();">submit FoV</button>
</div> </div>
<div id = "FoV_table_div"> <div id = "FoV_table_div">
<h2> Fields of View </h2> <h2> Fields of View </h2>
@ -364,9 +354,6 @@
request.onsuccess = ()=> { request.onsuccess = ()=> {
default_protocol_id = request.result.prep_setup; default_protocol_id = request.result.prep_setup;
get_all_prep_prefs(); get_all_prep_prefs();
// width of FoV -- will be supplied by FLASK microscope setup.
} }
request.onerror = (err)=> { request.onerror = (err)=> {
@ -433,7 +420,6 @@
// Move to the next record // Move to the next record
cursor.continue(); cursor.continue();
} }
} }
request.onerror = (err)=> { request.onerror = (err)=> {
@ -515,7 +501,6 @@
case "Spirochetes": case "Spirochetes":
label.classList.add("btn", "btn-outline-danger"); label.classList.add("btn", "btn-outline-danger");
break; break;
} }
label.htmlFor = 'org-type-'+bacteria_types[i]+''+index; label.htmlFor = 'org-type-'+bacteria_types[i]+''+index;
@ -687,7 +672,7 @@
var video = document.querySelector("#video"); var video = document.querySelector("#video");
var out = document.querySelector("#output"); var out = document.querySelector("#output");
// opencv stuff
var canvas_draw = document.getElementById("canvas-draw"); var canvas_draw = document.getElementById("canvas-draw");
const context = canvas_draw.getContext('2d'); const context = canvas_draw.getContext('2d');
@ -821,7 +806,6 @@
let ind_new = fits[i][1]; let ind_new = fits[i][1];
let ind_rect = fits[i][2]; let ind_rect = fits[i][2];
let fit = fits[i][3]; let fit = fits[i][3];
console.log(fit);
if (fit > 100000) { if (fit > 100000) {
break; break;
} }

5
observe_main.html
View file

@ -1207,14 +1207,11 @@
(ev) => { (ev) => {
if (!streaming) { if (!streaming) {
video_aspect = video.videoWidth / video.videoHeight; video_aspect = video.videoWidth / video.videoHeight;
video.style.aspectRatio = video_aspect; video.style.aspectRatio = video_aspect;
photo.style.aspectRatio = video_aspect; photo.style.aspectRatio = video_aspect;
canvas.style.aspectRatio = video_aspect; canvas.style.aspectRatio = video_aspect;
canvas_draw.style.aspectRatio = video_aspect; canvas_draw.style.aspectRatio = video_aspect;
canvas_draw.height = canvas_draw.height*5; canvas_draw.height = canvas_draw.height*5;
canvas_draw.width = canvas_draw.height*video_aspect; canvas_draw.width = canvas_draw.height*video_aspect;
streaming = true; streaming = true;