nodeskini 1.0.3 → 1.0.6

package/client/configurateur/configReact.js

@@ -135,7 +135,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: msgRecu.descriptors,
-          minDimensions: [14, 14],
+          minDimensions: [14, 1],
           columns: [{ type: 'text', width: 80, title: 'Note' }, { type: 'text', width: 80, title: 'Note stop' }, { type: 'text', width: 80, title: 'Flag' }, { type: 'text', width: 120, title: 'Text' }, { type: 'text', width: 120, title: 'Sound file' }, { type: 'text', width: 80, title: 'Fifo' }, { type: 'text', width: 80, title: 'Slot' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'Vert. type' }, { type: 'text', width: 90, title: 'Group Index' }, { type: 'text', width: 80, title: 'Duration' }, { type: 'text', width: 100, title: 'IP address' }, { type: 'text', width: 80, title: 'Buffer num' }, { type: 'text', width: 80, title: 'Level' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));

package/client/configurateur/configReactbundle.js

@@ -136,7 +136,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: msgRecu.descriptors,
-          minDimensions: [14, 14],
+          minDimensions: [14, 1],
           columns: [{ type: 'text', width: 80, title: 'Note' }, { type: 'text', width: 80, title: 'Note stop' }, { type: 'text', width: 80, title: 'Flag' }, { type: 'text', width: 120, title: 'Text' }, { type: 'text', width: 120, title: 'Sound file' }, { type: 'text', width: 80, title: 'Fifo' }, { type: 'text', width: 80, title: 'Slot' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'Vert. type' }, { type: 'text', width: 90, title: 'Group Index' }, { type: 'text', width: 80, title: 'Duration' }, { type: 'text', width: 100, title: 'IP address' }, { type: 'text', width: 80, title: 'Buffer num' }, { type: 'text', width: 80, title: 'Level' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));
@@ -275,21 +275,27 @@ var Jspreadsheet = function (_React$Component2) {
 },{"../../serveur/ipConfig.json":2}],2:[function(require,module,exports){
 module.exports={
   "remoteIPAddressImage": "192.168.1.251",
-  "remoteIPAddressSound": "localhost",
+  "remoteIPAddressSound": "192.168.1.251",
   "remoteIPAddressLumiere": "localhost",
-  "remoteIPAddressGame": "localhost",
-  "serverIPAddress": "localhost",
+  "remoteIPAddressGame": "192.168.1.223",
+  "interfaceZIPaddress": "192.168.1.250",
+  "serverIPAddress": "192.168.1.251",
   "webserveurPort": 8080,
   "websocketServeurPort": 8383,
   "InPortOSCMIDIfromDAW": 13000,
   "OutPortOSCMIDItoDAW": 12000,
-  "portOSCToGame": 3005,
-  "portOSCFromGame": 1000,
-  "distribSequencerPort": 8888,
+  "portOSCToGame": 1010,
+  "portOSCFromGame": 3010,
+  "portOSCFromInterfaceZData": 3005,
+  "portOSCFromInterfaceZMidi": 3006,
+  "portOSCFromInterfaceZMiniWi": 8888,
+  "portOSCToInterfaceZ": 1000,
+  "distribSequencerPort": 8899,
   "outportProcessing": 10000,
   "outportLumiere": 7700,
   "inportLumiere": 9000,
-  "sessionPath": "./pieces/",
-  "piecePath" : "./pieces/"
-}
+  "sessionPath": "./pieces/tutos/",
+  "piecePath" : "./pieces/tutos/"
+}
+
 },{}]},{},[1]);

package/client/configurateur/src/configReact.js

