Ref T246, distributor filter

Needed because we want to create a 1st model set by distributors per simulator

src/blackgui/filters/distributorfilterbar.cpp

@@ -0,0 +1,66 @@
+/* Copyright (C) 2018
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#include "blackgui/filters/distributorfilterbar.h"
+#include "blackgui/filters/filterbarbuttons.h"
+#include "blackgui/models/distributorfilter.h"
+#include "blackgui/uppercasevalidator.h"
+#include "blackmisc/simulation/distributorlist.h"
+#include "ui_distributorfilterbar.h"
+
+#include <QLineEdit>
+
+using namespace BlackGui::Models;
+using namespace BlackGui::Components;
+using namespace BlackMisc;
+using namespace BlackMisc::Simulation;
+
+namespace BlackGui
+{
+    namespace Filters
+    {
+        CDistributorFilterBar::CDistributorFilterBar(QWidget *parent) :
+            CFilterWidget(parent),
+            ui(new Ui::CDistributorFilterBar)
+        {
+            ui->setupUi(this);
+            ui->comp_Simulator->setMode(CSimulatorSelector::CheckBoxes);
+            ui->comp_Simulator->setNoSelectionMeansAll(true);
+            this->setButtonsAndCount(ui->filter_Buttons);
+
+            connect(ui->comp_Simulator, &CSimulatorSelector::changed, this, &CFilterWidget::triggerFilter);
+
+            // reset form
+            this->clearForm();
+        }
+
+        CDistributorFilterBar::~CDistributorFilterBar()
+        { }
+
+        std::unique_ptr<BlackGui::Models::IModelFilter<CDistributorList> > CDistributorFilterBar::createModelFilter() const
+        {
+            return std::make_unique<CDistributorFilter>(ui->comp_Simulator->getValue());
+        }
+
+        void CDistributorFilterBar::setSimulator(const CSimulatorInfo &simulator)
+        {
+            ui->comp_Simulator->setValue(simulator);
+        }
+
+        void CDistributorFilterBar::onRowCountChanged(int count, bool withFilter)
+        {
+            ui->filter_Buttons->onRowCountChanged(count, withFilter);
+        }
+
+        void CDistributorFilterBar::clearForm()
+        {
+            ui->comp_Simulator->clear();
+        }
+    } // ns
+} // ns

src/blackgui/filters/distributorfilterbar.h

@@ -0,0 +1,65 @@
+/* Copyright (C) 2018
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
+#ifndef BLACKGUI_FILTERS_DISTRIBUTORFILTERBAR_H
+#define BLACKGUI_FILTERS_DISTRIBUTORFILTERBAR_H
+
+#include "blackgui/blackguiexport.h"
+#include "blackgui/filters/filterwidget.h"
+#include "blackgui/models/modelfilter.h"
+
+#include <QObject>
+#include <QScopedPointer>
+#include <memory>
+
+class QWidget;
+
+namespace BlackMisc { namespace Simulation { class CDistributorList; class CSimulatorInfo; }}
+namespace Ui { class CDistributorFilterBar; }
+namespace BlackGui
+{
+    namespace Filters
+    {
+        /*!
+         * Distributor filter bar
+         */
+        class BLACKGUI_EXPORT CDistributorFilterBar :
+            public CFilterWidget,
+            public Models::IModelFilterProvider<BlackMisc::Simulation::CDistributorList>
+        {
+        public:
+            //! Constructor
+            explicit CDistributorFilterBar(QWidget *parent = nullptr);
+
+            //! Destructor
+            virtual ~CDistributorFilterBar();
+
+            //! \copydoc Models::IModelFilterProvider::createModelFilter
+            virtual std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Simulation::CDistributorList>> createModelFilter() const override;
+
+            //! Set simulator
+            void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);
+
+        public slots:
+            //! \copydoc CFilterWidget::onRowCountChanged
+            virtual void onRowCountChanged(int count, bool withFilter) override;
+
+        protected:
+            //! Clear form
+            virtual void clearForm() override;
+
+        private:
+            QScopedPointer<Ui::CDistributorFilterBar> ui;
+        };
+    } // ns
+} // ns
+
+#endif // guard

src/blackgui/filters/distributorfilterbar.ui

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CDistributorFilterBar</class>
+ <widget class="QFrame" name="CDistributorFilterBar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>221</width>
+    <height>10</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Distributor filter bar</string>
+  </property>
+  <layout class="QGridLayout" name="gl_DistributorFilterBar">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing">
+    <number>4</number>
+   </property>
+   <item row="1" column="0" alignment="Qt::AlignRight">
+    <widget class="BlackGui::Filters::CFilterBarButtons" name="filter_Buttons">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="BlackGui::Components::CSimulatorSelector" name="comp_Simulator">
+     <property name="minimumSize">
+      <size>
+       <width>200</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BlackGui::Components::CSimulatorSelector</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/simulatorselector.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Filters::CFilterBarButtons</class>
+   <extends>QFrame</extends>
+   <header>blackgui/filters/filterbarbuttons.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

src/blackgui/models/distributorfilter.cpp

@@ -0,0 +1,38 @@
+/* Copyright (C) 2018
+ * swift project Community / Contributors
+ *
+ * This file is part of swift Project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#include "blackgui/models/distributorfilter.h"
+#include "blackmisc/simulation/distributor.h"
+
+using namespace BlackMisc;
+using namespace BlackMisc::Simulation;
+
+namespace BlackGui
+{
+    namespace Models
+    {
+        CDistributorFilter::CDistributorFilter(const Simulation::CSimulatorInfo &simulator) :
+            m_simulator(simulator)
+        {
+            this->m_valid = true;
+        }
+
+        CDistributorList CDistributorFilter::filter(const CDistributorList &inDistributors) const
+        {
+            if (!this->isValid()) { return inDistributors; }
+            CDistributorList outContainer;
+            for (const CDistributor &distributor : inDistributors)
+            {
+                if (!distributor.getSimulator().matchesAny(m_simulator)) { continue; }
+                outContainer.push_back(distributor);
+            }
+            return outContainer;
+        }
+    } // namespace
+} // namespace

src/blackgui/models/distributorfilter.h

@@ -0,0 +1,42 @@
+/* Copyright (C) 2018
+ * swift project Community / Contributors
+ *
+ * This file is part of swift Project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
+#ifndef BLACKGUI_DISTRIBUTORFILTER_H
+#define BLACKGUI_DISTRIBUTORFILTER_H
+
+#include "blackgui/blackguiexport.h"
+#include "blackgui/models/modelfilter.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+#include "blackmisc/simulation/distributorlist.h"
+
+#include <QString>
+
+namespace BlackGui
+{
+    namespace Models
+    {
+        //! Country filter
+        class BLACKGUI_EXPORT CDistributorFilter : public IModelFilter<BlackMisc::Simulation::CDistributorList>
+        {
+        public:
+            //! Constructor
+            CDistributorFilter(const BlackMisc::Simulation::CSimulatorInfo &simulator);
+
+            //! \copydoc IModelFilter::filter
+            virtual BlackMisc::Simulation::CDistributorList filter(const BlackMisc::Simulation::CDistributorList &inDistributors) const override;
+
+        private:
+            BlackMisc::Simulation::CSimulatorInfo m_simulator;
+        };
+    } // namespace
+} // namespace
+
+#endif // guard