Skip to content

Commit

Permalink
Merge branch 'release/v0.0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
mamarguerat committed Jul 26, 2024
2 parents fb96c97 + a1e1e5f commit 7eaae34
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ A tool to simplify routing with behringer x-consoles, midas m-consoles.

This app create a routing procedure based on hardware availabilities instead of software capabilities. It aims to simplify routing and create automatic documentation.

<img width="500px" src="doc/images/quick-demo.gif" >
<img width="300px" src="doc/images/Screenshot 2024-05-17 154753.png" >
<img src="doc/images/app.png" >
<img src="doc/images/quick-demo.gif" >

</p>

Expand Down
Binary file added doc/images/app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Mixo",
"version": "0.0.7",
"version": "0.0.8",
"description": "Routing tool for behringer x32 based on hardware availabilities instead of software capabilities. Aim to simplify routing and create automatic documentation.",
"main": "src/js/main.js",
"scripts": {
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
19 changes: 12 additions & 7 deletions src/js/ctrl/deviceDetailCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ class DeviceDetailCtrl {
$('.overlay').on('click', (e) => {
this.closeModal();
});
$('#cancel-channel, #cancel-connector').on('click', (e) => {
this.closeModal();
});
$('#save-connector').on('click', (e) => {
this.saveConnector();
})
});
$('#save-channel').on('click', (e) => {
this.saveChannel();
})
});
}

// MARK: Event handling
Expand All @@ -41,10 +44,10 @@ class DeviceDetailCtrl {
loadHTML(deviceType) {
// Load tabs
this.addChannelTab("input", "Input channels", "Channel", LUT.getChannelsCnt(deviceType));
this.addChannelTab("mixbus", "Mixbus channels", "Mixbus", LUT.getMixbusCnt(deviceType));
this.addChannelTab("matrix", "Matrix channels", "Matrix", LUT.getMatrixCnt(deviceType));
this.addChannelTab("stereo", "Stereo channels", "Stereo", LUT.getStereoCnt(deviceType));
this.addChannelTab("dca", "DCA channels", "DCA", LUT.getDcaCnt(deviceType));
// this.addChannelTab("mixbus", "Mixbus channels", "Mixbus", LUT.getMixbusCnt(deviceType));
// this.addChannelTab("matrix", "Matrix channels", "Matrix", LUT.getMatrixCnt(deviceType));
// this.addChannelTab("stereo", "Stereo channels", "Stereo", LUT.getStereoCnt(deviceType));
// this.addChannelTab("dca", "DCA channels", "DCA", LUT.getDcaCnt(deviceType));
$('.tab').on('click', (e) => {
this.changeTab(e);
});
Expand Down Expand Up @@ -240,6 +243,7 @@ class DeviceDetailCtrl {
.catch(error => {
console.error(`[deviceDetailCtrl] Error fetching the SVG file ${error}`);
});
val.querySelector('#connector').innerHTML += "<text font-family='arial' font-size='12px' fill='" + colors.Front + "' text-anchor='middle' x='39.5' y='72'>" + input.getName() + "</text>";
}
});
$.each($outputs, function (idx, val) {
Expand Down Expand Up @@ -267,6 +271,7 @@ class DeviceDetailCtrl {
.catch(error => {
console.error(`[deviceDetailCtrl] Error fetching the SVG file ${error}`);
});
val.querySelector('#connector').innerHTML += "<text font-family='arial' font-size='12px' fill='" + colors.Front + "' text-anchor='middle' x='39.5' y='72'>" + output.getName() + "</text>";
}
});
});
Expand Down Expand Up @@ -302,7 +307,7 @@ class DeviceDetailCtrl {
let iconGroup = svgDocument.getElementById('icon');
iconGroup.setAttribute("transform", "scale(0.7) translate(4 4)");
iconGroup.setAttribute("style", "fill:" + colors.Front + ";stroke:" + colors.Front);
document.querySelector('#channel-list').querySelector('[value="' + (index + 1) + '"]').querySelector('svg').appendChild(iconGroup);
document.querySelector('#channel-list').querySelector('[value="' + input.deviceID + '-i-' + input.index + '"]').querySelector('svg').appendChild(iconGroup);
})
.catch(error => {
console.error(`[deviceDetailCtrl] Error fetching the SVG file ${error}`);
Expand Down
4 changes: 2 additions & 2 deletions src/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ function loadFile() {
// function to create a child window
function createChildWindow(fileName) {
childWindows.push(new BrowserWindow({
width: 900,
height: 450,
width: 1030,
height: 460,
menuBarVisible: false,
autoHideMenuBar: true,
webPreferences: {
Expand Down

0 comments on commit 7eaae34

Please sign in to comment.