Merge pull request #25 from dewiweb/develop

Develop

Author: dewiweb

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.2.0-alpha.10](https://github.com/dewiweb/MCxOSCnext/compare/v2.2.0-alpha.9...v2.2.0-alpha.10) (2023-04-25)
+
+
+### Features
+
+* :sparkles: first step for functions ([a0a9c71](https://github.com/dewiweb/MCxOSCnext/commit/a0a9c713d7d5e65ad7facfd170ae258aa6886b35))
+* :sparkles: matrix setconnection ([a5f7a0f](https://github.com/dewiweb/MCxOSCnext/commit/a5f7a0ff6b083e6ec33b5718a95ef19d1ad22ab5))
+* :tada: matrix view ([198cf34](https://github.com/dewiweb/MCxOSCnext/commit/198cf34358c41dac312c123f16b3d4aa327ffd93))
+
+
+### Bug Fixes
+
+* :bug: riedel vs lawo / parent.number vs parent.path ([2c3c56a](https://github.com/dewiweb/MCxOSCnext/commit/2c3c56a4f38e0009f9ebd70b426f6501966757b9))
+
 ## [2.2.0-alpha.9](https://github.com/dewiweb/MCxOSCnext/compare/v2.2.0-alpha.8...v2.2.0-alpha.9) (2023-04-22)
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcxoscnext",
   "productName": "mcxoscnext",
-  "version": "2.2.0-alpha.9",
+  "version": "2.2.0-alpha.10",
   "description": "A bridge between emberplus and OSC protocols",
   "main": "src/main.js",
   "scripts": {

src/index.html

@@ -132,7 +132,19 @@
       </div>
       <div id="CS_content">
         <div id="tree"></div>
-        <br />
+        <div
+          id="central_view"
+          style="
+            top: 10px;
+            font-size: x-small;
+            overflow: auto;
+            margin: auto;
+            max-height: 230px;
+            max-width: 95%;
+            visibility: hidden;
+            width: 0%;
+          "
+        ></div>
         <div id="test">
           <pre
             id="expandedElement"

src/main.js

@@ -66,7 +66,7 @@ function createWindow() {
   win.setMenu(null);
   win.loadFile("src/index.html");
   win.on("ready-to-show", () => {
-    //  win.webContents.openDevTools({ mode: "detach" });
+    win.webContents.openDevTools({ mode: "detach" });
     win.webContents.send("ready");
   });
   ipcMain.on("sendAutoSave", function (event, content) {
@@ -716,6 +716,25 @@ function createWindow() {
               win.webContents.send("errorOnEditedPath", myRow);
             } else if (contents_type == "FUNCTION") {
               let fct_description = initialReq.contents.description;
+              if (!initialReq.contents.args) {
+                let function_cb = await (
+                  await eGet.invoke(initialReq)
+                ).response;
+                // console.log(
+                // "🚀 : file: main.js:727 : main : function_cb.result[0]:",
+                // function_cb
+                // );
+                win.webContents.send(
+                  "loginfo",
+                  "🚀 : file: main.js:724 : main : function_cb:" +
+                    JSON.stringify(function_cb.result)
+                );
+              } else {
+                // console.log(
+                // "🚀 : file: main.js:720 : main : initialReq.contents.args:",
+                // initialReq.contents.args
+                // );
+              }
               win.webContents.send(
                 "loginfo",
                 "WARNING! : You're trying to connect to a FUNCTION ( " +
@@ -967,6 +986,15 @@ function createWindow() {
           }
         );
 
+        ipcMain.on("mtx_connect", async (event, mtx_path, check_t, check_s) => {
+          // console.log(
+          // "🚀 : file: main.js:990 : ipcMain.on : mtx_path:",
+          // mtx_path
+          // );
+          let mtx = await eGet.getElementByPath(mtx_path);
+          await eGet.matrixSetConnection(mtx, check_t, check_s);
+        });
+
         ipcMain.on(
           "deleteConnection",
           async (event, ePath, oAddr, myRow, eVarType, sFactor) => {
@@ -1101,40 +1129,66 @@ function createWindow() {
         );
 
         ipcMain.on("expandNode", async (event, parentPath, currOpt_class) => {
-          console.log("🚀 : file: main.js:1173 : parentPath,:", parentPath);
-          console.log(
-            "🚀 : file: main.js:1173 : currOpt_class:",
-            currOpt_class
-          );
+          // console.log("🚀 : file: main.js:1173 : parentPath,:", parentPath);
+          // console.log(
+          // "🚀 : file: main.js:1173 : currOpt_class:",
+          // currOpt_class
+          // );
           if (currOpt_class == "NODE") {
             let childrenArray = [];
             let expandReq = await eGet.getElementByPath(parentPath.toString());
-            console.log("🚀 : file: main.js:1178 : == : expandReq:", expandReq);
+            // console.log("🚀 : file: main.js:1178 : == : expandReq:", expandReq);
             let getDir = await eGet.getDirectory(expandReq);
             try {
               let getDirResponse = await getDir.response;
             } catch (error) {
-              // console.log("🚀 : file: main.js:1183 : == : error:", error)
+              // console.log("🚀 : file: main.js:1183 : == : error:", error);
             }
             let nodeChildren = Object.keys(expandReq.children);
-            // console.log("🚀 : file: main.js:1187 : == : nodeChildren:", nodeChildren)
+            // console.log(
+            // "🚀 : file: main.js:1187 : == : nodeChildren:",
+            // nodeChildren
+            // );
+
             for (i = 0; i < nodeChildren.length; i++) {
-              let newChild = await eGet.getElementByPath(
-                parentPath + "." + nodeChildren[i]
-              );
-              console.log(
-                "🚀 : file: main.js:1113 : == : ipcMain.on : newChild:",
-                newChild
-              );
+              let numb_of_child = nodeChildren[i];
+              // console.log(
+              // "🚀 : file: main.js:1154 : == : ipcMain.on : numb_of_child:",
+              // numb_of_child
+              // );
+              let path_of_child =
+                parentPath.toString() + "." + numb_of_child.toString();
+              // console.log(
+              // "🚀 : file: main.js:1154 : == : ipcMain.on : path_of_child:",
+              // path_of_child
+              // );
+              let newChild = await eGet.getElementByPath(path_of_child);
+              // console.log(
+              // "🚀 : file: main.js:1113 : == : ipcMain.on : newChild:",
+              // newChild
+              // );
               contents = newChild.contents;
-              // console.log("🚀 : file: main.js:1193 : == : newChild.contents:", newChild.contents)
+              // console.log(
+              // "🚀 : file: main.js:1193 : == : newChild.contents:",
+              // newChild.contents
+              // );
               number = newChild.number;
-              parentPath = newChild.parent.path;
-              // console.log("🚀 : file: main.js:1195 : == : newChild.number:", newChild.number)
+              if (newChild.parent.path) {
+                parentPath = newChild.parent.path;
+              } else if (newChild.parent.number) {
+                parentPath = newChild.parent.number.toString();
+              }
+              // console.log(
+              // "🚀 : file: main.js:1195 : == : newChild.number:",
+              // newChild.number
+              // );
               base_path = { contents, number, parentPath };
               childrenArray.push(base_path);
             }
-            // console.log("🚀 : file: main.js:1204 : == : childrenArray:", childrenArray)
+            // console.log(
+            // "🚀 : file: main.js:1204 : == : childrenArray:",
+            // childrenArray
+            // );
             win.webContents.send("expandedNode", parentPath, childrenArray);
             win.webContents.send("expandedElement", expandReq, false);
           } else if (currOpt_class == "MATRIX") {