Skip to content
Permalink
Browse files

Merged down from Master

  • Loading branch information...
sanuann committed Apr 15, 2018
2 parents 7265237 + e014abc commit 1d88acb7fde60f0c8fbf81ed3ae219f7872ce5ec
Showing with 60 additions and 24 deletions.
  1. +2 −1 .gitignore
  2. +7 −1 README.md
  3. +12 −0 eapp/config/app-config.js
  4. +1 −1 eapp/modules/instrument-editor/js/ie.js
  5. +19 −6 eapp/routes/instruments.js
  6. +5 −1 main.js
  7. +12 −12 package-lock.json
  8. +2 −2 package.json
@@ -12,4 +12,5 @@ owl/
main_org.js
proj-info.json
tests/addProject-test.js
.idea
.idea

@@ -1,4 +1,10 @@
# brainverse
Brainverse is an open-source, cross-platform desktop application to enable researchers add to reproducible practices into every project.

- An electronic laboratory notebook built as a cross platform desktop application also has feature to be deployed as web application
- Enables users to plan experiments, collect, analyze and reuse data, and collaborate
- Adds semantic annotation to data with relevant metadata based on NeuroImaging data Model (NIDM) making experimental neuroimaging study more reproducible, and making data FAIR
- Intercept the research workflow at planning stage, curating (raw, processed, results) data at the source and helping users to annotate every step of the process.

## Installation
The App for different OSes can be found in the [releases here](https://github.com/ReproNim/brainverse/releases)
@@ -38,7 +44,7 @@ You can track the different [modules](https://github.com/ReproNim/brainverse/pro
### Support and Communication
If you would like to ask a question about how to do something in BrainVerse please open a new topic in [NeuroStars.org](https://neurostars.org/) with a brainverse tag. NeuroStars.org is a platform similar to StackOverflow but dedicated to neuroinformatics.

If you see an issue or a bug while using BrainVerse, please create an issue in this github repository.
If you see an issue or a bug while using BrainVerse, please create an issue in this github repository and assign a label of the module it belongs to.

The BrainVerse updates and news will be posted to repronim-announcement mailing list. To receive BrainVerse news, subscribe to the [mailing-list](https://www.nitrc.org/mailman/listinfo/repronim-announcement).

@@ -0,0 +1,12 @@
exports.clientId = ''
exports.clientSecret = ''
exports.dirPaths = [
"/uploads/",
"/uploads/dataDictionary",
"/uploads/termforms",
"/uploads/acquisition",
"/uploads/acquisition/experiments",
"/uploads/acquisition/plans",
"/uploads/plansdocs",
"/uploads/experimentdocs"
]
@@ -20,7 +20,7 @@ if(instObj['shortName'] === undefined){
shortName = instObj['shortName']
}
console.log("[ie]: instObj", instObj)
var backButton = ' <a href="/instrument-editor/html/ie-mgm.html"><span style="float:right;">Back</span></a>'
var backButton = ' <a href="/instrument-editor/html/ie-mgm.html"><span class="glyphicon glyphicon-backward" style="float:right;"></span></a>'
/*
* Setting up the UI for instrument information - Name and description
* and update Modal for the instrument
@@ -66,7 +66,10 @@ module.exports = () => {
let ob = recentObjs[key]
let title = ob.Name.split(' ')[0]
let psname = ob.shortName.split(' ')
let shortName = psname[0]+psname[psname.length-1]
let shortName = psname[0]
if(psname.length > 1){
shortName = shortName + psname[psname.length-1]
}

let fileName = 'terms-'+shortName+'-'+title+".json"
console.log("[/instruments/local/list] filename: -->", fileName)
@@ -108,7 +111,10 @@ module.exports = () => {
let ob = hashObj[key]
let title = ob.Name.split(' ')[0]
let psname = ob.shortName.split(' ')
let shortName = psname[0]+psname[psname.length-1]
let shortName = psname[0]
if(psname.length > 1){
shortName = shortName + psname[psname.length-1]
}
//let fileName = 'terms-'+ob.shortName+'-'+title+".json"
let fileName = 'terms-'+shortName+'-'+title+".json"
nameList.push({"shortName":ob.shortName,"title": ob.Name, "author":ob.author,"filename": fileName})
@@ -166,8 +172,11 @@ module.exports = () => {
pid = term_info['DictionaryID'].split('-')
psname = term_info['shortName'].split(' ')
pname = term_info['Name'].split(' ')

let fileName = 'terms-'+ psname[0]+psname[psname.length-1]+'-'+ pname[0] +'.json'
let shortName = psname[0]
if(psname.length > 1){
shortName = shortName + psname[psname.length-1]
}
let fileName = 'terms-'+shortName +'-'+ pname[0] +'.json'
console.log("New Instrument Name:::: ", fileName)
let cpath = path.join(userData, '/uploads/termforms/'+ fileName)
writeJsonFile(cpath, req.body).then(() => {
@@ -189,8 +198,12 @@ module.exports = () => {
pid = term_info['DictionaryID'].split('-')
psname = term_info['shortName'].split(' ')
pname = term_info['Name'].split(' ')
//let fileName = psname[0]+'-'+ pname[0] +'.json'
let fileName = 'terms-'+ psname[0]+psname[psname.length-1]+'-'+ pname[0] +'.json'
let shortName = psname[0]
if(psname.length > 1){
shortName = shortName + psname[psname.length-1]
}

let fileName = 'terms-'+ shortName+'-'+ pname[0] +'.json'
console.log("New Instrument Name:::: ", fileName)
//Local save
let cpath = path.join(userData, '/uploads/termforms/'+ fileName)
@@ -23,7 +23,11 @@ function createWindow () {

// Create the browser window.
mainWindow = new BrowserWindow({width: 1200,
height: 800
height: 800,
webPreferences: {
nodeIntegration: false

}
})
//mainWindow = new BrowserWindow({width: 1200, height: 800,titleBarStyle: 'hidden'})
//mainWindow = new BrowserWindow({width: 1200, height: 800,frame: false})

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "BrainVerse",
"version": "0.0.4-alpha",
"version": "0.0.5-alpha",
"description": "Electronic Lab Notebook for Reproducible Neuro Imaging Research",
"main": "main.js",
"scripts": {
@@ -30,7 +30,7 @@
"devDependencies": {
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"electron": "^1.7.11",
"electron": "1.8.4",
"electron-builder": "^19.46.9",
"electron-oauth-github": "^1.0.0",
"mocha": "^3.2.0",

0 comments on commit 1d88acb

Please sign in to comment.
You can’t perform that action at this time.