February 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r865 - oipf/js/impl/model
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 16:55:48 +0000 (Mon, 23 Feb 2015) New Revision: 865 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/865 Log: New properties added to "Channel" class : onid(original netword ID), tsid(transport stream ID) and sid(service ID). These elements can be useful to validate a dvb-t channel. Modified: oipf/js/impl/model/Channel.js Modified: oipf/js/impl/model/Channel.js =================================================================== --- oipf/js/impl/model/Channel.js 2015-02-23 16:08:33 UTC (rev 864) +++ oipf/js/impl/model/Channel.js 2015-02-23 16:55:48 UTC (rev 865) @@ -59,6 +59,31 @@ */ tunerID: null, + /* + * Description: + * DVB or ISDB original network ID. + * + * Visibility Type: readonly Integer + */ + onid: null, + + /* + * Description: + * DVB or ISDB transport stream ID. + * + * Visibility Type: readonly Integer + */ + tsid: null, + + /* + * Description: + * DVB or ISDB service ID. + * + * Visibility Type: readonly Integer + */ + sid: null, + + init: function (name, channelType, channelId) { this.name = name; this.channelType = CHANNEL_CONSTANT[channelType];

1 0

r864 - oipf/js/initObj
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 16:08:33 +0000 (Mon, 23 Feb 2015) New Revision: 864 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/864 Log: Creation of method "initConfigurationObject" this "Configuration" object will have a "Tuner" object.This is useful to test the channel changement. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-23 15:48:03 UTC (rev 863) +++ oipf/js/initObj/init.js 2015-02-23 16:08:33 UTC (rev 864) @@ -21,6 +21,17 @@ channelConfig.channelList = new ChannelList(channelArte, channelFrance5); } +function initConfigurationObject(oipfObjectFactory){ + var configurationObject = oipfObjectFactory.createConfigurationObject(); + + var idTypes = new IntegerCollection(12, 11); + var tunerTNT = new Tuner(idTypes); + var tuners = new TunerCollection(tunerTNT); + var localSystem = new LocalSystem(tuners); + + configurationObject.localSystem = localSystem; + +} var oipfObjectFactory = new OipfObjectFactory(); initChannel(oipfObjectFactory);

1 0

r863 - oipf/js/impl/model
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 15:48:03 +0000 (Mon, 23 Feb 2015) New Revision: 863 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/863 Log: This class will be use to store identifier type of "Tuner" object. Added: oipf/js/impl/model/IntegerCollection.js Added: oipf/js/impl/model/IntegerCollection.js =================================================================== --- oipf/js/impl/model/IntegerCollection.js (rev 0) +++ oipf/js/impl/model/IntegerCollection.js 2015-02-23 15:48:03 UTC (rev 863) @@ -0,0 +1,15 @@ +/* Description: + * The IntegerCollection class represents a collection of Integer values. See Annex K for the definition of the + * collection template. + * + */ + +var IntegerCollection = Class.extend({ + + init: function(elements) { + if (elements) { + this.super.init(elements); + } + } +}); +

1 0

r862 - oipf/js/impl/model
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 15:08:24 +0000 (Mon, 23 Feb 2015) New Revision: 862 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/862 Log: Addition of a parameter in constructor which gives information on contents supported by the tuner. Modified: oipf/js/impl/model/Tuner.js Modified: oipf/js/impl/model/Tuner.js =================================================================== --- oipf/js/impl/model/Tuner.js 2015-02-23 15:01:38 UTC (rev 861) +++ oipf/js/impl/model/Tuner.js 2015-02-23 15:08:24 UTC (rev 862) @@ -88,8 +88,8 @@ */ powerOnExternal: null, - init: function() { - + init: function(idTypes) { + this.idTypes = idTypes; } }); \ No newline at end of file

1 0

r861 - oipf/js/impl
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 15:01:38 +0000 (Mon, 23 Feb 2015) New Revision: 861 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/861 Log: Creation of "Configuration" object in OipfObjectFactory constructor. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-02-23 11:48:14 UTC (rev 860) +++ oipf/js/impl/OipfObjectFactory.js 2015-02-23 15:01:38 UTC (rev 861) @@ -36,7 +36,7 @@ //this.parentalControlManagerObject = new ParentalControlManagerObject(); //this.recordingSchedulerObject = new RecordingSchedulerObject(); this.searchManagerObject = new SearchManagerObject(); - //this.configurationObject = new ConfigurationObject(); + this.configurationObject = new ConfigurationObject(); //this.downloadManagerObject= new DownloadManagerObject(); //this.downloadTriggerObject= new DownloadTriggerObject(); //this.drmAgentObject= new DrmAgentObject();

1 0

