@@ -191,7 +191,8 @@ namespace minsky
191191 {
192192 // Test disconnectAllVars clears all variable connections
193193 auto var = std::make_shared<VariableValue>();
194- var->init (" test" , 1.0 );
194+ var->name = " test" ;
195+ var->init (" 1.0" );
195196
196197 connectVar (var, PlotWidget::nBoundsPorts); // Connect to first y port
197198 EXPECT_FALSE (yvars.empty ());
@@ -208,9 +209,11 @@ namespace minsky
208209
209210 // Add some variables to yvars
210211 auto var1 = std::make_shared<VariableValue>();
211- var1->init (" var1" , 1.0 );
212+ var1->name = " var1" ;
213+ var1->init (" 1.0" );
212214 auto var2 = std::make_shared<VariableValue>();
213- var2->init (" var2" , 2.0 );
215+ var2->name = " var2" ;
216+ var2->init (" 2.0" );
214217
215218 connectVar (var1, PlotWidget::nBoundsPorts); // port 6, first y port
216219 connectVar (var2, PlotWidget::nBoundsPorts); // port 6, first y port
@@ -225,27 +228,33 @@ namespace minsky
225228 {
226229 // Test connecting variables to bound ports
227230 auto xminVar = std::make_shared<VariableValue>();
228- xminVar->init (" xmin" , 0.0 );
231+ xminVar->name = " xmin" ;
232+ xminVar->init (" 0.0" );
229233 connectVar (xminVar, 0 );
230234
231235 auto xmaxVar = std::make_shared<VariableValue>();
232- xmaxVar->init (" xmax" , 10.0 );
236+ xmaxVar->name = " xmax" ;
237+ xmaxVar->init (" 10.0" );
233238 connectVar (xmaxVar, 1 );
234239
235240 auto yminVar = std::make_shared<VariableValue>();
236- yminVar->init (" ymin" , -1.0 );
241+ yminVar->name = " ymin" ;
242+ yminVar->init (" -1.0" );
237243 connectVar (yminVar, 2 );
238244
239245 auto ymaxVar = std::make_shared<VariableValue>();
240- ymaxVar->init (" ymax" , 1.0 );
246+ ymaxVar->name = " ymax" ;
247+ ymaxVar->init (" 1.0" );
241248 connectVar (ymaxVar, 3 );
242249
243250 auto y1minVar = std::make_shared<VariableValue>();
244- y1minVar->init (" y1min" , -2.0 );
251+ y1minVar->name = " y1min" ;
252+ y1minVar->init (" -2.0" );
245253 connectVar (y1minVar, 4 );
246254
247255 auto y1maxVar = std::make_shared<VariableValue>();
248- y1maxVar->init (" y1max" , 2.0 );
256+ y1maxVar->name = " y1max" ;
257+ y1maxVar->init (" 2.0" );
249258 connectVar (y1maxVar, 5 );
250259
251260 // Verify the variables are connected (can't directly test private members,
@@ -352,7 +361,8 @@ namespace minsky
352361 {
353362 // Test autoScale method
354363 auto xminVar = std::make_shared<VariableValue>();
355- xminVar->init (" xmin" , 0.0 );
364+ xminVar->name = " xmin" ;
365+ xminVar->init (" 0.0" );
356366 connectVar (xminVar, 0 );
357367
358368 autoScale ();
@@ -366,7 +376,8 @@ namespace minsky
366376 {
367377 // Test adding a simple plot point
368378 auto yvar = std::make_shared<VariableValue>();
369- yvar->init (" y" , 1.0 );
379+ yvar->name = " y" ;
380+ yvar->init (" 1.0" );
370381 connectVar (yvar, PlotWidget::nBoundsPorts);
371382
372383 addPlotPt (0.0 );
@@ -406,10 +417,12 @@ namespace minsky
406417 {
407418 // Test connecting variables to Y data ports
408419 auto yvar1 = std::make_shared<VariableValue>();
409- yvar1->init (" yvar1" , 1.0 );
420+ yvar1->name = " yvar1" ;
421+ yvar1->init (" 1.0" );
410422
411423 auto yvar2 = std::make_shared<VariableValue>();
412- yvar2->init (" yvar2" , 2.0 );
424+ yvar2->name = " yvar2" ;
425+ yvar2->init (" 2.0" );
413426
414427 numLines (2 );
415428
@@ -427,7 +440,8 @@ namespace minsky
427440 {
428441 // Test connecting variables to X data ports
429442 auto xvar = std::make_shared<VariableValue>();
430- xvar->init (" xvar" , 0.5 );
443+ xvar->name = " xvar" ;
444+ xvar->init (" 0.5" );
431445
432446 numLines (2 );
433447
@@ -571,7 +585,8 @@ namespace minsky
571585 {
572586 // Test that updateIcon delegates to addPlotPt
573587 auto yvar = std::make_shared<VariableValue>();
574- yvar->init (" y" , 1.0 );
588+ yvar->name = " y" ;
589+ yvar->init (" 1.0" );
575590 connectVar (yvar, PlotWidget::nBoundsPorts);
576591
577592 updateIcon (1.0 );
@@ -688,10 +703,12 @@ namespace minsky
688703 numLines (2 );
689704
690705 auto yvar1 = std::make_shared<VariableValue>();
691- yvar1->init (" yvar1" , 1.0 );
706+ yvar1->name = " yvar1" ;
707+ yvar1->init (" 1.0" );
692708
693709 auto yvar2 = std::make_shared<VariableValue>();
694- yvar2->init (" yvar2" , 2.0 );
710+ yvar2->name = " yvar2" ;
711+ yvar2->init (" 2.0" );
695712
696713 // Connect both to the same port
697714 connectVar (yvar1, PlotWidget::nBoundsPorts);
0 commit comments