Ticket #1392: template_name_for_selected_entities.diff

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp

@@ -25 +25 @@
 #include "ScenarioEditor/Tools/Common/ObjectSettings.h"
 #include "ScenarioEditor/Tools/Common/MiscState.h"
 #include "VariationControl.h"
+#include "SelectedTemplates.h"
 
 #include "GameInterface/Messages.h"
 
@@ -462 +463 @@
     variationSizer->Add(variationSelect, wxSizerFlags().Proportion(1).Expand());
     playerVariationSizer->Add(variationSizer, wxSizerFlags().Proportion(1));
 
+    /* selected templates panel */
+    wxWindow* selectedTemplates = new SelectedTemplates(this, objectSettings);
+    selectedTemplates->SetMinSize(wxSize(250, -1));
+    wxSizer* selTemplatesSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Selected entity templates"));
+    selTemplatesSizer->Add(selectedTemplates, wxSizerFlags().Proportion(1).Expand());
+
     mainSizer->AddSpacer(3);
     mainSizer->Add(playerVariationSizer, wxSizerFlags().Expand());
+    mainSizer->Add(selTemplatesSizer, wxSizerFlags().Expand());
 
     // ----------------------------------------------------------------------------------
 

new file source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/SelectedTemplates.cpp

@@ +1 @@
+/* Copyright (C) 2011 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 0 A.D. is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sstream>
+
+#include "precompiled.h"
+
+#include "ScenarioEditor/Tools/Common/ObjectSettings.h"
+
+#include "SelectedTemplates.h"
+#include "GameInterface/Messages.h"
+
+SelectedTemplates::SelectedTemplates(wxWindow* parent, Observable<ObjectSettings>& objectSettings)
+: wxScrolledWindow(parent, -1),
+m_ObjectSettings(objectSettings)
+{
+    m_Conn = m_ObjectSettings.RegisterObserver(1, &SelectedTemplates::OnSelectionChange, this);
+
+    SetScrollRate(0, 5);
+
+    m_Sizer = new wxBoxSizer(wxVERTICAL);
+    SetSizer(m_Sizer);
+}
+
+void SelectedTemplates::OnSelectionChange(const ObjectSettings& settings)
+{
+    Freeze();
+
+    const std::vector<AtlasMessage::ObjectID>& selections = settings.GetSelectedObjects();
+
+    // Get the list of objects from the game
+    AtlasMessage::qGetSelectedObjectsTemplateNames qry(selections);
+    qry.Post();
+
+    std::vector<std::string> names;
+    names = *qry.names;
+
+    //template names with frequency
+    std::vector<templateNameFreq> f_names;
+    for (std::vector<std::string>::const_iterator it = names.begin(); it != names.end(); ++it)
+    {
+        std::string name = *it;
+        bool found = false;
+        for (std::vector<templateNameFreq>::iterator j = f_names.begin(); j != f_names.end(); ++j){
+            if ((*j).name.compare(name) == 0){
+                (*j).count++;
+                found = true;
+                break;
+            }
+        }
+        if(!found){
+            templateNameFreq template_name;
+            template_name.count = 1;
+            template_name.name = name;
+            f_names.push_back(template_name);
+        }
+    }
+
+    m_Sizer->Clear(true);
+
+    for (std::vector<templateNameFreq>::const_iterator it = f_names.begin(); it != f_names.end(); ++it){
+
+        std::stringstream _count;
+        _count << (*it).count;
+        std::string templates_count = _count.str();
+
+        std::string template_name = (*it).name;
+
+        template_name.append(" x ");
+        template_name.append(templates_count);
+        wxStaticText *label = new wxStaticText(this, wxID_ANY, _(template_name.c_str()));
+        m_Sizer->Add(label, wxSizerFlags().Align(wxALIGN_LEFT));
+    }
+
+    Thaw();
+
+    // Make the scrollbars appear when appropriate
+    m_Sizer->FitInside(this);
+}

new file source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/SelectedTemplates.h

@@ +1 @@
+/* Copyright (C) 2009 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 0 A.D. is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INCLUDED_SELECTEDTEMPLATES
+#define INCLUDED_SELECTEDTEMPLATES
+
+#include "General/Observable.h"
+
+struct templateNameFreq{
+    std::string name;
+    int count;
+};
+
+class SelectedTemplates : public wxScrolledWindow
+{
+public:
+    SelectedTemplates(wxWindow* parent, Observable<ObjectSettings>& objectSettings);
+
+private:
+    void OnSelectionChange(const ObjectSettings& settings);
+    void RefreshObjectSettings();
+
+    ObservableScopedConnection m_Conn;
+
+    Observable<ObjectSettings>& m_ObjectSettings;
+    wxSizer* m_Sizer;
+};
+
+#endif // INCLUDED_SELECTEDTEMPLATES

source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp

@@ -86 +86 @@
     return variation;
 }
 
+const std::vector<AtlasMessage::ObjectID>& ObjectSettings::GetSelectedObjects() const
+{
+    return m_SelectedObjects;
+}
+
 AtlasMessage::sObjectSettings ObjectSettings::GetSettings() const
 {
     AtlasMessage::sObjectSettings settings;
@@ -110 +115 @@
     // TODO: what would be the sensible action if nothing's selected?
     // and if multiple objects are selected?
 
-    if (selection.empty())
-        return;
+/* Even if nothing is selected, the observers should still be notified */
+//  if (selection.empty())
+//      return;
 
     AtlasMessage::qGetObjectSettings qry (m_View, selection[0]);
     qry.Post();

source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.h

@@ -52 +52 @@
     const std::set<wxString>& GetActorSelections() const;
     void SetActorSelections(const std::set<wxString>& selections);
 
+    const std::vector<AtlasMessage::ObjectID>& GetSelectedObjects() const;
+
     // Constructs new sObjectSettings object from settings
     AtlasMessage::sObjectSettings GetSettings() const;
 

source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp

@@ -95 +95 @@
 }
 
 
+QUERYHANDLER(GetSelectedObjectsTemplateNames)
+{
+    std::vector<entity_id_t> ids = *msg->ids;
+    std::vector<std::string> names;
+
+    CmpPtr<ICmpTemplateManager> cmpTemplateManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
+    ENSURE(cmpTemplateManager);
+
+    for (size_t i = 0; i < ids.size(); i++)
+    {
+        entity_id_t id = (entity_id_t)ids[i];
+        std::string templateName = cmpTemplateManager->GetCurrentTemplateName(id);
+        names.push_back(templateName);
+    }
+
+    msg->names = names;
+}
+
 static std::vector<entity_id_t> g_Selection;
 typedef std::map<player_id_t, CColor> PlayerColorMap;
 

source/tools/atlas/GameInterface/Messages.h

@@ -320 +320 @@
       ((std::vector<sObjectsListItem>, objects)) // sorted by .name
       );
 
+QUERY(GetSelectedObjectsTemplateNames,
+        ((std::vector<ObjectID>, ids))
+        ,
+        ((std::vector<std::string>, names))
+        );
+
 #ifndef MESSAGES_SKIP_STRUCTS
 struct sObjectSettings
 {