Skip to content

Commit

Permalink
feat(ParaViewWeb): Use the paraviewweb repo
Browse files Browse the repository at this point in the history
  • Loading branch information
jourdain committed Feb 18, 2016
1 parent 16d0d3a commit 063b3c7
Show file tree
Hide file tree
Showing 31 changed files with 442 additions and 319 deletions.
Binary file added dist/32400f4e08932a94d8bfd2422702c446.eot
Binary file not shown.
Binary file removed dist/45c73723862c6fc5eb3d6961db2d71fb.eot
Binary file not shown.
Binary file removed dist/4b5a84aaf1c9485e060c503a0ff8cadb.woff2
Binary file not shown.
87 changes: 44 additions & 43 deletions dist/Visualizer.js

Large diffs are not rendered by default.

Binary file added dist/a35720c2fed2c7f043bc7e4ffb45e073.woff
Binary file not shown.
Binary file not shown.
Binary file added dist/db812d8a70a4e88e888744c1c9a27e89.woff2
Binary file not shown.
Binary file removed dist/dfb02f8f6d0cedc009ee5887cc68f1f3.woff
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class='content'></div>
<script src="Visualizer.js"></script>
<script>
PVW.connect();
Visualizer.connect();
</script>
</body>
</html>
38 changes: 0 additions & 38 deletions lib/styles/InformationPanel.mcss

This file was deleted.

40 changes: 0 additions & 40 deletions lib/styles/TimeController.mcss

This file was deleted.

50 changes: 0 additions & 50 deletions lib/styles/ToggleIcons.mcss

This file was deleted.

