- {
this.props.onNewProjectIPCMessage()
})
- ipcRenderer.on(OpenProjectMessage.type, (_: any, message: OpenProjectMessage) => {
- this.props.onOpenProjectIPCMessage(message.filePath, message.isExampleProject)
- })
+ ipcRenderer.on(
+ OpenProjectMessage.type,
+ (_: any, message: OpenProjectMessage) => {
+ this.props.onOpenProjectIPCMessage(
+ message.filePath,
+ message.isExampleProject
+ )
+ }
+ )
- ipcRenderer.on(SaveProjectMessage.type, (_: any, __: SaveProjectMessage) => {
- if (this.props.uiState.projectFilePath) {
- this.props.onSaveProjectAsIPCMessage(this.props.uiState.projectFilePath)
- } else {
- ipcRenderer.send(SpecifyProjectPathMessage.type, new SpecifyProjectPathMessage())
+ ipcRenderer.on(
+ SaveProjectMessage.type,
+ (_: any, __: SaveProjectMessage) => {
+ if (this.props.uiState.projectFilePath) {
+ this.props.onSaveProjectAsIPCMessage(
+ this.props.uiState.projectFilePath
+ )
+ } else {
+ ipcRenderer.send(
+ SpecifyProjectPathMessage.type,
+ new SpecifyProjectPathMessage()
+ )
+ }
}
- })
+ )
- ipcRenderer.on(SaveProjectAsMessage.type, (_: any, message: SaveProjectAsMessage) => {
- this.props.onSaveProjectAsIPCMessage(message.filePath)
- })
+ ipcRenderer.on(
+ SaveProjectAsMessage.type,
+ (_: any, message: SaveProjectAsMessage) => {
+ this.props.onSaveProjectAsIPCMessage(message.filePath)
+ }
+ )
- ipcRenderer.on(OpenImageMessage.type, (_: any, message: OpenImageMessage) => {
- this.props.onOpenImageIPCMessage(message.filePath)
- })
+ ipcRenderer.on(
+ OpenImageMessage.type,
+ (_: any, message: OpenImageMessage) => {
+ this.props.onOpenImageIPCMessage(message.filePath)
+ }
+ )
ipcRenderer.on(ExportMessage.type, (_: any, message: ExportMessage) => {
this.props.onExportIPCMessage(message.exportType)
})
- ipcRenderer.on(SetSidePanelVisibilityMessage.type, (_: any, message: SetSidePanelVisibilityMessage) => {
- this.props.onSetSidePanelVisibilityIPCMessage(message.panelsAreVisible)
- })
+ ipcRenderer.on(
+ SetSidePanelVisibilityMessage.type,
+ (_: any, message: SetSidePanelVisibilityMessage) => {
+ this.props.onSetSidePanelVisibilityIPCMessage(message.panelsAreVisible)
+ }
+ )
}
}
@@ -151,7 +197,7 @@ export function mapStateToProps(state: StoreState) {
uiState: state.uiState,
globalSettings: state.globalSettings,
solverResult: state.solverResult,
- image: state.image
+ image: state.image,
}
}
@@ -162,11 +208,12 @@ export function mapDispatchToProps(dispatch: Dispatch) {
// TODO: good to do async loading here?
loadImage(
imageBuffer,
+ () => dispatch(setImageLoading()),
(width: number, height: number, url: string) => {
dispatch(setImage(url, imageBuffer, width, height))
},
() => {
- remote.dialog.showErrorBox(
+ dialog.showErrorBox(
'Failed to load image data',
'Could not load the image data. Is this a valid image file?'
)
@@ -195,6 +242,7 @@ export function mapDispatchToProps(dispatch: Dispatch) {
let imageBuffer = readFileSync(imagePath)
loadImage(
imageBuffer,
+ () => dispatch(setImageLoading()),
(width: number, height: number, url: string) => {
dispatch(setImage(url, imageBuffer, width, height))
},
@@ -230,7 +278,7 @@ export function mapDispatchToProps(dispatch: Dispatch) {
},
onSetSidePanelVisibilityIPCMessage: (panelsAreVisible: boolean) => {
dispatch(setSidePanelVisibility(panelsAreVisible))
- }
+ },
}
}
diff --git a/src/gui/actions/index.ts b/src/gui/actions/index.ts
index f4a9a56..63411c2 100644
--- a/src/gui/actions/index.ts
+++ b/src/gui/actions/index.ts
@@ -16,17 +16,26 @@
* along with this program. If not, see {
- return (dispatch: ThunkDispatch, getState: () => StoreState) => {
+ SET_SIDE_PANEL_VISIBILITY = 'SET_SIDE_PANEL_VISIBILITY',
+}
+
+export function recalculateCalibrationResult(): ThunkAction<
+ void,
+ StoreState,
+ void,
+ AppAction
+> {
+ return (
+ dispatch: ThunkDispatch,
+ getState: () => StoreState
+ ) => {
setTimeout(() => {
let state = getState()
@@ -99,10 +117,11 @@ export function recalculateCalibrationResult(): ThunkAction
-
+
)
}
@@ -116,33 +139,56 @@ class App extends React.PureComponent{ remote.app.getVersion() }
-
+
+
})
-
-
)
diff --git a/src/gui/defaults/image-state.ts b/src/gui/defaults/image-state.ts
index b03effe..8949dd3 100644
--- a/src/gui/defaults/image-state.ts
+++ b/src/gui/defaults/image-state.ts
@@ -19,8 +19,9 @@
import { ImageState } from '../types/image-state'
export const defaultImageState: ImageState = {
+ loading: false,
width: null,
height: null,
url: null,
- data: null
+ data: null,
}
diff --git a/src/gui/index.html b/src/gui/index.html
index ca27281..985d637 100644
--- a/src/gui/index.html
+++ b/src/gui/index.html
@@ -1,10 +1,10 @@
-
-
+
+
- Drop an image or project here
+
+ Drop an image or project here
+