Skip to content

Commit 2ef6894

Browse files
committed
FIxed Wizards and Advanced Coil Info
1 parent 7dbbf3c commit 2ef6894

11 files changed

Lines changed: 154 additions & 175 deletions

File tree

MagneticBuilder

WebSharedComponents

_deps/mkf-src

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/assets/js/libMKF.wasm.wasm

63.4 KB
Binary file not shown.

src/components/Wizards/CmcWizard.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ export default {
298298
async processAndReview() {
299299
this.process();
300300
this.$stateStore.resetMagneticTool();
301+
this.$stateStore.closeCoilAdvancedInfo(); // Ensure coil advanced info is disabled
301302
this.$stateStore.designLoaded();
302303
this.$stateStore.selectApplication(this.$stateStore.SupportedApplications.CommonModeChoke);
303304
this.$stateStore.selectWorkflow("design");
@@ -310,6 +311,7 @@ export default {
310311
async processAndAdvise() {
311312
this.process();
312313
this.$stateStore.resetMagneticTool();
314+
this.$stateStore.closeCoilAdvancedInfo(); // Ensure coil advanced info is disabled
313315
this.$stateStore.designLoaded();
314316
this.$stateStore.selectApplication(this.$stateStore.SupportedApplications.CommonModeChoke);
315317
this.$stateStore.selectWorkflow("design");

src/components/Wizards/ConverterWizardBase.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@ export default {
642642
// ===== NAVIGATION =====
643643
async navigateToReview(ss, ms, appType) {
644644
ss.resetMagneticTool(); ss.designLoaded();
645+
ss.closeCoilAdvancedInfo(); // Ensure coil advanced info is disabled
645646
ss.selectApplication(ss.SupportedApplications[appType]);
646647
ss.selectWorkflow("design"); ss.selectTool("agnosticTool");
647648
ss.setCurrentToolSubsectionStatus("designRequirements", true);
@@ -658,6 +659,7 @@ export default {
658659
659660
async navigateToAdvise(ss, ms, appType) {
660661
ss.resetMagneticTool(); ss.designLoaded();
662+
ss.closeCoilAdvancedInfo(); // Ensure coil advanced info is disabled
661663
ss.selectApplication(ss.SupportedApplications[appType]);
662664
ss.selectWorkflow("design"); ss.selectTool("agnosticTool");
663665
ss.setCurrentToolSubsection("magneticBuilder");

src/components/Wizards/DmcWizard.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ export default {
171171
if (this.errorMessage != "") return;
172172
173173
this.$stateStore.resetMagneticTool();
174+
this.$stateStore.closeCoilAdvancedInfo(); // Ensure coil advanced info is disabled
174175
this.$stateStore.designLoaded();
175176
this.$stateStore.selectApplication(this.$stateStore.SupportedApplications.Filter);
176177
this.$stateStore.selectWorkflow("design");
@@ -185,6 +186,7 @@ export default {
185186
if (this.errorMessage != "") return;
186187
187188
this.$stateStore.resetMagneticTool();
189+
this.$stateStore.closeCoilAdvancedInfo(); // Ensure coil advanced info is disabled
188190
this.$stateStore.designLoaded();
189191
this.$stateStore.selectApplication(this.$stateStore.SupportedApplications.Filter);
190192
this.$stateStore.selectWorkflow("design");

src/main.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { useSettingsStore } from '/src/stores/settings'
1313
import { useStateStore } from '/src/stores/state'
1414
import { useStyleStore } from '/src/stores/style'
1515
import { useFairRiteStyleStore } from '/src/stores/fairRiteStyle'
16+
import { useModelSettingsStore } from '/MagneticBuilder/src/stores/modelSettings'
1617
import { VueWindowSizePlugin } from 'vue-window-size/plugin';
1718
import { initWorker } from '/WebSharedComponents/assets/js/mkfRuntime'
1819
import VueLatex from 'vatex'
@@ -75,6 +76,12 @@ function preloadMKF() {
7576
mkf.load_wires("").then(() => console.log("Preload: Wires loaded"))
7677
]);
7778

79+
// Initialize model settings from WASM during preload
80+
console.warn("Preload: Initializing model settings...");
81+
const modelSettingsStore = useModelSettingsStore();
82+
await modelSettingsStore.loadFromWASM();
83+
console.warn("Preload: Model settings initialized");
84+
7885
console.warn("MKF preload complete - All data ready");
7986
return mkf;
8087
} catch (error) {
@@ -204,6 +211,12 @@ router.beforeEach((to, from, next) => {
204211
await Promise.all(loadPromises);
205212
}
206213
console.warn("All data loaded");
214+
215+
// Initialize model settings from WASM
216+
console.warn("Initializing model settings...");
217+
const modelSettingsStore = useModelSettingsStore();
218+
await modelSettingsStore.loadFromWASM();
219+
console.warn("Model settings initialized");
207220

208221
// Ensure minimum loader display time before navigating
209222
const newPath = app.config.globalProperties.$userStore.loadingPath;

src/stores/state.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,9 @@ export const useStateStore = defineStore("state", () => {
398398
function cancelChanges() {
399399
};
400400

401-
function closeCoilAdvancedInfo() {
402-
};
401+
function closeCoilAdvancedInfo() {
402+
this.magneticBuilder.mode.coil = MagneticBuilderModes.Basic;
403+
};
403404

404405
//CoilConfigurations
405406
const woundCoilConfiguration = ref({

0 commit comments

Comments
 (0)