diff --git a/test_tube_scanner/scanner/multiwell.py b/test_tube_scanner/scanner/multiwell.py index c3c36c9..bf09fe5 100644 --- a/test_tube_scanner/scanner/multiwell.py +++ b/test_tube_scanner/scanner/multiwell.py @@ -149,11 +149,15 @@ class MultiWellManager: uuid = f'{self.process.data.session}-{multiwell.position}-{wl.well.name}' self._grid_scanning_capture(uuid, multiwell.duration) + self.process._send(uuid=uuid) + logger.info(f"Scan terminé — retour à l'origine (X={xnext:.1f} Y={ynext:.1f})") self.cnc_controller.move_to(xnext, ynext, feed=multiwell.feed*2) def _start_scanning(self, session, observations): + self.process.cam._aligner.debug = False + xynext = [] for obs in observations: xynext.append((obs.multiwell.xbase, obs.multiwell.ybase)) @@ -256,7 +260,8 @@ class MultiWellManager: self.cnc_controller.move_to(self.cnc_controller.x + dx_mm, self.cnc_controller.y + dy_mm, feed=150) self.process._send(state='center', msg=msg) - elif cam.align_detection.get('action') in ['none',]: + elif cam.align_detection.get('action') in ['none']: + msg = f"Ok centre trouvé. {msg}" logger.info(msg) self.process._send(state='save', msg=msg) wl.x, wl.y = self.cnc_controller.x, self.cnc_controller.y diff --git a/test_tube_scanner/scanner/static/scanner/css/calibration.css b/test_tube_scanner/scanner/static/scanner/css/calibration.css index 1cdd922..2e7f187 100644 --- a/test_tube_scanner/scanner/static/scanner/css/calibration.css +++ b/test_tube_scanner/scanner/static/scanner/css/calibration.css @@ -1,38 +1,4 @@ -.container { - height: 100%; - padding: 0.25em; - display: grid; - grid-template-columns: 180px 1fr 150px; - grid-template-rows: 64px 1fr; - - gap: 1em 1em; - grid-auto-flow: row; - grid-template-areas: - "header header header" - "move scanner scan" -} -.header { - align-self: stretch; - grid-area: header; -} - -.scanner { - justify-self: center; - align-self: center; - grid-area: scanner; -} - -.scan { - padding: 0 0.25em; - align-self: start; - grid-area: scan; -} -.move { - align-self: start; - grid-area: move; -} - .well { padding: 0.2em; } diff --git a/test_tube_scanner/scanner/static/scanner/css/images.css b/test_tube_scanner/scanner/static/scanner/css/images.css index a5ac35c..44c11e9 100644 --- a/test_tube_scanner/scanner/static/scanner/css/images.css +++ b/test_tube_scanner/scanner/static/scanner/css/images.css @@ -1,18 +1,13 @@ .multiwell_cards { display: grid; - /*grid-auto-columns: 1fr; - grid-auto-rows: 1fr;*/ - grid-template-columns: 1fr 1fr; - grid-template-rows: 1fr 1fr 1fr; - gap: 0.1em; - grid-template-areas: - ". ." - ". ." - ". ."; + grid-template-columns: repeat(6, 1fr); + justify-items: center; + align-items: center; } + button.multiwell { - padding: 0.15em ; + padding: 0.2em ; } #image-grid { diff --git a/test_tube_scanner/scanner/static/scanner/css/main.css b/test_tube_scanner/scanner/static/scanner/css/main.css index a264c16..8b13789 100644 --- a/test_tube_scanner/scanner/static/scanner/css/main.css +++ b/test_tube_scanner/scanner/static/scanner/css/main.css @@ -1,30 +1 @@ - -.container { - height: 100%; - padding: 0.25em; - display: grid; - grid-template-columns: 180px 1fr; - grid-template-rows: 64px 0.5fr; - - gap: 1em 1em; - grid-auto-flow: row; - grid-template-areas: - "header header" - "scan scanner" -} -.header { - align-self: stretch; - grid-area: header; -} - -.scanner { - justify-self: center; - align-self: center; - grid-area: scanner; -} - -.scan { - align-self: start; - grid-area: scan; -} diff --git a/test_tube_scanner/scanner/static/scanner/css/replay.css b/test_tube_scanner/scanner/static/scanner/css/replay.css index cc9dbfa..5d30c61 100644 --- a/test_tube_scanner/scanner/static/scanner/css/replay.css +++ b/test_tube_scanner/scanner/static/scanner/css/replay.css @@ -1,19 +1,15 @@ .multiwell_cards { display: grid; - /*grid-auto-columns: 1fr; - grid-auto-rows: 1fr;*/ - grid-template-columns: 1fr 1fr; - grid-template-rows: 1fr 1fr 1fr; - gap: 0.1em; - grid-template-areas: - ". ." - ". ." - ". ."; + grid-template-columns: repeat(6, 1fr); + justify-items: center; + align-items: center; } + button.multiwell { - padding: 0.15em ; + padding: 0.2em ; } + #replay-grid { display: grid; grid-template-columns: repeat(var(--grid-columns, 1), 1fr); diff --git a/test_tube_scanner/scanner/static/scanner/css/scanner.css b/test_tube_scanner/scanner/static/scanner/css/scanner.css deleted file mode 100644 index 33dbcf4..0000000 --- a/test_tube_scanner/scanner/static/scanner/css/scanner.css +++ /dev/null @@ -1,31 +0,0 @@ - -.container { - padding: 0.25em; - display: grid; - grid-template-columns: 0.25fr 1.5fr; - grid-template-rows: 0.5fr 3fr 0.5fr; - grid-auto-columns: 1fr; - gap: 1em 1em; - grid-auto-flow: row; - grid-template-areas: - "header header" - "move scanner" - "command command"; -} -.header { - align-self: stretch; - grid-area: header; -} - -.command { grid-area: command; } - -.scanner { - justify-self: center; - align-self: center; - grid-area: scanner; -} - -.move { - align-self: stretch; - grid-area: move; -} diff --git a/test_tube_scanner/scanner/static/scanner/js/main.js b/test_tube_scanner/scanner/static/scanner/js/main.js index f369996..7ff9e0f 100644 --- a/test_tube_scanner/scanner/static/scanner/js/main.js +++ b/test_tube_scanner/scanner/static/scanner/js/main.js @@ -16,12 +16,13 @@ class ScannerManager { this.halt_bt = options.halt; this.debug = options.debug; this.median = options.median; - this._rop = options.crop; + this.crop = options.crop; this.speed_px_s = options.speed_px_s; this.axial_speed = options.axial_speed; this.axial_pos = options.axial_pos; this.area_px = options.area_px; this.frame_count = options.frame_count; + this.uuid = options.uuid; } init_controls() { diff --git a/test_tube_scanner/scanner/templates/scanner/calibration.html b/test_tube_scanner/scanner/templates/scanner/calibration.html index 3007214..5b677fb 100644 --- a/test_tube_scanner/scanner/templates/scanner/calibration.html +++ b/test_tube_scanner/scanner/templates/scanner/calibration.html @@ -8,175 +8,180 @@ {% block columns %}{% endblock %} {% block content %} -
-
-
-
- {% trans 'Position multi-puit' %}
- -
-
-
{% trans 'Vitesse' %}
- -
- -
-
{% trans 'Pas' %}
- -
-
-
{% trans 'Durée' %}
- -
-
-
-
-
-
+
+
+
+
+ {% trans 'Position multi-puit' %}
+ +
+
+
{% trans 'Vitesse' %}
+ +
+
+
{% trans 'Pas' %}
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
- -
-
-
X
-
Y
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- -
-
- -
-
- -
-
- -
+
+
+
+
+
+ +
+
+ +
-
- - -
-
- -
-
- -
-
- -
-
- {% trans 'Rayon' %}
- px -
-
- - -
- {% include 'scanner/scan-image.html' %}
-
    +
    + {% include 'scanner/scan-image.html' %} +
    +
    +
    +
    +
    +
    +
    X
    +
    Y
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + {% trans 'Rayon' %} px
    + +
    +
    +
    {% trans 'Durée' %}
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
      {% endblock %} {% block js_footer %} diff --git a/test_tube_scanner/scanner/templates/scanner/images.html b/test_tube_scanner/scanner/templates/scanner/images.html index 9e62515..a330ea2 100644 --- a/test_tube_scanner/scanner/templates/scanner/images.html +++ b/test_tube_scanner/scanner/templates/scanner/images.html @@ -6,7 +6,7 @@ {% endblock %} {% block sidebar_list %} - {% trans "Retour accueil" %} + {% trans "Retour accueil" %}
      {% csrf_token %} {% if cursid %} -
      - {% multiwell_cards cursid observations %} -
      + {% multiwell_cards cursid observations %} {% endif %}
      {% if cursid %} - {% trans "Exporter l'ensemble des images" %} + {% trans "Exporter l'ensemble des images" %} {% endif %} {% endblock %} diff --git a/test_tube_scanner/scanner/templates/scanner/main.html b/test_tube_scanner/scanner/templates/scanner/main.html index 8128de7..5e1946f 100644 --- a/test_tube_scanner/scanner/templates/scanner/main.html +++ b/test_tube_scanner/scanner/templates/scanner/main.html @@ -8,45 +8,63 @@ {% block columns %}{% endblock %} {% block content %} -
      -
      -
      -
      -
      {% trans "Choix de la session" %}
      - -
      -
      -
      -
      - (, ) -
      -
      -
      +
      +
      +
      +
      {% trans "Choix de la session" %}
      +
      -
      - - -
      - +
      +
      + +
      +
      + +
      +
      + -
      - {% include 'scanner/scan-image.html' %} +
      +
      + +
      +
      -
        +
        + {% include 'scanner/scan-image.html' %} +
        +
        +
          {% endblock %} {% block js_footer %} {{ block.super }} diff --git a/test_tube_scanner/scanner/templates/scanner/replay.html b/test_tube_scanner/scanner/templates/scanner/replay.html index 92a98c4..3729433 100644 --- a/test_tube_scanner/scanner/templates/scanner/replay.html +++ b/test_tube_scanner/scanner/templates/scanner/replay.html @@ -7,7 +7,7 @@ {% endblock %} {% block columns %}{% endblock %} {% block sidebar_list %} - {% trans "Retour accueil" %} + {% trans "Retour accueil" %}
          {% csrf_token %} {% if cursid %} -
          - {% multiwell_cards cursid observations %} -
          + {% multiwell_cards cursid observations %} {% endif %}
          {% if cursid %} - {% trans "Exporter l'ensemble des vidéos" %} + {% trans "Exporter l'ensemble des vidéos" %} {% endif %} {% endblock %} diff --git a/test_tube_scanner/scanner/templates/scanner/scan-image.html b/test_tube_scanner/scanner/templates/scanner/scan-image.html index c957f90..1c45470 100644 --- a/test_tube_scanner/scanner/templates/scanner/scan-image.html +++ b/test_tube_scanner/scanner/templates/scanner/scan-image.html @@ -1,5 +1,5 @@ -
          +
          {% if use_tracking %}
          Num:
          diff --git a/test_tube_scanner/scanner/templatetags/scanner_tags.py b/test_tube_scanner/scanner/templatetags/scanner_tags.py index f5e1e51..b42250d 100644 --- a/test_tube_scanner/scanner/templatetags/scanner_tags.py +++ b/test_tube_scanner/scanner/templatetags/scanner_tags.py @@ -1,7 +1,6 @@ # encoding: utf-8 from django import template from django.utils.html import mark_safe -from .. import models register = template.Library() @@ -12,16 +11,14 @@ def multiwell_cards(sid, observations): row_def = obs.multiwell.row_def.split(',') multiwells.append( f''' -
          {obs.title}
          +
          ''') for row in range(obs.multiwell.rows): - multiwells.append('''
          ''') for col in range(obs.multiwell.cols): btn = f'{row_def[row]}{col+1}' uuid = f'{sid}-{obs.multiwell.position}-{btn}' multiwells.append(f"""""") - multiwells.append('''
          ''') multiwells.append('''
          ''') return mark_safe("\n".join(multiwells))