Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"url": "git+https://github.com/opencor/webapp.git"
},
"type": "module",
"version": "0.20260304.1",
"version": "0.20260304.2",
"engines": {
"bun": ">=1.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export {
IOpenCOREmits,
IOpenCORExpose,
IOpenCORProps,
IOpenCORSimulationData,
IOpenCORSimulationDataEvent,
OpenCORSimulationData,
OpenCORTheme
} from './index.ts';
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ export interface IOpenCORExpose {
}

export interface IOpenCOREmits extends /* @vue-ignore */ Record<string, unknown[]> {
simulationData: [IOpenCORSimulationData];
simulationData: [IOpenCORSimulationDataEvent];
}

export type OpenCORSimulationData = Record<string, Float64Array | undefined>;

export interface IOpenCORSimulationData {
export interface IOpenCORSimulationDataEvent {
simulationData: OpenCORSimulationData;
issues: string[];
}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"./style.css": "./dist/opencor.css"
},
"version": "0.20260304.1",
"version": "0.20260304.2",
"scripts": {
"build": "vite build && bun scripts/generate.version.js",
"build:lib": "vite build --config vite.lib.config.ts && bun scripts/copy.indexdts.js",
Expand Down
12 changes: 6 additions & 6 deletions src/renderer/src/AppWithSimulationData.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<script setup lang="ts">
import * as vue from 'vue';

import type { IOpenCORExpose, IOpenCORSimulationData } from '../index.ts';
import type { IOpenCORExpose, IOpenCORSimulationDataEvent } from '../index.ts';

import OpenCOR from './components/OpenCOR.vue';

Expand Down Expand Up @@ -55,18 +55,18 @@ const untrackAllModelParameters = () => {
simulationDataTracked.value = [];
};

const onSimulationData = (res: IOpenCORSimulationData) => {
const onSimulationData = (event: IOpenCORSimulationDataEvent) => {
console.log('---[Simulation data]---');

for (const modelParameter of Object.keys(res.simulationData)) {
for (const modelParameter of Object.keys(event.simulationData)) {
console.log(`Simulation data for "${modelParameter}":`);
console.log(res.simulationData[modelParameter]);
console.log(event.simulationData[modelParameter]);
}

if (res.issues.length > 0) {
if (event.issues.length > 0) {
console.log('Issues:');

res.issues.forEach((issue: string) => {
event.issues.forEach((issue: string) => {
console.log(` - ${issue}`);
});
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/src/components/ContentsComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import { electronApi } from '../common/electronApi.ts';
import * as locApi from '../libopencor/locApi.ts';

import SimulationExperimentView from './views/SimulationExperimentView.vue';
import type { IOpenCORSimulationData } from '../../index.ts';
import type { IOpenCORSimulationDataEvent } from '../../index.ts';

interface IFileTab {
file: locApi.File;
Expand Down Expand Up @@ -178,7 +178,7 @@ const closeAllFiles = (): void => {
}
};

const simulationData = (modelParameters: string[]): Promise<IOpenCORSimulationData> => {
const simulationData = (modelParameters: string[]): Promise<IOpenCORSimulationDataEvent> => {
if (!props.simulationOnly) {
return Promise.resolve({
simulationData: common.undefinedSimulationData(modelParameters),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ import * as vueusecore from '@vueuse/core';
import Popover from 'primevue/popover';
import * as vue from 'vue';

import type { IOpenCORSimulationData } from '../../../index.ts';
import type { IOpenCORSimulationDataEvent } from '../../../index.ts';

import * as colors from '../../common/colors.ts';
import * as common from '../../common/common.ts';
Expand Down Expand Up @@ -669,8 +669,8 @@ const interactiveOldSettings = vue.ref<string>(JSON.stringify(vue.toRaw(interact

// A helper function to retrieve simulation data for one or more model parameters.

const simulationData = (modelParameters: string[]): Promise<IOpenCORSimulationData> => {
const res: IOpenCORSimulationData = {
const simulationData = (modelParameters: string[]): Promise<IOpenCORSimulationDataEvent> => {
const res: IOpenCORSimulationDataEvent = {
simulationData: common.undefinedSimulationData(modelParameters),
issues: []
};
Expand Down