Commit 974d5252 authored by vertighel's avatar vertighel
Browse files

input bugs

parent 3b9a0244

noctua/web/pages/control.html

+14 −5
Original line number Diff line number Diff line
@@ -29,6 +29,15 @@ 
      <section>      

        <h4 class="p-2">Mode selector</h4>



        {{ w.widget_toggle({

        "info": "stage-named",

        "buttons": [

          {"label": "Imaging",  "endpoint": "/stage/named", "val": "imaging",  "method": "PUT"},

          {"label": "Spectro",  "endpoint": "/stage/named", "val": "spectro",  "method": "PUT"},

          {"label": "Échelle",  "endpoint": "/stage/named", "val": "echelle",  "method": "PUT"},

        ],

        }) }}



        {{ w.widget_toggle({

        "label": "Named pos.",

        "info": "stage-named",

noctua/web/pages/macros/mode_panels.html

+41 −20
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
{% macro imaging_panel() %}

<div id="mode-panel-imaging" class="mode-panel" data-subsystem="camera">



  <h4 class="p-2">Imaging — Framing</h6>

  <h4 class="p-2">Imaging - Frame</h6>



<fieldset class="btn-group btn-group-sm w-100 mb-3">

  <button class="btn btn-outline-primary btn-universal"
@@ -21,16 +21,21 @@ 
</fieldset>



<aside class="row g-1 small font-monospace text-success">

  <small class="col-6">X:

  <small class="col-4">X:

    <var data-status="camera-settings-xystart-0">N/A</var>

    →

    <var data-status="camera-settings-xyend-0">N/A</var>

  </small>

  <small class="col-6">Y:

  <small class="col-4">Y:

    <var data-status="camera-settings-xystart-1">N/A</var>

    →

    <var data-status="camera-settings-xyend-1">N/A</var>

  </small>

  <small class="col-4">size:

    <var data-status="camera-settings-size-0">N/A</var>

    ,

    <var data-status="camera-settings-size-1">N/A</var>

  </small>

</aside>



<h6 class="card-title text-info mb-3">Imaging — Observe</h6>
@@ -73,7 +78,7 @@ 
    <div class="col-6">

      <label class="small text-muted">Exptime (s)</label>

      <input type="number" class="form-control form-control-sm bg-black"

             name="exptime" value="10.0" min="0" step="0.1">

             name="exptime" value="1.0" min="0" step="0.1">

    </div>

    <div class="col-6">

      <label class="small text-muted">Repeat (#)</label>
@@ -131,21 +136,37 @@ 
{% macro spectro_panel() %}

<div id="mode-panel-spectro" class="mode-panel d-none" data-subsystem="camera2">



    <div class="card mb-3">

        <div class="card-body">

            <h6 class="card-title text-info mb-3">Spectro — Framing</h6>

            <div class="btn-group btn-group-sm w-100 mb-3">

  <h4 class="p-2">Imaging - Spectro</h6>



<fieldset class="btn-group btn-group-sm w-100 mb-3">

  <button class="btn btn-outline-primary btn-universal"

          data-method="PUT" data-url="/camera2/frame/full">Full</button>

  <button class="btn btn-outline-primary btn-universal"

          data-method="PUT" data-url="/camera2/frame/half">Half</button>

  <button class="btn btn-outline-primary btn-universal"

          data-method="PUT" data-url="/camera2/frame/small">Small</button>

            </div>

            <div class="row g-1 small font-monospace text-success">

                <div class="col-6">X: <var data-status="camera2-settings-xystart-0">—</var> → <var data-status="camera2-settings-xyend-0">—</var></div>

                <div class="col-6">Y: <var data-status="camera2-settings-xystart-1">—</var> → <var data-status="camera2-settings-xyend-1">—</var></div>

            </div>

</fieldset>



<aside class="row g-1 small font-monospace text-success">

  <small class="col-4">X:

    <var data-status="camera2-settings-xystart-0">N/A</var>

    →

    <var data-status="camera2-settings-xyend-0">N/A</var>

  </small>

  <small class="col-4">Y:

    <var data-status="camera2-settings-xystart-1">N/A</var>

    →

    <var data-status="camera2-settings-xyend-1">N/A</var>

  </small>

  <small class="col-4">size:

    <var data-status="camera2-settings-size-0">N/A</var>

    ,

    <var data-status="camera2-settings-size-1">N/A</var>

  </small>

</aside>





            

        </div>

    </div>
@@ -177,7 +198,7 @@ 
                    <div class="col-6">

                        <label class="small text-muted">Exptime (s)</label>

                        <input type="number" class="form-control form-control-sm bg-black"

                               name="exptime" value="10.0" min="0" step="0.1">

                               name="exptime" value="1.0" min="0" step="0.1">

                    </div>

                    <div class="col-6">

                        <label class="small text-muted">Repeat (#)</label>