Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-f into lp:openlp
Review: Needs Fixing
See inline comments.
Please fix the commit comments to reflect the changes as they refer to #noqa
which has been removed. (There may be more).
Diff comments:
>
> === modified file 'openlp/core/lib/projector/pjlink1.py'
> --- openlp/core/lib/projector/pjlink1.py 2017-06-17 00:25:06 +
> +++ openlp/core/lib/projector/pjlink1.py 2017-07-12 13:16:20 +
> @@ -262,6 +277,38 @@
> self.send_command('INF2', queue=True)
> if self.pjlink_name is None:
> self.send_command('NAME', queue=True)
> +if self.pjlink_class == '2':
> +# Class 2 specific checks
> +if self.serial_no is None:
> +self.send_command('SNUM', queue=True)
> +if self.sw_version is None:
> +self.send_command('SVER', queue=True)
> +if self.model_filter is None:
> +self.send_command('RFIL', queue=True)
> +if self.model_lamp is None:
> +self.send_command('RLMP', queue=True)
> +
> +def process_rfil(self, data):
Where is this called from?
> +"""
> +Process replacement filter type
> +"""
> +if self.model_filter is None:
> +self.model_filter = data
> +else:
> +log.warn("({ip}) Filter model already set".format(ip=self.ip))
> +log.warn("({ip}) Saved model: '{old}'".format(ip=self.ip,
> old=self.model_filter))
> +log.warn("({ip}) New model: '{new}'".format(ip=self.ip,
> new=data))
> +
> +def process_rlmp(self, data):
Where is this called from?
> +"""
> +Process replacement lamp type
> +"""
> +if self.model_lamp is None:
> +self.model_lamp = data
> +else:
> +log.warn("({ip}) Lamp model already set".format(ip=self.ip))
> +log.warn("({ip}) Saved lamp: '{old}'".format(ip=self.ip,
> old=self.model_lamp))
> +log.warn("({ip}) New lamp: '{new}'".format(ip=self.ip, new=data))
>
> def _get_status(self, status):
> """
--
https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327290
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1687287] Re: Open LP 2.4.6 - crash on Extract Song Usage Data from startup
** Branch unlinked: lp:~abreu-alexandre/unity-firefox-
extension/release-2.4.6
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1687287
Title:
Open LP 2.4.6 - crash on Extract Song Usage Data from startup
Status in OpenLP:
New
Bug description:
**OpenLP Bug Report**
Version: {'version': '2.4.6', 'full': '2.4.6', 'build': None}
--- Details of the Exception. ---
Having upgraded OpenLP from 2.4.5 to 2.4.6, this bug is showing again.
When I selected Extract Usage Data, I was not presented with a dialog
to set dates, it just went to this error.
--- Exception Traceback ---
Traceback (most recent call last):
File
"/Applications/OpenLP.app/Contents/MacOS/plugins/songusage/songusageplugin.py",
line 226, in on_song_usage_report
self.song_usage_detail_form.initialise()
File "openlp/plugins/songusage/forms/songusagedetailform.py", line 58, in
initialise
TypeError: setSelectedDate(self, Union[QDate, datetime.date]): argument 1 has
unexpected type 'str'
--- System information ---
Platform: Darwin-16.5.0-x86_64-i386-64bit
--- Library Versions ---
Python: 3.4.6
Qt5: 5.6.2
PyQt5: 5.7.1
QtWebkit: 538.1
SQLAlchemy: 1.1.5
SQLAlchemy Migrate: -
BeautifulSoup: 4.4.1
lxml: 3.6.0
Chardet: 2.3.0
PyEnchant: 1.6.6
Mako: 1.0.6
pyICU: -
pyUNO bridge: -
VLC: -
To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1687287/+subscriptions
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1687287] Re: Open LP 2.4.6 - crash on Extract Song Usage Data from startup
** Attachment added: "OpenLP 2.4.6 settings file - associated with extract of
song usage data"
https://bugs.launchpad.net/openlp/+bug/1687287/+attachment/4916423/+files/OpenLP%20-%20Settings.conf
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1687287
Title:
Open LP 2.4.6 - crash on Extract Song Usage Data from startup
Status in OpenLP:
New
Bug description:
**OpenLP Bug Report**
Version: {'version': '2.4.6', 'full': '2.4.6', 'build': None}
--- Details of the Exception. ---
Having upgraded OpenLP from 2.4.5 to 2.4.6, this bug is showing again.
When I selected Extract Usage Data, I was not presented with a dialog
to set dates, it just went to this error.
--- Exception Traceback ---
Traceback (most recent call last):
File
"/Applications/OpenLP.app/Contents/MacOS/plugins/songusage/songusageplugin.py",
line 226, in on_song_usage_report
self.song_usage_detail_form.initialise()
File "openlp/plugins/songusage/forms/songusagedetailform.py", line 58, in
initialise
TypeError: setSelectedDate(self, Union[QDate, datetime.date]): argument 1 has
unexpected type 'str'
--- System information ---
Platform: Darwin-16.5.0-x86_64-i386-64bit
--- Library Versions ---
Python: 3.4.6
Qt5: 5.6.2
PyQt5: 5.7.1
QtWebkit: 538.1
SQLAlchemy: 1.1.5
SQLAlchemy Migrate: -
BeautifulSoup: 4.4.1
lxml: 3.6.0
Chardet: 2.3.0
PyEnchant: 1.6.6
Mako: 1.0.6
pyICU: -
pyUNO bridge: -
VLC: -
To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1687287/+subscriptions
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-f into lp:openlp
The functions defined are laying the groundwork. The functions will be
called from the "self.pjlink_functions" defined at line 155.
at this point, I'm working on the changes incrementally - plus, trying
to do some refactoring at the same time. Since the update to PJLink
Class 2 is rather large, I'm trying to keep the actual merges somewhat
manageable by keeping them limited per merge.
On Mon, Jul 17, 2017 at 1:35 PM, Tim Bentley wrote:
> Review: Needs Fixing
>
> See inline comments.
> Please fix the commit comments to reflect the changes as they refer to #noqa
> which has been removed. (There may be more).
>
> Diff comments:
>
>>
>> === modified file 'openlp/core/lib/projector/pjlink1.py'
>> --- openlp/core/lib/projector/pjlink1.py 2017-06-17 00:25:06 +
>> +++ openlp/core/lib/projector/pjlink1.py 2017-07-12 13:16:20 +
>> @@ -262,6 +277,38 @@
>> self.send_command('INF2', queue=True)
>> if self.pjlink_name is None:
>> self.send_command('NAME', queue=True)
>> +if self.pjlink_class == '2':
>> +# Class 2 specific checks
>> +if self.serial_no is None:
>> +self.send_command('SNUM', queue=True)
>> +if self.sw_version is None:
>> +self.send_command('SVER', queue=True)
>> +if self.model_filter is None:
>> +self.send_command('RFIL', queue=True)
>> +if self.model_lamp is None:
>> +self.send_command('RLMP', queue=True)
>> +
>> +def process_rfil(self, data):
>
> Where is this called from?
>
>> +"""
>> +Process replacement filter type
>> +"""
>> +if self.model_filter is None:
>> +self.model_filter = data
>> +else:
>> +log.warn("({ip}) Filter model already set".format(ip=self.ip))
>> +log.warn("({ip}) Saved model: '{old}'".format(ip=self.ip,
>> old=self.model_filter))
>> +log.warn("({ip}) New model: '{new}'".format(ip=self.ip,
>> new=data))
>> +
>> +def process_rlmp(self, data):
>
> Where is this called from?
>
>> +"""
>> +Process replacement lamp type
>> +"""
>> +if self.model_lamp is None:
>> +self.model_lamp = data
>> +else:
>> +log.warn("({ip}) Lamp model already set".format(ip=self.ip))
>> +log.warn("({ip}) Saved lamp: '{old}'".format(ip=self.ip,
>> old=self.model_lamp))
>> +log.warn("({ip}) New lamp: '{new}'".format(ip=self.ip,
>> new=data))
>>
>> def _get_status(self, status):
>> """
>
>
> --
> https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327290
> You are the owner of lp:~alisonken1/openlp/pjlink2-f.
--
- Ken
Registered Linux user 296561
Slackin' since 1993
Slackware Linux (http://www.slackware.com)
OpenLP - Church Projection Software
Empower Your Church http://openlp.org
https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327290
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
