Update text in IQRNode info display - see #160

phetsims · May 3, 2023 · fcd04a2 · fcd04a2
1 parent 896ff2d
commit fcd04a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/js/variability/view/IQRInfoNode.ts b/js/variability/view/IQRInfoNode.ts
@@ -32,21 +32,14 @@ export default class IQRInfoNode extends VBox {
 
         // TODO: String key name
         distancesText,
-<<<<<<< HEAD
-        new Text( new PatternStringProperty( CenterAndVariabilityStrings.iqrCalculationPatternStringProperty, {
-          q1: sceneModel.q1ValueProperty,
-          q3: sceneModel.q3ValueProperty,
-          iqr: sceneModel.iqrValueProperty
-=======
 
         new Text( new PatternStringProperty( CenterAndVariabilityStrings.iqrCalculationPattern1StringProperty, {
-          q1: model.q1ValueProperty,
-          q3: model.q3ValueProperty
+          q1: sceneModel.q1ValueProperty,
+          q3: sceneModel.q3ValueProperty
         } ), { fontSize: 18, visibleProperty: hasEnoughDataProperty, maxWidth: CAVConstants.INFO_DIALOG_MAX_TEXT_WIDTH } ),
 
         new Text( new PatternStringProperty( CenterAndVariabilityStrings.iqrCalculationPattern2StringProperty, {
-          iqr: model.iqrValueProperty
->>>>>>> b8b9d98 (Update text in IQRNode info display - see https://github.com/phetsims/center-and-variability/issues/160)
+          iqr: sceneModel.iqrValueProperty
         } ), { fontSize: 18, visibleProperty: hasEnoughDataProperty, maxWidth: CAVConstants.INFO_DIALOG_MAX_TEXT_WIDTH, layoutOptions: { bottomMargin: 10 } } ),
 
         new IQRNode( model, sceneModel, {

diff --git a/js/variability/view/IQRNode.ts b/js/variability/view/IQRNode.ts
@@ -199,12 +199,7 @@ export default class IQRNode extends CAVPlotNode {
         maxTextLabel.centerX = maxPositionX;
       }
 
-<<<<<<< HEAD
       const enoughData = sceneModel.numberOfDataPointsProperty.value >= 5;
-
-=======
-      const enoughData = model.numberOfDataPointsProperty.value >= 5;
->>>>>>> b8b9d98 (Update text in IQRNode info display - see https://github.com/phetsims/center-and-variability/issues/160)
       const iqrVisibility = ( options.parentContext === 'accordion' && enoughData && model.isShowingIQRProperty.value );
 
       iqrRectangle.visible = iqrVisibility;