Fix: Fix several bugs related prime tower (Snapmaker#1944)

parachvte · Feb 15, 2023 · ac0aa8b · ac0aa8b
1 parent e9ebb14
commit ac0aa8b
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 18 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,6 +5,7 @@
 *.css   text eol=lf
 *.js    text eol=lf
 *.jsx   text eol=lf
-*.sh    text eol=lf
 *.ts    text eol=lf
+*.tsx   text eol=lf
+*.sh    text eol=lf
 *.json  text eol=lf
diff --git a/src/app/config/menu/helpMenu.js b/src/app/config/menu/helpMenu.js
@@ -153,7 +153,7 @@ export default {
             }
         },
         {
-            label: 'key-App/Menu-Open Engine Test',
+            label: 'key-App/Menu-Run Engine Test',
             id: 'open-engine-test',
             enabled: true,
             click: (menuItem, browserWindow) => {

diff --git a/src/app/config/menu/index.js b/src/app/config/menu/index.js
@@ -49,6 +49,9 @@ function getMenuItems() {
                     }
                 ]
             });
+
+            // pop Run Engine Test
+            helpMenu.submenu.pop();
         }
     }
     return menuItems;

diff --git a/src/app/constants/copy.js b/src/app/constants/copy.js
@@ -130,6 +130,7 @@ i18n._('key-App/Menu-Firmware Tool');
 i18n._('key-App/Menu-Beginners Guide');
 i18n._('key-App/Menu-Backup config');
 i18n._('key-App/Menu-Download Logs');
+i18n._('key-App/Menu-Run Engine Test');
 
 // case lib
 i18n._('key-HomePage/CaseLibrary_title-3DP');

diff --git a/src/app/resources/i18n/cs/resource.json b/src/app/resources/i18n/cs/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "",
     "key-App/Menu-Save Project": "",
     "key-App/Menu-Select All": "",

diff --git a/src/app/resources/i18n/de/resource.json b/src/app/resources/i18n/de/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "Neu laden",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "Speichern als",
     "key-App/Menu-Save Project": "Projekt speichern",
     "key-App/Menu-Select All": "Alles auswählen",

diff --git a/src/app/resources/i18n/en/resource.json b/src/app/resources/i18n/en/resource.json
@@ -903,6 +903,7 @@
     "key-App/Menu-Reload": "Reload",
     "key-App/Menu-Rename": "Rename",
     "key-App/Menu-Reset Configurations": "Reset Configurations",
+    "key-App/Menu-Run Engine Test": "Run Engine Test",
     "key-App/Menu-Save As": "Save As",
     "key-App/Menu-Save Project": "Save Project",
     "key-App/Menu-Select All": "Select All",

diff --git a/src/app/resources/i18n/es/resource.json b/src/app/resources/i18n/es/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "Recargar",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "Guardar como",
     "key-App/Menu-Save Project": "Guardar proyecto",
     "key-App/Menu-Select All": "Seleccionar todo",

diff --git a/src/app/resources/i18n/fr/resource.json b/src/app/resources/i18n/fr/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "Recharger",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "Enregistrer sous",
     "key-App/Menu-Save Project": "Enregistrer le projet",
     "key-App/Menu-Select All": "Sélectionner tout",

diff --git a/src/app/resources/i18n/hu/resource.json b/src/app/resources/i18n/hu/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "",
     "key-App/Menu-Save Project": "",
     "key-App/Menu-Select All": "",

diff --git a/src/app/resources/i18n/it/resource.json b/src/app/resources/i18n/it/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "Ricarica",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "Salva con nome",
     "key-App/Menu-Save Project": "Salva il progetto",
     "key-App/Menu-Select All": "Seleziona tutto",

diff --git a/src/app/resources/i18n/ja/resource.json b/src/app/resources/i18n/ja/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "リロード",
     "key-App/Menu-Rename": "名前の変更",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "名前を付けて保存",
     "key-App/Menu-Save Project": "プロジェクトを保存",
     "key-App/Menu-Select All": "すべてを選択",

diff --git a/src/app/resources/i18n/ko/resource.json b/src/app/resources/i18n/ko/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "다시 불러오기",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "다른 이름으로 저장",
     "key-App/Menu-Save Project": "프로젝트 저장",
     "key-App/Menu-Select All": "모두 선택",

diff --git a/src/app/resources/i18n/pt-br/resource.json b/src/app/resources/i18n/pt-br/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "",
     "key-App/Menu-Save Project": "",
     "key-App/Menu-Select All": "",

diff --git a/src/app/resources/i18n/ru/resource.json b/src/app/resources/i18n/ru/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "Перезагрузить",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "Save As",
     "key-App/Menu-Save Project": "Save Project",
     "key-App/Menu-Select All": "Select All",

diff --git a/src/app/resources/i18n/uk/resource.json b/src/app/resources/i18n/uk/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "Перезавантажити",
     "key-App/Menu-Rename": "Перейменувати",
     "key-App/Menu-Reset Configurations": "Відновити налаштування",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "Зберегти як",
     "key-App/Menu-Save Project": "Збереження проєкту",
     "key-App/Menu-Select All": "Виділити все",

diff --git a/src/app/resources/i18n/zh-cn/resource.json b/src/app/resources/i18n/zh-cn/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "重新加载",
     "key-App/Menu-Rename": "重命名",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "另存为",
     "key-App/Menu-Save Project": "保存项目",
     "key-App/Menu-Select All": "全选",