@@ -128,7 +128,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: msgRecu.descriptors,
-          minDimensions: [14, 14],
+          minDimensions: [14, 1],
           columns: [
             { type: 'text', width: 80, title: 'Note' },
             { type: 'text', width: 80, title: 'Note stop' },

package/client/parametrage/paramReact.js

@@ -185,7 +185,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: par.groupesDesSons,
-          minDimensions: [9, 5],
+          minDimensions: [9, 1],
           columns: [{ type: 'text', width: 80, title: 'Groupe' }, { type: 'text', width: 80, title: 'Index' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'X' }, { type: 'text', width: 80, title: 'Y' }, { type: 'text', width: 140, title: 'Nb of El. or Tank nb' }, { type: 'text', width: 80, title: 'Color' }, { type: 'text', width: 80, title: 'Previous' }, { type: 'text', width: 80, title: 'Scene' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));

package/client/parametrage/paramReactbundle.js

@@ -186,7 +186,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: par.groupesDesSons,
-          minDimensions: [9, 5],
+          minDimensions: [9, 1],
           columns: [{ type: 'text', width: 80, title: 'Groupe' }, { type: 'text', width: 80, title: 'Index' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'X' }, { type: 'text', width: 80, title: 'Y' }, { type: 'text', width: 140, title: 'Nb of El. or Tank nb' }, { type: 'text', width: 80, title: 'Color' }, { type: 'text', width: 80, title: 'Previous' }, { type: 'text', width: 80, title: 'Scene' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));
@@ -477,7 +477,7 @@ module.exports={
   "remoteIPAddressImage": "192.168.1.251",
   "remoteIPAddressSound": "192.168.1.251",
   "remoteIPAddressLumiere": "localhost",
-  "remoteIPAddressGame": "192.168.1.251",
+  "remoteIPAddressGame": "192.168.1.223",
   "interfaceZIPaddress": "192.168.1.250",
   "serverIPAddress": "192.168.1.251",
   "webserveurPort": 8080,
@@ -488,13 +488,14 @@ module.exports={
   "portOSCFromGame": 3010,
   "portOSCFromInterfaceZData": 3005,
   "portOSCFromInterfaceZMidi": 3006,
+  "portOSCFromInterfaceZMiniWi": 8888,
   "portOSCToInterfaceZ": 1000,
-  "distribSequencerPort": 8888,
+  "distribSequencerPort": 8899,
   "outportProcessing": 10000,
   "outportLumiere": 7700,
   "inportLumiere": 9000,
-  "sessionPath": "./pieces/",
-  "piecePath" : "./pieces/"
+  "sessionPath": "./pieces/tutos/",
+  "piecePath" : "./pieces/tutos/"
 }
 
 },{}]},{},[1]);

package/client/parametrage/src/paramReact.js

@@ -2,7 +2,7 @@
  * @fileOverview Parametrage in React.js
  * To compile JSX to js, launch this in the terminal, in ./client/parametrage
  * npx babel --watch src --out-dir . --presets react-app/prod
- * Do also : browserify paramReact.js -o paramReactbundle.js in 
+ * Do also : browserify paramReact.js -o paramReactbundle.js
  * 
  * @author Bertrand Petit-Hédelin <bertrand@hedelin.fr>
  * @version 1.0
