Fixed another bug in Iteration associate with all cars

KerryL · May 25, 2016 · 3c1448f · 3c1448f
1 parent bb7f765
commit 3c1448f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/CarDesigner/include/gui/components/mainFrame.h b/CarDesigner/include/gui/components/mainFrame.h
@@ -137,6 +137,8 @@ class MainFrame : public wxFrame
 
 	bool GetUseOrtho() const { return useOrthoView; }
 
+	void SetAssociateWithAllCars();
+
 private:
 	wxAuiManager manager;
 

diff --git a/CarDesigner/src/gui/components/mainFrame.cpp b/CarDesigner/src/gui/components/mainFrame.cpp
@@ -3350,3 +3350,29 @@ void MainFrame::RemoveFileFromHistory(wxString pathAndFileName)
 		}
 	}
 }
+
+//==========================================================================
+// Class:			MainFrame
+// Function:		SetAssociateWithAllCars
+//
+// Description:		Checks or unchecks the iteration menu item for associate
+//					with all open cars.
+//
+// Input Arguments:
+//		None
+//
+// Output Arguments:
+//		None
+//
+// Return Value:
+//		None
+//
+//==========================================================================
+void MainFrame::SetAssociateWithAllCars()
+{
+	if (openObjectList[activeIndex]->GetType() != GuiObject::TypeIteration)
+		return;
+
+	wxMenuItem *item = this->FindItemInMenuBar(IdMenuIterationAssociatedWithAllCars);
+	item->Check(static_cast<Iteration*>(openObjectList[activeIndex])->GetAutoAssociate());
+}
diff --git a/CarDesigner/src/gui/iteration.cpp b/CarDesigner/src/gui/iteration.cpp
@@ -1099,6 +1099,8 @@ void Iteration::ShowAssociatedCarsDialog()
 		// If not all of the cars in the list are selected, make sure we're not auto-associating
 		if (openCars.size() != associatedCars.size())
 			associatedWithAllOpenCars = false;
+
+		mainFrame.SetAssociateWithAllCars();
 	}
 
 	// Update the analyses
@@ -1463,11 +1465,13 @@ void Iteration::SetYAxisType(AxisType yAxisType)
 void Iteration::SetAutoAssociate(bool autoAssociate)
 {
 	associatedWithAllOpenCars = autoAssociate;
+	UpdateAutoAssociate();
 
 	// Set the "this item has changed" flag
 	SetModified();
 
 	// Update this object
+	UpdateData();
 	UpdateDisplay();
 }