Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #6866 client side cache when running with web sockets #7182

Merged
merged 8 commits into from
Aug 5, 2024
Merged

fix #6866 client side cache when running with web sockets #7182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
166cc92
for #6866 start on srCache for websockets
moellep Jul 16, 2024
3f491fb
for #6866 removed extra autoSaves
moellep Jul 16, 2024
2f7ab5c
for #6866 added cache mru and clearFrames()
moellep Jul 18, 2024
295b505
for #6866 remove temp var
moellep Jul 19, 2024
497424e
for #6866 address PR comments
moellep Jul 26, 2024
fe2aadf
for #6866 method order by name
moellep Jul 26, 2024
ad87094
Merge branch 'master' into 6866-local-storage
moellep Aug 2, 2024
4fb62d9
for #6866 wait for onsuccess() to set db
moellep Aug 2, 2024
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
95 changes: 55 additions & 40 deletions sirepo/package_data/static/js/openmc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ SIREPO.app.config(() => {
</div>
</div>
<div data-ng-switch-when="PlotScoreList" data-ng-class="fieldClass">
<div class="input-group">
<select class="form-control" data-ng-model="model[field]" data-ng-options="s.score as s.score for s in (model.tallies | filter:{name:model.tally})[0].scores"></select>
</div>
<div data-plot-score-list="" data-model="model" data-field="field"></div>
</div>
<div data-ng-switch-when="FloatArray" class="col-sm-7">
<div data-num-array="" data-model="model" data-field-name="field" data-field="model[field]" data-info="info" data-num-type="Float"></div>
Expand Down Expand Up @@ -662,10 +660,8 @@ SIREPO.app.factory('tallyService', function(appState, openmcService, utilities,

self.updateTallyDisplay = () => {
appState.models.tallyReport.colorMap = appState.models.openmcAnimation.colorMap;
// save quietly but immediately
appState.saveQuietly('openmcAnimation');
appState.saveQuietly('tallyReport');
appState.autoSave();
};

$rootScope.$on('modelsUnloaded', self.clearMesh);
Expand Down Expand Up @@ -796,6 +792,29 @@ SIREPO.app.directive('planeList', function(appState) {
};
});

SIREPO.app.directive('plotScoreList', function(openmcService) {
return {
restrict: 'A',
scoe: {
model: '=',
field: '=',
},
template: `
<div class="input-group">
<select class="form-control" data-ng-model="model[field]" data-ng-options="s for s in scores track by s"></select>
</div>
`,
controller: function($scope) {
function buildScores() {
const t = openmcService.findTally();
$scope.scores = t ? t.scores.map((s) => s.score) : [];
}
buildScores();
$scope.$watch('model.tally', buildScores);
},
};
});

SIREPO.app.directive('tallyVolumePicker', function(openmcService, volumeLoadingService) {
return {
restrict: 'A',
Expand Down Expand Up @@ -1205,7 +1224,7 @@ SIREPO.app.directive('geometry2d', function(appState, openmcService, panelState,

function updateDisplay() {
tallyService.updateTallyDisplay();
updateSlice();
buildTallyReport();
}

function updateDisplayRange() {
Expand All @@ -1215,45 +1234,17 @@ SIREPO.app.directive('geometry2d', function(appState, openmcService, panelState,
SIREPO.GEOMETRY.GeometryUtils.BASIS().forEach(dim => {
displayRanges[dim] = tallyService.tallyRange(dim);
});
updateVisibleAxes();
updateSliceAxis();
}

function updateSlice() {
buildTallyReport();
// save quietly but immediately
appState.saveQuietly('tallyReport');
appState.saveQuietly('openmcAnimation');
appState.autoSave();
}

function updateSliceAxis() {
if (! tallyService.fieldData) {
return;
}
if (! tallyService.initMesh()) {
return ;
}
updateSlice();
}

function updateVisibleAxes() {
const v = {};
SIREPO.GEOMETRY.GeometryUtils.BASIS().forEach(dim => {
v[dim] = true;
SIREPO.GEOMETRY.GeometryUtils.BASIS_VECTORS()[dim].forEach((bv, bi) => {
if (! bv && tallyService.mesh.dimension[bi] < SIREPO.APP_SCHEMA.constants.minTallyResolution) {
delete v[dim];
}
});
});
SIREPO.GEOMETRY.GeometryUtils.BASIS().forEach(dim => {
const s = ! Object.keys(v).length || dim in v;
panelState.showEnum('tallyReport', 'axis', dim, s);
if (! s && appState.models.tallyReport.axis === dim) {
appState.models.tallyReport.axis = Object.keys(v)[0];
}
});
buildTallyReport();
}

function vectorScaleFactor() {
Expand Down Expand Up @@ -1282,7 +1273,7 @@ SIREPO.app.directive('geometry2d', function(appState, openmcService, panelState,
$scope.$on('sr-volume-visibility-toggle-all', buildTallyReport);
appState.watchModelFields($scope, ['tallyReport.axis'], updateSliceAxis);
appState.watchModelFields($scope, ['openmcAnimation.colorMap', 'openmcAnimation.sourceColorMap'], updateDisplay);
appState.watchModelFields($scope, ['tallyReport.planePos', 'openmcAnimation.showSources'], updateSlice, true);
appState.watchModelFields($scope, ['tallyReport.planePos', 'openmcAnimation.showSources'], buildTallyReport);
$scope.$watch('tallyService.fieldData', (newValue, oldValue) => {
if (newValue && newValue !== oldValue) {
updateDisplayRange();
Expand Down Expand Up @@ -1827,8 +1818,6 @@ SIREPO.app.directive('geometry3d', function(appState, openmcService, plotting, p

function showSources() {
addSources();
appState.saveQuietly($scope.modelName);
appState.autoSave();
}

const updateDisplay = utilities.debounce(() => {
Expand Down Expand Up @@ -1860,8 +1849,11 @@ SIREPO.app.directive('geometry3d', function(appState, openmcService, plotting, p
`${$scope.modelName}.colorMap`,
`${$scope.modelName}.opacity`,
`${$scope.modelName}.sourceColorMap`,
], updateDisplay, true);
appState.watchModelFields($scope, [`${$scope.modelName}.showSources`], showSources, true);
], updateDisplay);
appState.watchModelFields($scope, [
`${$scope.modelName}.opacity`,
], setGlobalProperties);
appState.watchModelFields($scope, [`${$scope.modelName}.showSources`], showSources);
$scope.$watch('tallyService.fieldData', (newValue, oldValue) => {
if (vtkScene && newValue && newValue !== oldValue) {
$rootScope.$broadcast('vtk.showLoader');
Expand Down Expand Up @@ -3173,13 +3165,36 @@ SIREPO.viewLogic('tallySettingsView', function(appState, openmcService, panelSta
panelState.showField('openmcAnimation', 'sourceNormalization', openmcService.canNormalizeScore(appState.models.openmcAnimation.score));
panelState.showField('openmcAnimation', 'numSampleSourceParticles', showSources);
panelState.showField('openmcAnimation', 'sourceColorMap', showSources && appState.models.openmcAnimation.numSampleSourceParticles);
updateVisibleAxes();
}

function updateEnergyPlot() {
appState.models.energyAnimation[appState.models.tallyReport.axis] = appState.models.tallyReport.planePos;
appState.saveChanges('energyAnimation');
}

function updateVisibleAxes() {
if (! tallyService.mesh) {
return;
}
const v = {};
SIREPO.GEOMETRY.GeometryUtils.BASIS().forEach(dim => {
v[dim] = true;
SIREPO.GEOMETRY.GeometryUtils.BASIS_VECTORS()[dim].forEach((bv, bi) => {
if (! bv && tallyService.mesh.dimension[bi] < SIREPO.APP_SCHEMA.constants.minTallyResolution) {
delete v[dim];
}
});
});
SIREPO.GEOMETRY.GeometryUtils.BASIS().forEach(dim => {
const s = ! Object.keys(v).length || dim in v;
panelState.showEnum('tallyReport', 'axis', dim, s);
if (! s && appState.models.tallyReport.axis === dim) {
appState.models.tallyReport.axis = Object.keys(v)[0];
}
});
}

function validateTally() {
openmcService.validateSelectedTally();
autoUpdate();
Expand Down
Loading