diff --git a/src/app/resources/i18n/zh-tw/resource.json b/src/app/resources/i18n/zh-tw/resource.json
@@ -889,6 +889,7 @@
     "key-App/Menu-Reload": "",
     "key-App/Menu-Rename": "",
     "key-App/Menu-Reset Configurations": "",
+    "key-App/Menu-Run Engine Test": "",
     "key-App/Menu-Save As": "",
     "key-App/Menu-Save Project": "",
     "key-App/Menu-Select All": "",

diff --git a/src/app/scene/scene.logic.ts b/src/app/scene/scene.logic.ts
@@ -59,6 +59,7 @@ class SceneLogic {
         const supportExtruderConfig = modelGroup.getSupportExtruderConfig();
         if (this.supportEnabled) {
             extrudersUsed.add(supportExtruderConfig.support);
+            extrudersUsed.add(supportExtruderConfig.interface);
         }
 
         if (extrudersUsed.has(BOTH_EXTRUDER_MAP_NUMBER)) {
@@ -109,12 +110,16 @@ class SceneLogic {
             }
         }
 
-        const helpersExtruderConfig = modelGroup.getHelpersExtruderConfig();
+        const supportExtruderConfig = modelGroup.getSupportExtruderConfig();
         if (this.supportEnabled) {
             // max possible height: max model height
-            const extruderNumber = helpersExtruderConfig.support;
+            const extruderNumber = supportExtruderConfig.support;
             maxHeights[extruderNumber] = maxHeights[extruderNumber] || 0;
             maxHeights[extruderNumber] = Math.max(maxHeights[extruderNumber], ...Object.values(maxHeights));
+
+            const nr2 = supportExtruderConfig.interface;
+            maxHeights[nr2] = maxHeights[nr2] || 0;
+            maxHeights[nr2] = Math.max(maxHeights[nr2], ...Object.values(maxHeights));
         }
 
         if (Object.keys(maxHeights).length < 2) {

diff --git a/src/app/ui/views/PresetModifier/ParametersQuickSettingsView.tsx b/src/app/ui/views/PresetModifier/ParametersQuickSettingsView.tsx
@@ -220,6 +220,7 @@ const ParametersQuickSettingsView: React.FC<TProps> = ({ selectedStackId, select
     const selectedDefinitionSettings = selectedPresetModel.settings;
 
     const helpersExtruderConfig = useSelector((state: RootState) => state.printing.helpersExtruderConfig);
+    const supportExtruderConfig = useSelector((state: RootState) => state.printing.supportExtruderConfig);
 
     async function onChangeParam(newValue, paramSetting) {
         const actualOptions = paramSetting.options;
@@ -321,7 +322,7 @@ const ParametersQuickSettingsView: React.FC<TProps> = ({ selectedStackId, select
                     // 'speed_print': ['SpeedSlow', 'SpeedMedium', 'SpeedFast'],
                     //  'infill_sparse_density': ['ModelStructureThin', 'ModelStructureMedium', 'ModelStructureHard', 'ModelStructureVase'],
                     if (paramName === 'support_generate_type') {
-                        disabled = helpersExtruderConfig && helpersExtruderConfig.support !== stackExtruderNumber;
+                        disabled = supportExtruderConfig && supportExtruderConfig.support !== stackExtruderNumber;
                     }
                     if (paramName === 'adhesion_type') {
                         disabled = helpersExtruderConfig && helpersExtruderConfig.adhesion !== stackExtruderNumber;

diff --git a/src/server/DataStorage.js b/src/server/DataStorage.js
@@ -2,7 +2,6 @@ import * as fs from 'fs-extra';
 import isElectron from 'is-electron';
 import { gt, includes, isNil, isUndefined } from 'lodash';
 import path, { join } from 'path';
-import semver from 'semver';
 import { v4 as uuid } from 'uuid';
 
 import pkg from '../../package.json';
@@ -153,8 +152,6 @@ class DataStorage {
     }
 
     async init(isReset = false) {
-        const definitionUpdated = config.get('DefinitionUpdated');
-
         const gaUserId = config.get('gaUserId');
         if (isNil(gaUserId)) {
             config.set('gaUserId', uuid());
@@ -172,12 +169,21 @@ class DataStorage {
         !isReset && await this.checkNewUser();
 
         let overwriteProfiles = false;
-        if (semver.gte(settings.version, '4.1.0') && (!definitionUpdated || !definitionUpdated[settings.version])) {
+        // upgrade to new version
+        // TODO: remove key 'DefinitionUpdated'
+        const definitionVersion = config.get('definitionVersion');
+        if (definitionVersion !== settings.version) {
             overwriteProfiles = true;
+
+            config.set('definitionVersion', settings.version);
         }
+        // configDir not existing
         if (!overwriteProfiles && !fs.existsSync(this.configDir)) {
             overwriteProfiles = true;
         }
+        if (config.has('DefinitionUpdated')) {
+            config.unset('DefinitionUpdated');
+        }
 
         await fs.ensureDir(this.configDir);
 
@@ -203,15 +209,6 @@ class DataStorage {
         if (!isReset) {
             await this.initRecoverActive();
         }
-
-        // Add current version to updated
-
-        if (overwriteProfiles) {
-            config.set('DefinitionUpdated', {
-                ...definitionUpdated,
-                [settings.version]: true,
-            });
-        }
     }
 
     getParameterDocumentDir() {