Fixed page resizing on new page creation, FLTD-122

tainstr · Jun 17, 2016 · 67bce31 · 67bce31
1 parent bc732a5
commit 67bce31
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/misura/client/filedata/model.py b/misura/client/filedata/model.py
@@ -142,7 +142,6 @@ def set_page(self, page):
         if page != self.page:
             self.page = page
             self.sigPageChanged.emit()
-        self.modelReset.emit() 
         return True
 
     @property
@@ -161,7 +160,7 @@ def refresh(self, force=False):
             elif self.keys == set(self.doc.data.keys()) and self.available_keys == set(self.doc.available_data.keys()):
                 logging.debug('model.refresh(): NOTHING CHANGED')
                 return False
-
+        
         logging.debug('%s %s', 'REFRESHING MODEL', self.paused)
         self.paused = True
         self.doc.suspendUpdates()

diff --git a/misura/client/graphics/veuszplot.py b/misura/client/graphics/veuszplot.py
@@ -27,6 +27,7 @@ def _(text, disambiguation=None, context='PlotWindow'):
     """Translate text."""
     return qt4.QCoreApplication.translate(context, text, disambiguation)
 
+
 def with_busy_cursor(function_to_decorate):
     def wrapper(*a, **k):
         qt4.QApplication.setOverrideCursor(qt4.QCursor(qt4.Qt.WaitCursor))
@@ -52,7 +53,6 @@ def moveToLastPage(self):
         number_of_pages = self.document.getNumberPages()
         self.setPageNumber(number_of_pages - 1)
 
-
     def contextMenuEvent(self, event):
         """Show context menu."""
         menu = QtGui.QMenu()
@@ -201,9 +201,6 @@ def slotFileExport(self):
 
             self.doExport(filename, validextns, chosenextns)
 
-
-
-
     @with_busy_cursor
     def doExport(self, filename, validextns, chosenextns):
         ext = os.path.splitext(filename)[1][1:]
@@ -232,12 +229,14 @@ def update_page(self, *foo):
         page = self.document.basewidget.getPage(n)
         if page is None:
             logging.debug('%s %s', 'NO PAGE FOUND', n)
-            return
-        if self.document.model.page == page.path:
-            logging.debug('Not update_page %s', page.path)
-            return
-        logging.debug('VeuszPlot.update_page %s %s', self.document.model.page, page.path)
-        self.document.model.set_page(page.path)
+        else:
+            self.docchangeset = -100 # force plot update for page resizing
+            self.document.model.set_page(page.path)
+
+    def setPageNumber(self, page):
+        r = plotwindow.PlotWindow.setPageNumber(self, page)
+        self.update_page()
+        return r
 
 
 class VeuszPlot(QtGui.QWidget):
@@ -320,8 +319,11 @@ def set_doc(self, doc=False):
         self.plot.sigWidgetClicked.connect(self.treeedit.selectWidget)
         self.treeedit.widgetsSelected.connect(self.plot.selectedWidgets)
         self.treeedit.sigPageChanged.connect(self.plot.setPageNumber)
-        self.document.model.sigPageChanged.connect(self.fitSize)
-
+        self.document.model.sigPageChanged.connect(self.sync_page)
+
+    def sync_page(self, page=-1):
+        self.plot.update_page()
+        self.fitSize()
 
     def pauseUpdate(self):
         self.updatePolicy = setting.settingdb['plot_updatepolicy']
@@ -373,7 +375,7 @@ def fitSize(self, zoom=False):
         g = page.path
         if g == '/time' or g.endswith('_t'):
             g += '/time'
-        elif g == '/temperature'  or g.endswith('_T'):
+        elif g == '/temperature' or g.endswith('_T'):
             g += '/temp'
         if h < 2 or w < 4:
             self.cmd.Set(g + '/leftMargin', '0.1cm')
@@ -386,7 +388,7 @@ def fitSize(self, zoom=False):
                 pass
             self.emit(QtCore.SIGNAL('smallPlot()'))
         else:
-            print 'settings for',g
+            print 'settings for', g
             self.cmd.Set(g + '/leftMargin', '1.5cm')
             self.cmd.Set(g + '/bottomMargin', '1.1cm')
             self.cmd.Set(g + '/rightMargin', '1.4cm')