Skip to content

Commit 441b9b2

Browse files
committed
Wait for image to instantiate before rendering metadata widget.
1 parent 27707ff commit 441b9b2

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

histomicsui/web_client/panels/MetadataWidget.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ var MetadataWidgetPanel = Panel.extend({
6060

6161
render: function () {
6262
if (this.item && this.item.id) {
63+
if (!this.item.has('meta')) {
64+
this.listenToOnce(this.item, 'g:fetched', this.render);
65+
return this;
66+
}
6367
let func = this.item.getAccessLevel;
6468
if (this.item.get('_modelType') === 'annotation') {
6569
func = (callback) => {

histomicsui/web_client/views/body/ImageView.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,6 @@ var ImageView = View.extend({
691691
},
692692

693693
widgetRegion(model) {
694-
console.log('widgetRegion', model);
695694
var value = model.get('value');
696695
if (!this.viewerWidget || !this.viewerWidget.viewer) {
697696
model.set('value', '-1,-1,-1,-1');
@@ -743,12 +742,12 @@ var ImageView = View.extend({
743742

744743
_resetRegion() {
745744
var hasRegionParameter;
746-
if(router.getQuery('region')){
745+
if (router.getQuery('region')) {
747746
var region = router.getQuery('region');
748747
$('#region').val(region);
749-
// this._displayedRegion = region;
750-
// hasRegionParameter = true;
751-
// this.showRegion(this._displayedRegion);
748+
this._displayedRegion = region.split(',');
749+
hasRegionParameter = true;
750+
this.showRegion(this._displayedRegion);
752751
}
753752
if (!this._displayedRegion) {
754753
return;
@@ -1818,8 +1817,9 @@ var ImageView = View.extend({
18181817
},
18191818

18201819
_setRouter(evt) {
1821-
router.setQuery(evt.id, String(evt.changed.value), {trigger: false, replace: true});
1822-
},
1820+
const value = evt.changed.value !== undefined ? String(evt.changed.value) : null;
1821+
router.setQuery(evt.id, value, {trigger: false, replace: true});
1822+
}
18231823

18241824
});
18251825
export default ImageView;

0 commit comments

Comments
 (0)