pull/110/head
openbuilds-engineer 2019-05-02 19:17:41 +02:00
rodzic 7b5d4f1bad
commit d8a4424653
4 zmienionych plików z 21 dodań i 15 usunięć

Wyświetl plik

@ -1,3 +1,4 @@
v1.0.164: BETA fix for odd JS bug that affected 1% of users
v1.0.163: Surfacing Wizard, Move Switch for Incr/Conti Jog, Improvements to GCODE Editor and 3D view
v1.0.162: Improved .OBC (OpenBuilds CAM) Handling
v1.0.161: Associate .OBC (OpenBuilds CAM files)

Wyświetl plik

@ -356,13 +356,13 @@
<div id="jogcontrols" class="mt-2">
<div class="row flex-justify-center flex-align-start" style="width: 100%; height: 100%;">
<div class="cell">
<!-- <nav data-role="ribbonmenu" class="mt-2">
<nav data-role="ribbonmenu" class="mt-2">
<ul class="tabs-holder ml-17">
<li><a href="#tab-mm">mm-mode</a></li>
<li><a href="#tab-inch">inch-mode</a></li>
</ul>
</nav> -->
</nav>
<table class="drotable mt-0">
<tr>
<td>

File diff suppressed because one or more lines are too long

Wyświetl plik

@ -2098,22 +2098,25 @@ if (isElectron()) {
var openFilePath = commandLine[1];
if (openFilePath !== "") {
// console.log(openFilePath);
readFile(openFilePath);
if (openFilePath.endsWith('.obc')) {
//
} else {
if (jogWindow === null) {
createJogWindow();
jogWindow.show()
jogWindow.setAlwaysOnTop(true);
jogWindow.focus();
jogWindow.setAlwaysOnTop(false);
if (openFilePath.length > 1) {
if (openFilePath.endsWith('.obc')) {
//
} else {
jogWindow.show()
jogWindow.setAlwaysOnTop(true);
jogWindow.focus();
jogWindow.setAlwaysOnTop(false);
if (jogWindow === null) {
createJogWindow();
jogWindow.show()
jogWindow.setAlwaysOnTop(true);
jogWindow.focus();
jogWindow.setAlwaysOnTop(false);
} else {
jogWindow.show()
jogWindow.setAlwaysOnTop(true);
jogWindow.focus();
jogWindow.setAlwaysOnTop(false);
}
}
}
}