@@ -175,7 +175,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: par.groupesDesSons,
-          minDimensions: [9, 5],
+          minDimensions: [9,1],
           columns: [
             { type: 'text', width: 80, title: 'Groupe' },
             { type: 'text', width: 80, title: 'Index' },

package/client/score/parto1.js

@@ -77,7 +77,10 @@ var textSize = 20 * screenY / Ybase;
 
 // La version processing.min.js ne sais pas gérer les couleur en hexa.
 function hex_to_RGB(hex) {
-    var m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
+    console.log("hex_to_RGB:", typeof hex, hex);
+    if(hex == '') return [0,0,0];
+
+    let m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
     return [ parseInt(m[1], 16), parseInt(m[2], 16), parseInt(m[3], 16)];
 }
 

package/client/score/parto1bundle.js

@@ -1,12 +1,26 @@
-(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-/**************************************
-  SKINI
-
-  © Copyright 2019, B. Petit-Heidelein
-
-  browserify parto1.js -o parto1bundle.js
-
-***************************************/
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+/**
+ * @fileOverview Display the score of the Skini piece
+ * 
+ * browserify parto1.js -o parto1bundle.js
+ *
+ * @author Bertrand Petit-Hédelin <bertrand@hedelin.fr>
+ * @version 1.0
+ * @copyright (C) 2022 Bertrand Petit-Hédelin
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 "use strict"
 
 var ipConfig = require('../../serveur/ipConfig');
@@ -64,7 +78,10 @@ var textSize = 20 * screenY / Ybase;
 
 // La version processing.min.js ne sais pas gérer les couleur en hexa.
 function hex_to_RGB(hex) {
-    var m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
+    console.log("hex_to_RGB:", typeof hex, hex);
+    if(hex == '') return [0,0,0];
+
+    let m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
     return [ parseInt(m[1], 16), parseInt(m[2], 16), parseInt(m[3], 16)];
 }
 
@@ -1156,26 +1173,31 @@ function initWSSocket(host) {
     }
 }
 window.initWSSocket = initWSSocket;
-
-},{"../../serveur/ipConfig":2}],2:[function(require,module,exports){
+
+},{"../../serveur/ipConfig":2}],2:[function(require,module,exports){
 module.exports={
-  "remoteIPAddressImage": "localhost",
-  "remoteIPAddressSound": "localhost",
+  "remoteIPAddressImage": "192.168.1.251",
+  "remoteIPAddressSound": "192.168.1.251",
   "remoteIPAddressLumiere": "localhost",
-  "remoteIPAddressGame": "localhost",
-  "serverIPAddress": "localhost",
+  "remoteIPAddressGame": "192.168.1.223",
+  "interfaceZIPaddress": "192.168.1.250",
+  "serverIPAddress": "192.168.1.251",
   "webserveurPort": 8080,
   "websocketServeurPort": 8383,
   "InPortOSCMIDIfromDAW": 13000,
   "OutPortOSCMIDItoDAW": 12000,
-  "portOSCToGame": 1000,
-  "portOSCFromGame": 3005,
-  "distribSequencerPort": 8888,
+  "portOSCToGame": 1010,
+  "portOSCFromGame": 3010,
+  "portOSCFromInterfaceZData": 3005,
+  "portOSCFromInterfaceZMidi": 3006,
+  "portOSCFromInterfaceZMiniWi": 8888,
+  "portOSCToInterfaceZ": 1000,
+  "distribSequencerPort": 8899,
   "outportProcessing": 10000,
   "outportLumiere": 7700,
   "inportLumiere": 9000,
-  "sessionPath": "./pieces/",
-  "piecePath" : "./pieces/"
+  "sessionPath": "./pieces/opus/",
+  "piecePath" : "./pieces/opus/"
 }
-
-},{}]},{},[1]);
+
+},{}]},{},[1]);

package/client/simulateurListe/simulateurFork.mjs

@@ -101,7 +101,7 @@ for (var i = 0; i < myArgs.length; i++) {
 }
 
 /*******************************************************************
- * GESTION DES TYPES
+ * GESTION DES TYPES HORIZONTAUX
  * Traitement des listes reçues pour s'adapter à une séquence de types.
  * En utilisant les types avec des tanks on n'a pas besoin de gérer 
  * la mémoires des patterns sélectionnés, ni de revoir les FIFOs.

package/client/simulateurListe/simulateurListe.js

@@ -89,7 +89,7 @@ if (myArgs.includes("-sim")) {
 }
 
 /*******************************************************************
- * GESTION DES TYPES
+ * GESTION DES TYPES HORIZONTAUX
  * Traitement des listes reçues pour s'adapter à une séquence de types.
  * En utilisant les types avec des tanks on n'a pas besoin de gérer 
  * la mémoires des patterns sélectionnés, ni de revoir les FIFOs.
@@ -109,7 +109,7 @@ function resetListOfTypes() {
 resetListOfTypes();
 
 /**
- * Initialize the list of patterns according to their types 
+ * Initialize the list of patterns according to their horizontal types 
  * The index correponds to the type.
  * @param {Array} list of patterns
  */
@@ -451,7 +451,7 @@ function initWSSocket(port) {
         if (listClips.length === 0) {
           if (debug) console.log("WS Recu : listClips vide");
           if (tempoMax === tempoMin) {
-            console.log("WARN: tempoMin and tempoMax are equal");
+            console.log("WARN: tempoMin and tempoMax are equal", tempoMin, tempoMax);
             tempoInstantListClip = tempoMax;
           }
           else {