Changeset cf8d6c9 in sasview

Timestamp:

Jul 31, 2018 9:27:44 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

516ee4b, 18d5c94a, 8e2cd79

Parents:

4453043

git-author:

Piotr Rozyczko <rozyczko@…> (07/31/18 09:25:32)

git-committer:

Piotr Rozyczko <rozyczko@…> (07/31/18 09:27:44)

Message:

Attempt at realigning the tableview display and euqalising font. SASVIEW-889

File:

• src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py

@@ -65 +65 @@
 
             painter.save()
-            painter.translate(textRect.topLeft())
-            painter.setClipRect(textRect.translated(-textRect.topLeft()))
+            rect = textRect.topLeft()
+            x = rect.x()
+            y = rect.y()
+            x += 3.0 # magic value for rendering nice display in the table
+            y += 2.0 # magic value for rendering nice display in the table
+            rect.setX(x)
+            rect.setY(y)
+            painter.translate(rect)
+            painter.setClipRect(textRect.translated(-rect))
             # Draw the QTextDocument in the cell
             doc.documentLayout().draw(painter, context)
@@ -182 +189 @@
             # Prepare document for inserting into cell
             doc = QtGui.QTextDocument()
-
+            current_font = painter.font()
+            doc.setDefaultFont(current_font)
             # Convert the unit description into HTML
             text_html = GuiUtils.convertUnitToHTML(str(options.text))
@@ -193 +201 @@
             context = QtGui.QAbstractTextDocumentLayout.PaintContext()
             textRect = style.subElementRect(QtWidgets.QStyle.SE_ItemViewItemText, options)
-
             painter.save()
-            painter.translate(textRect.topLeft())
-            painter.setClipRect(textRect.translated(-textRect.topLeft()))
+
+            rect = textRect.topLeft()
+            y = rect.y()
+            y += 5.0 # magic value for rendering nice display in the table
+            rect.setY(y)
+            painter.translate(rect)
+            painter.setClipRect(textRect.translated(-rect))
             # Draw the QTextDocument in the cell
             doc.documentLayout().draw(painter, context)
@@ -260 +272 @@
             # Prepare document for inserting into cell
             doc = QtGui.QTextDocument()
-
+            current_font = painter.font()
+            doc.setDefaultFont(current_font)
             # Convert the unit description into HTML
             text_html = GuiUtils.convertUnitToHTML(str(options.text))
@@ -273 +286 @@
 
             painter.save()
-            painter.translate(textRect.topLeft())
-            painter.setClipRect(textRect.translated(-textRect.topLeft()))
+            rect = textRect.topLeft()
+            y = rect.y()
+            y += 5.0 # magic value for rendering nice display in the table
+            rect.setY(y)
+            painter.translate(rect)
+            painter.setClipRect(textRect.translated(-rect))
             # Draw the QTextDocument in the cell
             doc.documentLayout().draw(painter, context)