Renamed to OpenFlexure eV

This commit is contained in:
Joel Collins 2019-03-01 10:01:39 +00:00
parent 0ee8825c66
commit be0703db35
20 changed files with 20 additions and 57 deletions

View file

@ -1,4 +1,4 @@
# OpenFlexure.vue
# OpenFlexure eV
A user client for the OpenFlexure Microscope, written in Vue.js.
## Install

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

Before After
Before After

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,010 KiB

After

Width:  |  Height:  |  Size: 885 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 777 B

After

Width:  |  Height:  |  Size: 745 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 199 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 353 KiB

After

Width:  |  Height:  |  Size: 353 KiB

Before After
Before After

View file

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
<Identity Name="OpenFlexureMicroscopeJS"
ProcessorArchitecture="x64"
Publisher="CN=bath-open-instrumentation-group"
Version="0.1.0.0" />
<Properties>
<DisplayName>OpenFlexure Microscope JS</DisplayName>
<PublisherDisplayName>OpenFlexure</PublisherDisplayName>
<Description>A user client for the OpenFlexure Microscope Server</Description>
<Logo>assets\SampleAppx.50x50.png</Logo>
</Properties>
<Resources>
<Resource Language="en-us" />
</Resources>
<Dependencies>
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
</Dependencies>
<Capabilities>
<rescap:Capability Name="runFullTrust"/>
</Capabilities>
<Applications>
<Application Id="OpenFlexureMicroscopeJS" Executable="app/openflexure-microscope-js.exe" EntryPoint="Windows.FullTrustApplication">
<uap:VisualElements
BackgroundColor="#9C1561"
DisplayName="OpenFlexure Microscope JS"
Square150x150Logo="assets\SampleAppx.150x150.png"
Square44x44Logo="assets\SampleAppx.44x44.png"
Description="OpenFlexure Microscope JS for Desktops">
<uap:DefaultTile Wide310x150Logo="assets\SampleAppx.310x150.png" />
</uap:VisualElements>
</Application>
</Applications>
</Package>

View file

@ -4,11 +4,11 @@ const package = require('../package.json');
convertToWindowsStore({
containerVirtualization: false,
inputDirectory: path.join(__dirname, '../release-builds/openflexure-microscope-js-win32-x64'),
inputDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'),
outputDirectory: path.join(__dirname, '../release-builds/installers'),
assets: path.join(__dirname, '/appx/assets'),
packageExecutable: 'app/openflexure-microscope-js.exe',
packageName: 'OpenFlexureMicroscopeJS',
packageExecutable: 'app/openflexure-ev.exe',
packageName: 'OpenFlexureEV',
packageVersion: `${package.version}.0`,
packageDisplayName: package.productName,
packageDescription: package.description,
@ -17,6 +17,6 @@ convertToWindowsStore({
deploy: false,
publisher: 'CN=bath-open-instrumentation-group',
publisherDisplayName: "Bath Open Instrumentation Group",
devCert: "C:\\Certs\\openflexure-microscope-js-appx\\openflexure-microscope-js-appx.pfx",
devCert: "C:\\Certs\\openflexure-ev-appx\\openflexure-ev-appx.pfx",
windowsKit: 'C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.17763.0\\x64'
})

View file

@ -2,7 +2,7 @@ const installer = require('electron-installer-debian')
const path = require('path')
const options = {
src: path.join(__dirname, '../release-builds/openflexure-microscope-js-linux-armv7l/'),
src: path.join(__dirname, '../release-builds/openflexure-ev-linux-armv7l/'),
dest: path.join(__dirname, '../release-builds/installers'),
arch: 'armhf',
icon: path.join(__dirname, '../icons/png/1024x1024.png'),

View file

@ -2,7 +2,7 @@ const installer = require('electron-installer-debian')
const path = require('path')
const options = {
src: path.join(__dirname, '../release-builds/openflexure-microscope-js-linux-x64/'),
src: path.join(__dirname, '../release-builds/openflexure-ev-linux-x64/'),
dest: path.join(__dirname, '../release-builds/installers'),
arch: 'amd64',
icon: path.join(__dirname, '../icons/png/1024x1024.png'),

View file

@ -12,13 +12,13 @@ function getInstallerConfig () {
console.log('creating windows installer')
return Promise.resolve({
appDirectory: path.join(__dirname, '../release-builds/openflexure-microscope-js-win32-x64'),
appDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'),
authors: 'OpenFlexure',
noMsi: true,
outputDirectory: path.join(__dirname, '../release-builds/installers'),
exe: 'openflexure-microscope-js.exe',
setupExe: 'OpenFlexureMicroscopeJsInstaller.exe',
exe: 'openflexure-ev.exe',
setupExe: 'OpenFlexureEvInstaller.exe',
setupIcon: path.join(__dirname, '../icons/win/icon.ico'),
certificateFile: "C:\\Certs\\openflexure-microscope-js-exe\\openflexure-microscope-js-exe.pfx"
certificateFile: "C:\\Certs\\openflexure-ev-exe\\openflexure-ev-exe.pfx"
})
}

View file

@ -1,10 +1,10 @@
{
"name": "openflexure-microscope-js",
"productName": "OpenFlexure Microscope JS",
"displayName": "OpenFlexure Microscope JS",
"name": "openflexure-ev",
"productName": "OpenFlexure eV",
"displayName": "OpenFlexure eV",
"publisher": "Bath Open Instrumentation Group",
"author": "OpenFlexure",
"description": "A user client for the OpenFlexure Microscope Server",
"description": "An electron-based user client for the OpenFlexure Microscope Server",
"main": "app.js",
"version": "0.1.0",
"private": true,
@ -13,10 +13,10 @@
"build": "vue-cli-service build",
"dev": "set NODE_ENV=DEV&& electron app.dev.js",
"run": "vue-cli-service build && electron app.js",
"package-win": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --asar=true --platform=win32 --arch=x64 --icon=icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"",
"package-linux": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --asar=true --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=release-builds",
"package-rpi": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --asar=true --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=icons/png/1024x1024.png --prune=true --out=release-builds",
"package-darwin": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --prune=true --out=release-builds",
"package-win": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=win32 --arch=x64 --icon=icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"",
"package-linux": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=release-builds",
"package-rpi": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=icons/png/1024x1024.png --prune=true --out=release-builds",
"package-darwin": "electron-packager . openflexure-ev --ignore=^/src --overwrite --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --prune=true --out=release-builds",
"package-all": "npm run package-win && npm run package-linux && npm run package-rpi && npm run package-darwin",
"make": "npm run build && npm run package-all"
},

View file

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>OpenFlexure Microscope</title>
<title>OpenFlexure eV</title>
</head>
<body>
<noscript>