Changeset 1143 for trunk/papywizard/controller/shootController.py

Timestamp:

12/05/08 10:29:38 (4 years ago)

Author:

fma

Message:

Do not print repeat if not activated

File:

• trunk/papywizard/controller/shootController.py (modified) (4 diffs)

trunk/papywizard/controller/shootController.py

@@ -118 +118 @@
         self.viewport.add(self.shootingArea)
         self.shootingArea.show()
-        
+
         # Create text shooting area
         self.textShootingArea = gtk.VBox()
@@ -124 +124 @@
         self.position1Label.modify_font(pango.FontDescription("Arial 18"))
         self.textShootingArea.pack_start(self.position1Label)
-        self.position1Label.set_text("--")
+        #self.position1Label.set_text("")
         self.position2Label = gtk.Label()
         self.position2Label.modify_font(pango.FontDescription("Arial 18"))
         self.textShootingArea.pack_start(self.position2Label)
-        self.position2Label.set_text("")
+        #self.position2Label.set_text("")
         self.repeatLabel = gtk.Label()
         self.repeatLabel.modify_font(pango.FontDescription("Arial 18"))
-        self.repeatLabel.set_text("--")
+        #self.repeatLabel.set_text("")
         self.textShootingArea.pack_start(self.repeatLabel)
         self.textShootingArea.show_all()
@@ -411 +411 @@
         self._serializer.addWork(self.shootingArea.clear)
         self._serializer.addWork(self.progressbar.set_fraction, 0.)
-        self._serializer.addWork(self.position1Label.set_text, "--")
+        self._serializer.addWork(self.position1Label.set_text, "")
         self._serializer.addWork(self.position2Label.set_text, "")
-        self._serializer.addWork(self.repeatLabel.set_text, "--")
+        self._serializer.addWork(self.repeatLabel.set_text, "")
         self._serializer.addWork(self.dataFileButton.set_sensitive, False)
         self._serializer.addWork(self.timerButton.set_sensitive, False)
@@ -467 +467 @@
     def __shootingRepeat(self, repeat):
         Logger().trace("ShootController.__shootingRepeat()")
-        sequenceMessage = _("Repeat #%d of %d") % (repeat, self._model.timerEveryRepeat)
-        #self._serializer.addWork(self.progressbar.set_text, sequenceMessage)
-        self.repeatLabel.set_text(sequenceMessage)
+        if self._model.timerEveryEnable:
+            sequenceMessage = _("Repeat #%d of %d") % (repeat, self._model.timerEveryRepeat)
+            #self._serializer.addWork(self.progressbar.set_text, sequenceMessage)
+            self.repeatLabel.set_text(sequenceMessage)
 
     def __shootingNewPosition(self, index, yaw, pitch, status=None, next=False):