Commit ae12eb47 authored by vertighel's avatar vertighel
Browse files

control central column

parent 59e76bc7

noctua/web/pages/control.html

+22 −19
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
    <article class="col-xl-4 col-lg-6">



      <section>      

        <!-- <h4 class="p-2">Telescope</h4> -->

        

        {{ ctrl.mount_pointing() }}
@@ -63,16 +62,18 @@ 
        <h4 class="p-2">Dome</h4>



        {{ w.widget_shutter("/dome/shutter", "/dome/shutter/movement", extra_flags=False) }}

        

      </section>

      

    </article>



    <!-- CENTER: Mode selector + per-mode framing & observation forms -->

    <article class="col-xl-4 col-lg-6">

    <article class="col-xl-3 col-lg-6">

      

        {{ ctrl.observing_mode_selector() }}



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

          

          {{ w.widget_toggle({

            "label": "Frame",

             "buttons": [
@@ -86,6 +87,9 @@ 
                {"label": "end", "status": "camera-settings-xyend"},

              ]

        }) }}



        {{ mode.imaging_panel() }}



        </section>

        

        <section id="mode-panel-spectro" class="mode-panel d-none" data-subsystem="camera2">
@@ -103,16 +107,15 @@ 
              {"label": "end", "status": "camera2-settings-xyend"},

            ]

        }) }}

        </section>



        {{ mode.imaging_panel() }}

        {{ mode.spectro_panel() }}

        {{ mode.echelle_panel() }}



        </section>



    </article>



    <!-- RIGHT: Monitors -->

    <article class="col-xl-4 col-12">

    <article class="col-xl-5 col-12">

      <div class="card bg-dark border-secondary shadow-sm">

        

        <div class="card-header p-0 border-secondary">

noctua/web/pages/macros/mode_panels.html

+61 −140
Original line number Diff line number Diff line
@@ -7,38 +7,6 @@ 
-->



{% macro imaging_panel() %}

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



  <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"

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

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

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

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

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

</fieldset>



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

  <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-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>



<form id="form-imaging" autocomplete="off">
@@ -129,50 +97,9 @@ 
  <small class="col-4 text-success">T: <var data-status="camera-settings-temperature">N/A</var>°C</small>

</aside>



</div>

{% endmacro %}





{% macro spectro_panel() %}

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



  <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>

</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>



    <div class="card mb-3">

        <div class="card-body">

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

<form id="form-spectro" autocomplete="off">



  <div class="row g-2 mb-2">
@@ -181,8 +108,6 @@ 
      <select class="form-select form-select-sm bg-black" name="imagetype">

        <option value="Light">Light</option>

        <option value="Bias">Bias</option>

                            <option value="Flat">Flat</option>

                            <option value="Dark">Dark</option>

      </select>

    </div>

    <div class="col-6">
@@ -231,14 +156,10 @@ 


</form>



            <div class="row g-1 mt-2 small font-monospace">

                <div class="col-6 text-success">state: <var data-status="camera2-snapshot-state">—</var></div>

                <div class="col-6 text-success">T: <var data-status="camera2-settings-temperature">—</var>°C</div>

            </div>

        </div>

    </div>



</div>

<aside class="row g-1 mt-2 small font-monospace">

  <small class="col-6 text-success">state: <var data-status="camera2-snapshot-state">—</var></small>

  <small class="col-6 text-success">T: <var data-status="camera2-settings-temperature">—</var>°C</small>

</aside>

{% endmacro %}