diff --git a/econplayground/main/models.py b/econplayground/main/models.py index 1ff1cd418..f2068333a 100644 --- a/econplayground/main/models.py +++ b/econplayground/main/models.py @@ -255,12 +255,6 @@ class Meta(OrderedModel.Meta): line_4_label = models.TextField(blank=True, null=True, default='') line_4_dashed = models.BooleanField(default=False) - # TODO: migrate these to a1, a2, etc. - alpha = models.DecimalField( - max_digits=12, decimal_places=4, default=Decimal('0.3')) - omega = models.DecimalField( - max_digits=12, decimal_places=4, default=Decimal('0')) - # Arbitrary number storage to be used as needed for the altering # functions of the various graph types. # diff --git a/media/js/src/GraphEditor.jsx b/media/js/src/GraphEditor.jsx index 8a59275d8..ace44eade 100644 --- a/media/js/src/GraphEditor.jsx +++ b/media/js/src/GraphEditor.jsx @@ -455,8 +455,6 @@ GraphEditor.propTypes = { gAssignmentType: PropTypes.number, gNeedsSubmit: PropTypes.bool, - gAlpha: PropTypes.number, - gA1: PropTypes.number, gA1Name: PropTypes.string, gA1Max: PropTypes.number, diff --git a/media/js/src/GraphMapping.js b/media/js/src/GraphMapping.js index 514f5289f..805bf1224 100644 --- a/media/js/src/GraphMapping.js +++ b/media/js/src/GraphMapping.js @@ -63,9 +63,6 @@ const exportGraph = function(state) { line_3_dashed: state.gLine3Dashed, line_4_dashed: state.gLine4Dashed, - alpha: forceFloat(state.gAlpha), - omega: forceFloat(state.gOmega), - a1: forceFloat(state.gA1), a1_name: state.gA1Name, a1_max: forceFloat(state.gA1Max), @@ -231,9 +228,6 @@ const convertGraph = function(json) { gLine3Dashed: json.line_3_dashed, gLine4Dashed: json.line_4_dashed, - gAlpha: forceFloat(json.alpha), - gOmega: forceFloat(json.omega), - gA1: forceFloat(json.a1), gA1Name: json.a1_name, gA1Max: forceFloat(json.a1_max), @@ -387,9 +381,6 @@ const importGraph = function(json, obj, callback=null) { gLine3Dashed: json.line_3_dashed, gLine4Dashed: json.line_4_dashed, - gAlpha: forceFloat(json.alpha), - gOmega: forceFloat(json.omega), - gA1: forceFloat(json.a1), gA1Name: json.a1_name, gA1Max: forceFloat(json.a1_max), @@ -568,9 +559,6 @@ const defaultGraph = { gXAxis2Label: '', gYAxis2Label: '', - gAlpha: 0.3, - gOmega: 1, - gA1: null, gA1Name: '', gA1Min: 0, diff --git a/media/js/src/GraphViewer.jsx b/media/js/src/GraphViewer.jsx index e34ca25e4..278245dd7 100644 --- a/media/js/src/GraphViewer.jsx +++ b/media/js/src/GraphViewer.jsx @@ -519,8 +519,6 @@ GraphViewer.propTypes = { gLine2Dashed: PropTypes.bool.isRequired, gLine3Dashed: PropTypes.bool.isRequired, - gAlpha: PropTypes.number, - gA1: PropTypes.number, gA1Name: PropTypes.string, gA1Initial: PropTypes.number, diff --git a/media/js/src/JXGBoard.jsx b/media/js/src/JXGBoard.jsx index 3ec8c9b76..8c5e21aa0 100644 --- a/media/js/src/JXGBoard.jsx +++ b/media/js/src/JXGBoard.jsx @@ -305,7 +305,7 @@ export default class JXGBoard extends React.Component { 'gLine2OffsetYInitial', 'gLine3OffsetX', 'gLine3OffsetY', 'gLine3OffsetXInitial', 'gLine3OffsetYInitial', 'gLine4OffsetX', 'gLine4OffsetY', 'gLine4OffsetXInitial', 'gLine4OffsetYInitial', - 'gLine1Dashed', 'gLine2Dashed', 'gLine3Dashed', 'gAlpha', + 'gLine1Dashed', 'gLine2Dashed', 'gLine3Dashed', 'gA1', 'gA1Initial', 'gA1Name', 'gA2', 'gA2Initial', 'gA2Name', @@ -842,8 +842,6 @@ JXGBoard.propTypes = { gLine2Dashed: PropTypes.bool, gLine3Dashed: PropTypes.bool, - gAlpha: PropTypes.number, - gA1: PropTypes.number, gA1Initial: PropTypes.number, gA2: PropTypes.number,