r860 - oipf/js/impl/model
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 11:48:14 +0000 (Mon, 23 Feb 2015) New Revision: 860 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/860 Log: Addition of a channel identifier for a channel when this one is instanciated. Modified: oipf/js/impl/model/Channel.js Modified: oipf/js/impl/model/Channel.js =================================================================== --- oipf/js/impl/model/Channel.js 2015-02-23 11:45:05 UTC (rev 859) +++ oipf/js/impl/model/Channel.js 2015-02-23 11:48:14 UTC (rev 860) @@ -59,10 +59,10 @@ */ tunerID: null, - init: function (name, channelType, ccid) { + init: function (name, channelType, channelId) { this.name = name; this.channelType = CHANNEL_CONSTANT[channelType]; - this.ccid = ccid; + this.channelId = channelId; } }); \ No newline at end of file

1 0

r859 - oipf/js/initObj
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 11:45:05 +0000 (Mon, 23 Feb 2015) New Revision: 859 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/859 Log: Modify the prefix of the third parameter of "Channel" object constructor. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-23 11:30:31 UTC (rev 858) +++ oipf/js/initObj/init.js 2015-02-23 11:45:05 UTC (rev 859) @@ -12,10 +12,10 @@ var channelType = "TYPE_TV"; var channelName = "ARTE"; - var channelArte = new Channel(channelName, channelType, "ccid:"+calculation.genId(100,1)); + var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelName, channelType, "ccid:"+calculation.genId(100,1)); + var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); channelConfig.currentChannel = channelArte; channelConfig.channelList = new ChannelList(channelArte, channelFrance5);

1 0

r858 - oipf/view
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 11:30:31 +0000 (Mon, 23 Feb 2015) New Revision: 858 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/858 Log: Addition of source file "Calculation.js". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-02-23 11:26:57 UTC (rev 857) +++ oipf/view/test.html 2015-02-23 11:30:31 UTC (rev 858) @@ -11,6 +11,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" type="text/css" href="css/test.css"/> <script src="../js/lib/Class.js" type="text/javascript"></script> + <script src="../js/utils/Calculation.js" type="text/javascript"></script> <script src="../js/lib/Collection.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> <script src="../js/impl/model/Query.js" type="text/javascript"></script> @@ -21,7 +22,6 @@ <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> - <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script> <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> <script src="../js/test/TestCase.js" type="text/javascript"></script>

1 0

r857 - oipf/js/initObj
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 11:26:57 +0000 (Mon, 23 Feb 2015) New Revision: 857 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/857 Log: Creation of object "Calculation" for generate a unique for channels. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-23 11:19:53 UTC (rev 856) +++ oipf/js/initObj/init.js 2015-02-23 11:26:57 UTC (rev 857) @@ -8,13 +8,14 @@ function initChannel(oipfObjFact) { var channelConfig = oipfObjFact.createChannelConfig(); - + var calculation = new Calculation();//Necessary to generate a unique id for each channel. + var channelType = "TYPE_TV"; var channelName = "ARTE"; - var channelArte = new Channel(channelName, channelType); + var channelArte = new Channel(channelName, channelType, "ccid:"+calculation.genId(100,1)); channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelName, channelType); + var channelFrance5 = new Channel(channelName, channelType, "ccid:"+calculation.genId(100,1)); channelConfig.currentChannel = channelArte; channelConfig.channelList = new ChannelList(channelArte, channelFrance5);

1 0

r856 - oipf/js/utils
by ygrego＠users.nuiton.org 23 Feb '15

23 Feb '15

Author: ygrego Date: 2015-02-23 11:19:53 +0000 (Mon, 23 Feb 2015) New Revision: 856 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/856 Log: Rename "Math.js" in "Calculation.js" and the classname associated too. Added: oipf/js/utils/Calculation.js Removed: oipf/js/utils/Math.js Copied: oipf/js/utils/Calculation.js (from rev 852, oipf/js/utils/Math.js) =================================================================== --- oipf/js/utils/Calculation.js (rev 0) +++ oipf/js/utils/Calculation.js 2015-02-23 11:19:53 UTC (rev 856) @@ -0,0 +1,11 @@ +var Calculation = Class.extend({ + + init: function() { + }, + + genId: function(boundary, adjustment){ + + return Math.floor((Math.random() * boundary) + adjustment); + } + +}); \ No newline at end of file Deleted: oipf/js/utils/Math.js =================================================================== --- oipf/js/utils/Math.js 2015-02-23 10:49:26 UTC (rev 855) +++ oipf/js/utils/Math.js 2015-02-23 11:19:53 UTC (rev 856) @@ -1,11 +0,0 @@ -var Math = Class.extend({ - - init: function() { - }, - - genId: function(boundary, adjustment){ - - return Math.floor((Math.random() * boundary) + adjustment); - } - -}); \ No newline at end of file

1 0