Move CAVPlotNode, DataPointNode and DragIndicatorArrowNode back to ce…

…nter-and-variability, see #222
phetsims · Jun 9, 2023 · ab67526 · ab67526
1 parent a22659b
commit ab67526
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 24 deletions.
diff --git a/js/soccer-common/view/CAVPlotNode.ts → js/common/view/CAVPlotNode.ts b/js/soccer-common/view/CAVPlotNode.ts → js/common/view/CAVPlotNode.ts
@@ -7,18 +7,18 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import soccerCommon from '../soccerCommon.js';
+import soccerCommon from '../../soccer-common/soccerCommon.js';
 import { ManualConstraint, MatrixBetweenProperty, Node, NodeOptions, TColor, Text } from '../../../../scenery/js/imports.js';
 import optionize from '../../../../phet-core/js/optionize.js';
-import CAVSceneModel from '../model/CAVSceneModel.js';
+import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js';
 import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
-import NumberLineNode from './NumberLineNode.js';
+import NumberLineNode from '../../soccer-common/view/NumberLineNode.js';
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js';
-import CAVConstants from '../../common/CAVConstants.js';
+import CAVConstants from '../CAVConstants.js';
 import WithRequired from '../../../../phet-core/js/types/WithRequired.js';
 import DataPointNode from './DataPointNode.js';
-import CAVModel from '../../common/model/CAVModel.js';
+import CAVModel from '../model/CAVModel.js';
 import MeanAndMedianModel from '../../mean-and-median/model/MeanAndMedianModel.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import VariabilityModel from '../../variability/model/VariabilityModel.js';

diff --git a/js/common/view/CAVScreenView.ts b/js/common/view/CAVScreenView.ts
@@ -32,7 +32,7 @@ import DynamicProperty from '../../../../axon/js/DynamicProperty.js';
 import SoccerPlayerNode, { SoccerPlayerImageSet } from '../../soccer-common/view/SoccerPlayerNode.js';
 import SoccerPlayer from '../../soccer-common/model/SoccerPlayer.js';
 import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js';
-import DragIndicatorArrowNode from '../../soccer-common/view/DragIndicatorArrowNode.js';
+import DragIndicatorArrowNode from './DragIndicatorArrowNode.js';
 import CAVObjectType from '../../soccer-common/model/CAVObjectType.js';
 import ToggleNode from '../../../../sun/js/ToggleNode.js';
 import PlayAreaMedianIndicatorNode from './PlayAreaMedianIndicatorNode.js';

diff --git a/js/soccer-common/view/DataPointNode.ts → js/common/view/DataPointNode.ts b/js/soccer-common/view/DataPointNode.ts → js/common/view/DataPointNode.ts
@@ -1,19 +1,19 @@
 // Copyright 2023, University of Colorado Boulder
 
-import CAVObjectNode, { CAVObjectNodeOptions } from '../../common/view/CAVObjectNode.js';
-import soccerCommon from '../soccerCommon.js';
-import SoccerBall from '../model/SoccerBall.js';
+import CAVObjectNode, { CAVObjectNodeOptions } from './CAVObjectNode.js';
+import soccerCommon from '../../soccer-common/soccerCommon.js';
+import SoccerBall from '../../soccer-common/model/SoccerBall.js';
 import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
-import CAVObjectType from '../model/CAVObjectType.js';
+import CAVObjectType from '../../soccer-common/model/CAVObjectType.js';
 import { Circle, Node, Path, TColor } from '../../../../scenery/js/imports.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import timesSolidShape from '../../../../sherpa/js/fontawesome-5/timesSolidShape.js';
-import CAVConstants, { DATA_POINT_SCALE_PROPERTY } from '../../common/CAVConstants.js';
-import PlotType from '../../common/model/PlotType.js';
-import CAVColors from '../../common/CAVColors.js';
+import CAVConstants, { DATA_POINT_SCALE_PROPERTY } from '../CAVConstants.js';
+import PlotType from '../model/PlotType.js';
+import CAVColors from '../CAVColors.js';
 import Property from '../../../../axon/js/Property.js';
 import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
-import { SoccerBallPhase } from '../model/SoccerBallPhase.js';
+import { SoccerBallPhase } from '../../soccer-common/model/SoccerBallPhase.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 
 type DataPointNodeOptions = CAVObjectNodeOptions & { fill: TColor };

diff --git a/...cer-common/view/DragIndicatorArrowNode.ts → js/common/view/DragIndicatorArrowNode.ts b/...cer-common/view/DragIndicatorArrowNode.ts → js/common/view/DragIndicatorArrowNode.ts
@@ -8,9 +8,9 @@
  */
 
 import ArrowNode, { ArrowNodeOptions } from '../../../../scenery-phet/js/ArrowNode.js';