110 changes: 38 additions & 72 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,90 +11,56 @@
"dependencies": {
"commander": "2.9.0",
"open": "0.0.5",
"shelljs": "0.6.0",

"autobahn": "0.9.6"
"shelljs": "0.6.0"
},
"devDependencies": {
"autobahn": "0.9.6",
"axios": "0.9.0",
"font-awesome": "4.5.0",
"gl-matrix": "2.3.1",
"hammerjs": "2.0.6",
"monologue.js": "0.3.4",
"mout": "0.11.1",
"normalize.css": "3.0.3",
"react": "0.14.7",
"react-dom": "0.14.7",

"ws": "0.8.1",
"when": "3.7.7",
"ws": "0.8.1",
"paraviewweb": "1.0.2",

"tonic-io": "1.2.17",
"tonic-ui": "1.3.11",

"font-awesome": "4.4.0",
"mout": "0.11.1",
"normalize.css": "3.0.3",

"monologue.js": "0.3.3",
"hammerjs": "2.0.6",

"npm-dep": "1.0.1",
"cz-conventional-changelog": "1.1.4"
},
"dep": {
"build": {
"node-libs-browser": "1.0.0",

"babel-core": "6.5.1",
"babel-eslint": "5.0.0-beta9",
"babel-loader": "6.2.2",
"babel-preset-es2015": "6.5.0",
"babel-preset-react": "6.5.0",
"node-libs-browser": "1.0.0",

"eslint": "1.10.3",
"eslint-loader": "1.2.1",
"eslint-plugin-babel": "3.1.0",
"eslint-plugin-react": "3.16.1",
"babel-core": "6.5.0",
"babel-polyfill": "6.5.0",
"babel-preset-es2015": "6.5.0",
"babel-preset-react": "6.5.0",
"babel-eslint": "5.0.0",
"babel-loader": "6.2.3",

"autoprefixer": "6.3.1",
"autoprefixer-loader": "3.2.0",
"css-loader": "0.23.1",
"expose-loader": "0.7.1",
"file-loader": "0.8.5",
"html-loader": "0.4.0",
"json-loader": "0.5.4",
"postcss-loader": "0.8.0",
"shader-loader": "1.1.4",
"style-loader": "0.13.0",
"url-loader": "0.5.7",
"eslint": "1.10.3",
"eslint-loader": "1.2.1",
"eslint-plugin-babel": "3.0.0",
"eslint-plugin-react": "3.16.1",

"html-webpack-plugin": "2.8.1",
"autoprefixer": "6.3.1",
"css-loader": "0.23.1",
"expose-loader": "0.7.1",
"file-loader": "0.8.5",
"html-loader": "0.4.0",
"json-loader": "0.5.4",
"postcss-loader": "0.8.0",
"shader-loader": "1.1.4",
"style-loader": "0.13.0",
"url-loader": "0.5.7",

"webpack": "1.12.13",
"webpack-dev-server": "1.14.1"
},
"deploy": {
"commitizen": "2.5.0",
"semantic-release": "4.3.5",
"tonic-site-generator": "0.2.2"
},
"karma-bug": {
"socket.io": "1.3.7"
},
"test": {
"istanbul":"0.4.2",
"istanbul-instrumenter-loader": "0.1.3",
"html-webpack-plugin": "2.7.2",

"expect":"1.13.4",
"jasmine-core": "2.4.1",
"jest-cli": "0.8.2",
"phantomjs": "1.9.19",
"webpack": "1.12.12",
"webpack-dev-server": "1.14.1",

"karma": "0.13.19",
"karma-chrome-launcher": "0.2.2",
"karma-cli": "0.1.2",
"karma-coverage" : "0.5.3",
"karma-firefox-launcher": "0.1.7",
"karma-jasmine": "0.3.6",
"karma-phantomjs-launcher": "0.2.3",
"karma-safari-launcher": "0.1.1",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "1.7.0"
}
"commitizen": "2.5.0",
"cz-conventional-changelog": "1.1.5",
"semantic-release": "4.3.5"
},
"scripts": {
"fix-autobahn": "sed -i.bak 's/WAMP_FEATURES = {/var WAMP_FEATURES = {/' ./node_modules/autobahn/lib/session.js && sed -i.bak 's/var var WAMP_FEATURES = {/var WAMP_FEATURES = {/' ./node_modules/autobahn/lib/session.js && rm ./node_modules/autobahn/lib/session.js.bak",
Expand Down
6 changes: 3 additions & 3 deletions lib/MainView.js → src/MainView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import VtkRenderer from 'tonic-ui/lib/react/renderer/VtkRenderer';
import style from 'PVWStyles/MainView.mcss';
import VtkRenderer from 'paraviewweb/src/React/Renderers/VtkRenderer';
import style from 'VisualizerStyle/MainView.mcss';
import ControlPanel from './panels/ControlPanel';
import TimeController from './panels/TimeController';
import logo from './logo.png';
Expand Down Expand Up @@ -41,7 +41,7 @@ export default React.createClass({
</div>
<div className={ style.buttons }>
<TimeController proxyManager={ proxyManager }/>
<i className='fa fa-arrows-alt' onClick={ this.resetCamera }></i>
<i className={ style.resetCameraButton } onClick={ this.resetCamera }></i>
</div>
</div>
<VtkRenderer { ...proxyManager.getNetworkAdapter() } className={ style.viewport }/>
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion lib/app.js → src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import ProxyManager from './ProxyManager';
import React from 'react';
import ReactDOM from 'react-dom';

require('font-awesome/css/font-awesome.css');
require('normalize.css');

function start() {
Expand Down
File renamed without changes
4 changes: 2 additions & 2 deletions lib/network.js → src/network.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import vtkWebClientFactory from 'tonic-io/lib/VtkWeb/client/pvw/ClientFactory';
import VtkWebSmartConnect from 'tonic-io/lib/VtkWeb/SmartConnect';
import vtkWebClientFactory from 'paraviewweb/src/IO/WebSocket/ParaViewWebClient';
import VtkWebSmartConnect from 'paraviewweb/src/IO/WebSocket/SmartConnect';

var connection = null,
client = null,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import FileBrowser from 'tonic-ui/lib/react/widget/FileBrowser';
import FileBrowser from 'paraviewweb/src/React/Widgets/FileBrowserWidget';

export default React.createClass({

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import ActionList from 'tonic-ui/lib/react/widget/ActionList';
import ActionList from 'paraviewweb/src/React/Widgets/ActionListWidget';

import style from 'VisualizerStyle/ToggleIcons.mcss';

export default React.createClass({

Expand All @@ -21,9 +22,9 @@ export default React.createClass({

getAlgorithms() {
var list = [];
list = list.concat(this.props.proxyManager.getSources().map(name => { return { name, icon: 'fa fa-fw fa-database' };}));
list = list.concat(this.props.proxyManager.getSources().map(name => { return { name, icon: style.sourceIcon };}));
if(this.props.proxyManager.canApplyFilter()) {
list = list.concat(this.props.proxyManager.getFilters().map(name => { return { name, icon: 'fa fa-fw fa-plus' };}));
list = list.concat(this.props.proxyManager.getFilters().map(name => { return { name, icon: style.filterIcon };}));
}
return list;
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import style from 'PVWStyles/InformationPanel.mcss';
import style from 'VisualizerStyle/InformationPanel.mcss';

function memoryToString(number) {
var unitIdx = 0,
Expand Down Expand Up @@ -102,19 +102,19 @@ export default React.createClass({
return (
<div className={style.container}>
<div className={style.line}>
<i className='fa fa-fw fa-file-text-o'></i>
<i className={ style.iconType }></i>
{this.state.proxy.data.type}
</div>
<div className={style.line}>
<i className='fa fa-fw fa-connectdevelop'></i>
<i className={ style.iconConnectivity }></i>
{this.state.proxy.data.points + ' points / ' + this.state.proxy.data.cells + ' cells'}
</div>
<div className={style.line}>
<i className='fa fa-fw fa-commenting-o'></i>
<i className={ style.iconMemory }></i>
{ memoryToString(this.state.proxy.data.memory) }
</div>
<div className={style.line}>
<i className='fa fa-fw fa-codepen'></i>
<i className={ style.iconBondingBox }></i>
<div>
<table className={ style.table }>
<tbody>
Expand All @@ -136,7 +136,7 @@ export default React.createClass({
</div>
{ this.props.proxyManager.getTimeValues().length ?
<div className={style.line}>
<i className='fa fa-fw fa-clock-o'></i>
<i className={ style.iconTime }></i>
<select value={ this.props.proxyManager.getTimeStep() } onChange={ this.updateTime }>
{ this.props.proxyManager.getTimeValues().map((t, idx) => <option key={idx} value={idx}>{t}</option>)}
</select>
Expand All @@ -145,20 +145,20 @@ export default React.createClass({
{ activeArray ?
<div>
<div className={style.line}>
<i className='fa fa-fw fa-database'></i>
<i className={ style.iconArray }></i>
<select value={ this.state.arrayIdx } onChange={ this.updateArray }>
{ this.state.proxy.data.arrays.map((a,idx) => <option key={idx} value={ idx }>{a.name}</option>)}
</select>
</div>
<div className={style.line}>
<i className='fa fa-fw fa-file-code-o'></i>
<i className={ style.iconArrayType }></i>
{ `${activeArray.location} / ${activeArray.type}(${activeArray.size})` }
</div>

<div className={style.line}><table className={style.table}>
<thead>
<tr>
<th><i className='fa fa-arrows-h'></i></th>
<th><i className={ style.iconRange }></i></th>
<th>Min</th>
<th>Max</th>
</tr>
Expand Down
Loading

0 comments on commit 063b3c7

Please sign in to comment.