From c2b7593d79eee418b18226e93627fe64813e4ed3 Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Wed, 5 Feb 2020 11:50:48 +0100 Subject: [PATCH] rename signal-mapping to edit-signal-mapping as preparation for making this a separate dialog and removing simulation model frame --- .../edit-signal-mapping.js} | 9 +++------ src/simulationmodel/simulation-model.js | 10 ++++------ 2 files changed, 7 insertions(+), 12 deletions(-) rename src/{simulationmodel/signal-mapping.js => signal/edit-signal-mapping.js} (95%) diff --git a/src/simulationmodel/signal-mapping.js b/src/signal/edit-signal-mapping.js similarity index 95% rename from src/simulationmodel/signal-mapping.js rename to src/signal/edit-signal-mapping.js index 900360c..f22aa53 100644 --- a/src/simulationmodel/signal-mapping.js +++ b/src/signal/edit-signal-mapping.js @@ -1,7 +1,4 @@ /** - * File: signalMapping.js - * Author: Markus Grigull - * Date: 10.08.2018 * * This file is part of VILLASweb. * @@ -27,7 +24,7 @@ import validator from 'validator'; import Table from '../common/table'; import TableColumn from '../common/table-column'; -class SignalMapping extends React.Component { +class EditSignalMapping extends React.Component { constructor(props) { super(props); @@ -119,7 +116,7 @@ class SignalMapping extends React.Component { } } -SignalMapping.propTypes = { +EditSignalMapping.propTypes = { name: PropTypes.string, length: PropTypes.number, signals: PropTypes.arrayOf( @@ -131,4 +128,4 @@ SignalMapping.propTypes = { onChange: PropTypes.func }; -export default SignalMapping; +export default EditSignalMapping; diff --git a/src/simulationmodel/simulation-model.js b/src/simulationmodel/simulation-model.js index 3cfd522..003ab22 100644 --- a/src/simulationmodel/simulation-model.js +++ b/src/simulationmodel/simulation-model.js @@ -27,13 +27,12 @@ import SimulationModelStore from './simulation-model-store'; import LoginStore from '../user/login-store'; import AppDispatcher from '../common/app-dispatcher'; -import SelectSimulator from '../simulator/select-simulator'; import SelectFile from '../file/select-file'; -import SignalMapping from './signal-mapping'; +import EditSignalMapping from '../signal/edit-signal-mapping'; import EditableHeader from '../common/editable-header'; import ParametersEditor from '../common/parameters-editor'; import SimulatorStore from "../simulator/simulator-store"; -import SignalStore from "./signal-store"; +import SignalStore from "../signal/signal-store"; import FileStore from "../file/file-store" @@ -204,7 +203,6 @@ class SimulationModel extends React.Component {
- @@ -223,11 +221,11 @@ class SimulationModel extends React.Component { - + - +