Skip to content

Commit

Permalink
Fix pixmap renderer not cleared on CHANGED_CLEAR (#236)
Browse files Browse the repository at this point in the history 
Clear the pixmap displayed in Components.Renderer.Pixmap when changed()
receives a CHANGED_CLEAR.

CHANGED_CLEAR is issued upstream in sources like Event and EventInfo
when no event can be found, and so this change clears the displayed
pixmap when no pixmap can be found because no upstream event has
been found.

Previously CHANGED_CLEAR was ignored.
  • Loading branch information
@Huevos
prl001 authored and Huevos committed Mar 18, 2018
1 parent d9bd6c7 commit 414da5c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions lib/python/Components/Renderer/Pixmap.py
View file
Expand Up @@ -16,4 +16,6 @@ def changed(self, what):
if self.source and hasattr(self.source, "pixmap"):
if self.instance:
self.instance.setPixmap(self.source.pixmap)
elif self.instance:
self.instance.setPixmap(None)

8 comments on commit 414da5c

@IanSav
Copy link
Contributor

@IanSav IanSav commented on 414da5c Mar 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prl001: This commit does not match the change I previously tested for you. This fix does not appear to be working. (The test code did work well.)

@prl001
Copy link
Contributor

@prl001 prl001 commented on 414da5c Mar 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just tested this change in OverlayHD 1.64 on the OpenViX version I have access to (Dev-2017-07-12). It works just as I intended it to. I hadn't previously tested that it worked as intended in OpenViX (didn't think to test it with OverlayHD), only that it didn't have any ill effects.

I'm not able to build the 4.1 branch of the OE Alliance build environment for OpenViX on Beyonwiz T3 hardware to test on anything more modern.

@Huevos
Copy link
Contributor

@Huevos Huevos commented on 414da5c Mar 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you having trouble building?

If you need an image we can supply one.

@Huevos
Copy link
Contributor

@Huevos Huevos commented on 414da5c Mar 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, please provide a step by step so we can test this commit is working as expected.

@prl001
Copy link
Contributor

@prl001 prl001 commented on 414da5c Mar 20, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you having trouble building?

| gcc -shared -m64 -Wl,--gc-sections -Wl,-z,defs -Wl,-soname -Wl,libsoftokn3.so -Wl,--version-script,Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/softokn.def -o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/libsoftokn3.so Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/fipsaudt.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/fipstest.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/fipstokn.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/lgglue.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/lowkey.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/lowpbe.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/padbuf.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/pkcs11.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/pkcs11c.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/pkcs11u.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/sdb.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/sftkdb.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/sftkhmac.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/sftkpars.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/sftkpwd.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/softkver.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/tlsprf.o Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/jpakesftk.o ../../../dist/Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/lib/libfreebl.a -L../../../dist/Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/lib -lsqlite3 -L../../../dist/Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/lib -lnssutil3 -L../../../dist/Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/lib -lplc4 -lplds4 -lnspr4 -lpthread -ldl -lc
| /home/prl/openvix4.1/builds/openvix/developer/inihdx/tmp/hosttools/ld: cannot find -lsqlite3
| collect2: error: ld returned 1 exit status
| ../../coreconf/rules.mk:289: recipe for target 'Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/libsoftokn3.so' failed
| make[2]: *** [Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/libsoftokn3.so] Error 1
| make[2]: Leaving directory '/home/prl/openvix4.1/builds/openvix/developer/inihdx/tmp/work/x86_64-linux/nss-native/nss-native-3.28.1-r0/nss-3.28.1/nss/lib/softoken'
| ../coreconf/rules.mk:101: recipe for target 'install' failed
| make[1]: *** [install] Error 2
| make[1]: Leaving directory '/home/prl/openvix4.1/builds/openvix/developer/inihdx/tmp/work/x86_64-linux/nss-native/nss-native-3.28.1-r0/nss-3.28.1/nss/lib'
| coreconf/rules.mk:101: recipe for target 'install' failed
| make: *** [install] Error 2

That's the short form, but I'm happy to provide any other information that might help find the problem, but perhaps email might be better for that rather than cluttering up the commit comments.

If you need an image we can supply one.

IanSav has made one available to me. I'll try to find out why my fix isn't working for him tomorrow (UTC+11).

@prl001
Copy link
Contributor

@prl001 prl001 commented on 414da5c Mar 20, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, please provide a step by step so we can test this commit is working as expected.

Install IanSav's OverlayHD skin and make it the current skin. The bug is only visible in skins that use the ValueToPixmap/Pixmap renderer combination. OverlayHD uses that, but Open-ViX does not. I haven't tried any other OpenViX skins.

Bug replication
Clear the EPG, e.g. using

init 4
rm /etc/enigma2/epg.dat
init 4

in the commandline interface

Change to a service on a different frequency to start the EPG fetch. Wait for the EPG to fill for that transponder's services. For simplicity only allow a single set EPG entries to fill.

Enter the Graphical EPG, and navigate to an entry that displays a ratings icon and that has an empty EPG row either directly below it or above it in the EPG display.

Navigate directly to an empty EPG row. All the event information for the previous event is cleared except for the ratings icon. Navigating within empty EPG rows leaves the icon displaying. When a valid EPG entry is navigated to, the ratings icon is set to the correct display for that item.

Test for bug fixed
The same procedure, but now the ratings icons should be cleared when there is no event available to fetch event information.

@prl001
Copy link
Contributor

@prl001 prl001 commented on 414da5c Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have verified that the ratings icon update fix in this commit is working in OpenViX 5.1.014.006 (Developer) with an update to 2018-03-18 and OvetlayHD skin, but I understand that you'll want to verify that yourselves.

@IanSav
Copy link
Contributor

@IanSav IanSav commented on 414da5c Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe there was an issue with my OpenViX installation. I applied today's OpenViX update and the code now operates as expected and correctly.

I know the code has been merged but I wanted to close off my original issue report.

Please sign in to comment.