Changeset 650

Timestamp:

11/21/06 13:57:39 (2 years ago)

Author:

leo

Message:

Fixed UI and overlays after switching models.

Location:

trunk/common

Files:

• project.cpp (modified) (5 diffs)
• project.h (modified) (1 diff)

trunk/common/project.cpp

@@ -324 +324 @@
     m_PlayingAnimation = false;
 
-    m_ActiveModel = new lcModel("Main");
-    m_ModelList.Add(m_ActiveModel);
-    SystemUpdateModelMenu(m_ModelList, m_ActiveModel);
+    lcModel* Model = new lcModel("Main");
+    m_ModelList.Add(Model);
+    SetActiveModel(Model);
 
     for (i = 0; i < m_ViewList.GetSize (); i++)
@@ -3070 +3070 @@
 // Project functions
 
+void Project::SetActiveModel(lcModel* Model)
+{
+    m_ActiveModel = Model;
+
+    SystemUpdateModelMenu(m_ModelList, m_ActiveModel);
+    UpdateSelection();
+    UpdateAllViews();
+}
+
 void Project::AddPiece(Piece* NewPiece)
 {
@@ -4434 +4443 @@
             lcModel* Model = new lcModel(Name);
             m_ModelList.Add(Model);
-            m_ActiveModel = Model;
+            SetActiveModel(Model);
 
             SetModifiedFlag(true);
@@ -4459 +4468 @@
                 m_ModelList.RemovePointer(m_ActiveModel);
                 delete m_ActiveModel;
-                m_ActiveModel = m_ModelList[0];
+                SetActiveModel(m_ModelList[0]);
 
                 SetModifiedFlag(true);
@@ -4490 +4499 @@
             if (Index < m_ModelList.GetSize())
             {
-                m_ActiveModel = m_ModelList[Index];
-                SystemUpdateModelMenu(m_ModelList, m_ActiveModel);
-                UpdateAllViews();
+                SetActiveModel(m_ModelList[Index]);
             }
         } break;

trunk/common/project.h

@@ -171 +171 @@
     CONNECTION_TYPE m_pConnections[LC_CONNECTIONS];
 
+    void SetActiveModel(lcModel* Model);
     void AddPiece(Piece* pPiece);
     void RemovePiece(Piece* pPiece);