Ignore:
Timestamp:
Oct 3, 2017 3:53:10 AM (7 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
d6e5b31
Parents:
7d8bebf (diff), 170e95d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'origin/ESS_GUI_SasView250' into ESS_GUI

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Calculators/UnitTesting/ResolutionCalculatorPanelTest.py

    rfc4fec8 r170e95d  
    5151        self.assertEqual(self.widget.windowTitle(), "Q Resolution Estimator") 
    5252        # size 
    53         self.assertEqual(self.widget.size().height(), 561) 
    54         self.assertEqual(self.widget.size().width(), 1034) 
     53        self.assertEqual(self.widget.size().height(), 540) 
     54        self.assertEqual(self.widget.size().width(), 876) 
    5555 
    5656        # visibility 
Note: See TracChangeset for help on using the changeset viewer.