fix waitforfinished layout legend test

This commit is contained in:
Julien Cabieces 2019-10-25 14:29:09 +02:00 committed by Nyall Dawson
parent 42e22b7a68
commit 3453659c02

View File

@ -396,10 +396,6 @@ class TestQgsLayoutItemLegend(unittest.TestCase, LayoutItemTestCase):
counterTask = point_layer.countSymbolFeatures() counterTask = point_layer.countSymbolFeatures()
counterTask.waitForFinished() counterTask.waitForFinished()
TM = QgsApplication.taskManager()
actask = TM.activeTasks()
print(TM.tasks(), actask)
count = actask[0]
legend.model().refreshLayerLegend(legendlayer) legend.model().refreshLayerLegend(legendlayer)
legendnodes = legend.model().layerLegendNodes(legendlayer) legendnodes = legend.model().layerLegendNodes(legendlayer)
legendnodes[0].setUserLabel('[% @symbol_id %]') legendnodes[0].setUserLabel('[% @symbol_id %]')
@ -408,7 +404,6 @@ class TestQgsLayoutItemLegend(unittest.TestCase, LayoutItemTestCase):
label1 = legendnodes[0].evaluateLabel() label1 = legendnodes[0].evaluateLabel()
label2 = legendnodes[1].evaluateLabel() label2 = legendnodes[1].evaluateLabel()
label3 = legendnodes[2].evaluateLabel() label3 = legendnodes[2].evaluateLabel()
count.waitForFinished()
self.assertEqual(label1, '0') self.assertEqual(label1, '0')
#self.assertEqual(label2, '5') #self.assertEqual(label2, '5')
#self.assertEqual(label3, '12') #self.assertEqual(label3, '12')
@ -463,7 +458,7 @@ class TestQgsLayoutItemLegend(unittest.TestCase, LayoutItemTestCase):
group = legend.model().rootGroup().addGroup("Group [% 1 + 5 %] [% @layout_name %]") group = legend.model().rootGroup().addGroup("Group [% 1 + 5 %] [% @layout_name %]")
layer_tree_layer = group.addLayer(point_layer) layer_tree_layer = group.addLayer(point_layer)
counterTask = point_layer.countSymbolFeatures() counterTask = point_layer.countSymbolFeatures()
counterTask.waitForFinished() # does this even work? counterTask.waitForFinished()
layer_tree_layer.setCustomProperty("legend/title-label", 'bbbb [% 1+2 %] xx [% @layout_name %] [% @layer_name %]') layer_tree_layer.setCustomProperty("legend/title-label", 'bbbb [% 1+2 %] xx [% @layout_name %] [% @layer_name %]')
QgsMapLayerLegendUtils.setLegendNodeUserLabel(layer_tree_layer, 0, 'xxxx') QgsMapLayerLegendUtils.setLegendNodeUserLabel(layer_tree_layer, 0, 'xxxx')
legend.model().refreshLayerLegend(layer_tree_layer) legend.model().refreshLayerLegend(layer_tree_layer)
@ -475,11 +470,6 @@ class TestQgsLayoutItemLegend(unittest.TestCase, LayoutItemTestCase):
legend.setLinkedMap(map) legend.setLinkedMap(map)
legend.updateLegend() legend.updateLegend()
print(layer_tree_layer.labelExpression()) print(layer_tree_layer.labelExpression())
TM = QgsApplication.taskManager()
actask = TM.activeTasks()
print(TM.tasks(), actask)
count = actask[0]
count.waitForFinished()
map.setExtent(QgsRectangle(-102.51, 41.16, -102.36, 41.30)) map.setExtent(QgsRectangle(-102.51, 41.16, -102.36, 41.30))
checker = QgsLayoutChecker( checker = QgsLayoutChecker(
'composer_legend_symbol_expression', layout) 'composer_legend_symbol_expression', layout)