rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidied up recalculateSize

Browse source
This commit is contained in:
jtc42 2019-06-11 09:37:47 +01:00
parent a343d17053
commit 5a9857d215
1 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/components/viewComponents/streamDisplay.vue
View file

@ -46,7 +46,6 @@ export default {
this.handleResize() // For any element attached to the observer, run handleResize() on change this.handleResize() // For any element attached to the observer, run handleResize() on change
entries.forEach(entry => {}) // Optional: Run something per entry entries.forEach(entry => {}) // Optional: Run something per entry
}); });
// Fetch streamDisplay by ref // Fetch streamDisplay by ref
const streamDisplayElement = this.$refs.streamDisplay.parentNode; const streamDisplayElement = this.$refs.streamDisplay.parentNode;
// Attach streamDisplay to the size observer // Attach streamDisplay to the size observer
@ -55,7 +54,6 @@ export default {
}, },
created: function () { created: function () {
// Watch for host 'ready' // Watch for host 'ready'
this.$store.watch( this.$store.watch(
(state)=>{ (state)=>{
@ -76,14 +74,14 @@ export default {
methods: { methods: {
clickmonitor: function(event) { clickmonitor: function(event) {
// Calculate steps from event coordinates and store config FOV // Calculate steps from event coordinates and store config FOV
var xCoordinate = event.offsetX; let xCoordinate = event.offsetX;
var yCoordinate = event.offsetY; let yCoordinate = event.offsetY;
var xRelative = (0.5*event.target.offsetWidth - xCoordinate)/event.target.offsetWidth; let xRelative = (0.5*event.target.offsetWidth - xCoordinate)/event.target.offsetWidth;
var yRelative = (0.5*event.target.offsetHeight - yCoordinate)/event.target.offsetHeight; let yRelative = (0.5*event.target.offsetHeight - yCoordinate)/event.target.offsetHeight;
var xSteps = xRelative * this.$store.state.apiConfig.fov[0]; let xSteps = xRelative * this.$store.state.apiConfig.fov[0];
var ySteps = yRelative * this.$store.state.apiConfig.fov[1]; let ySteps = yRelative * this.$store.state.apiConfig.fov[1];
// Emit a signal to move, acted on by panelNavigate.vue // Emit a signal to move, acted on by panelNavigate.vue
this.$root.$emit('globalMoveEvent', xSteps, ySteps, 0, false) this.$root.$emit('globalMoveEvent', xSteps, ySteps, 0, false)
@ -106,19 +104,23 @@ export default {
}, },
recalculateSize: function () { recalculateSize: function () {
console.log("Recalculating window dimensions...")
let element = this.$refs.streamDisplay.parentNode; let element = this.$refs.streamDisplay.parentNode;
let size = [element.clientWidth, element.clientHeight]; let bound = element.getBoundingClientRect()
let elem_pos = [element.getBoundingClientRect().left, element.getBoundingClientRect().top]; let elementSize = [bound.width, bound.height]
let wind_pos = [window.screenX, window.screenY];
let navHeight = window.outerHeight - window.innerHeight; let elementPositionOnWindow = [bound.left, bound.top]
let position = [Math.max(0, wind_pos[0] + elem_pos[0]), Math.max(0, wind_pos[1] + elem_pos[1] + navHeight)]; let windowPositionOnDisplay = [window.screenX, window.screenY]
let windowChromeHeight = window.outerHeight - window.innerHeight
let elementPositionOnDisplay = [
Math.max(0, windowPositionOnDisplay[0] + elementPositionOnWindow[0]),
Math.max(0, windowPositionOnDisplay[1] + elementPositionOnWindow[1] + windowChromeHeight)
]
this.displaySize = elementSize
this.displayPosition = elementPositionOnDisplay
this.displaySize = size;
console.log(`Size: ${this.displaySize}`) console.log(`Size: ${this.displaySize}`)
this.displayPosition = position;
console.log(`Position: ${this.displayPosition}`) console.log(`Position: ${this.displayPosition}`)
}, },
@ -149,7 +151,7 @@ export default {
} }
} }
else { else {
var letpayload = {} var payload = {}
} }
// Send preview request // Send preview request