-import CAVColors from '../../common/CAVColors.js';
-import CAVConstants from '../../common/CAVConstants.js';
-import soccerCommon from '../soccerCommon.js';
+import CAVColors from '../CAVColors.js';
+import CAVConstants from '../CAVConstants.js';
+import soccerCommon from '../../soccer-common/soccerCommon.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import { NodeOptions } from '../../../../scenery/js/imports.js';

diff --git a/js/mean-and-median/view/MeanAndMedianPlotNode.ts b/js/mean-and-median/view/MeanAndMedianPlotNode.ts
@@ -12,7 +12,7 @@ import centerAndVariability from '../../centerAndVariability.js';
 import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js';
 import MedianBarNode from '../../common/view/MedianBarNode.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import CAVPlotNode, { CAVPlotNodeOptions } from '../../soccer-common/view/CAVPlotNode.js';
+import CAVPlotNode, { CAVPlotNodeOptions } from '../../common/view/CAVPlotNode.js';
 import MeanAndMedianModel from '../model/MeanAndMedianModel.js';
 import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import NumberLineNode from '../../soccer-common/view/NumberLineNode.js';

diff --git a/js/median/view/CardNodeContainer.ts b/js/median/view/CardNodeContainer.ts
@@ -32,7 +32,7 @@ import AsyncCounter from '../../common/model/AsyncCounter.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import Matrix3 from '../../../../dot/js/Matrix3.js';
-import DragIndicatorArrowNode from '../../soccer-common/view/DragIndicatorArrowNode.js';
+import DragIndicatorArrowNode from '../../common/view/DragIndicatorArrowNode.js';
 import TEmitter from '../../../../axon/js/TEmitter.js';
 import MedianModel from '../../median/model/MedianModel.js';
 import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js';

diff --git a/js/soccer-common/model/TKickDistanceStrategy.ts b/js/soccer-common/model/TKickDistanceStrategy.ts
@@ -31,7 +31,6 @@ export class DistributionStrategy implements TKickDistanceStrategy {
 
   public getNextKickDistance( kickNumber: number ): number {
     phet.chipper.queryParameters.dev && console.log( this.toStateObject() );
-    assert && assert( this.distribution.length === CAVConstants.PHYSICAL_RANGE.getLength() + 1, 'weight array should match the model range' );
     return dotRandom.sampleProbabilities( this.distribution ) + 1;
   }
 

diff --git a/js/variability/view/IQRNode.ts b/js/variability/view/IQRNode.ts
@@ -6,7 +6,7 @@ import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
 import centerAndVariability from '../../centerAndVariability.js';
 import VariabilityModel from '../model/VariabilityModel.js';
 import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js';
-import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../soccer-common/view/CAVPlotNode.js';
+import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../common/view/CAVPlotNode.js';
 import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import CAVColors from '../../common/CAVColors.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';

diff --git a/js/variability/view/MADNode.ts b/js/variability/view/MADNode.ts
@@ -7,7 +7,7 @@ import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js';
 import MedianBarNode from '../../common/view/MedianBarNode.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import Utils from '../../../../dot/js/Utils.js';
-import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../soccer-common/view/CAVPlotNode.js';
+import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../common/view/CAVPlotNode.js';
 import CAVConstants from '../../common/CAVConstants.js';
 import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import CAVColors from '../../common/CAVColors.js';

diff --git a/js/variability/view/RangeNode.ts b/js/variability/view/RangeNode.ts
@@ -11,7 +11,7 @@ import { ManualConstraint, Rectangle, Text } from '../../../../scenery/js/import
 import centerAndVariability from '../../centerAndVariability.js';
 import VariabilityModel from '../model/VariabilityModel.js';
 import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js';
-import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../soccer-common/view/CAVPlotNode.js';
+import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../common/view/CAVPlotNode.js';
 import CAVObjectType from '../../soccer-common/model/CAVObjectType.js';
 import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import CAVConstants from '../../common/CAVConstants.js';

diff --git a/js/variability/view/VariabilityPlotNode.ts b/js/variability/view/VariabilityPlotNode.ts
@@ -19,7 +19,7 @@ import MADNode from './MADNode.js';
 import VariabilityMeasure from '../model/VariabilityMeasure.js';
 import ToggleNode from '../../../../sun/js/ToggleNode.js';
 import VariabilitySceneModel from '../model/VariabilitySceneModel.js';
-import CAVPlotNode from '../../soccer-common/view/CAVPlotNode.js';
+import CAVPlotNode from '../../common/view/CAVPlotNode.js';
 import IntervalToolPlayAreaNode from './IntervalToolPlayAreaNode.js';
 import NumberLineNode from '../../soccer-common/view/NumberLineNode.js';