display stop commands in simulator and print preview (#3545)

4 files changed, 11 insertions, 3 deletions

diff --git a/lib/stitch_plan/color_block.py b/lib/stitch_plan/color_block.py
index 3cec826d..75b72a3b 100644
--- a/lib/stitch_plan/color_block.py
+++ b/lib/stitch_plan/color_block.py
@@ -74,6 +74,12 @@ class ColorBlock(object):
         return length
 
     @property
+    def num_stops(self):
+        """Number of stops in this color block."""
+
+        return sum(1 for stitch in self if stitch.stop)
+
+    @property
     def num_trims(self):
         """Number of trims in this color block."""
 
@@ -87,6 +93,8 @@ class ColorBlock(object):
 
     @property
     def stop_after(self):
+        # TODO: we do not add the stop command necessarily as the last stitch
+        # also we do not necessarily start a new color block when a stop command appears
         if self.last_stitch is not None:
             return self.last_stitch.stop
         else:
diff --git a/lib/stitch_plan/stitch_plan.py b/lib/stitch_plan/stitch_plan.py
index f6e3f0de..8439de18 100644
--- a/lib/stitch_plan/stitch_plan.py
+++ b/lib/stitch_plan/stitch_plan.py
@@ -172,7 +172,7 @@ class StitchPlan(object):
 
     @property
     def num_stops(self):
-        return sum(1 for block in self if block.stop_after)
+        return sum(block.num_stops for block in self)
 
     @property
     def num_trims(self):
diff --git a/print/templates/color_swatch.html b/print/templates/color_swatch.html
index fe64c855..9ff31642 100644
--- a/print/templates/color_swatch.html
+++ b/print/templates/color_swatch.html
@@ -21,7 +21,7 @@
             {# We don't want to see stops and trims if we have more than 13 colorSwatches to show #}
             {% if color_blocks|length < 13 %}
             <tspan dy="1.2em" x="2mm" class="swatch-trims">{{ _('# trims') }}: {{ color_block.num_trims }}</tspan>
-            <tspan dy="1.2em" x="2mm" class="swatch-stops">{{ _('stop after?') }}: {{ _("yes") if color_block.stop_after else _("no") }}</tspan>
+            <tspan dy="1.2em" x="2mm" class="swatch-stops">{{ _('# stops') }}: {{ color_block.num_stops }}</tspan>
             {% endif %}
           </text>
       </svg>
diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html
index b16691a0..aaa5cd2b 100644
--- a/print/templates/operator_detailedview.html
+++ b/print/templates/operator_detailedview.html
@@ -65,7 +65,7 @@
             </p>
             <p>
               <span class="num-trims">{{ _('trims') }}: {{ color_block.num_trims }}</span>
-              <span>{{ _('stop after?') }}: {{ _("yes") if color_block.stop_after else _("no") }}</span>
+              <span class="num-stops">{{ _('stops') }}: {{ color_block.num_stops }}</span>
               <input type="hidden" class="num-stops" value="{{ '1' if color_block.stop_after else '0' }}" />
             </p>
             <p>