Qt: Implement advanced mapping I/O windows #5479

spycrab · 2017-05-25T21:28:52Z

Screenshots:

Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp

+#include "InputCommon/ControllerInterface/Device.h"
+
+static QString TrunicateDisplayString(const QString& string)
+{


Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp

-    : QPushButton(QString::fromStdString(ref->expression)), m_parent(widget), m_reference(ref)
+    : QPushButton(TrunicateDisplayString(QString::fromStdString(ref->expression))),
+      m_parent(widget), m_reference(ref),
+      m_io_window(


Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp

+    Clear();
+    break;
+  case Qt::MouseButton::RightButton:
+    if (m_parent->GetParent()->GetDevice() == nullptr)


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+
+void IOWindow::Update()
+{
+  if (m_controller == nullptr)


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+#include <QSpinBox>
+#include <QVBoxLayout>
+
+static constexpr int SLIDER_TICK_COUNT = 100;


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+  // Options (Buttons, Outputs) and action buttons
+  for (QPushButton* button : {m_select_button, m_detect_button, m_or_button, m_and_button,
+                              m_add_button, m_not_button, m_test_button})
+    button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+  const auto device = g_controller_interface.FindDevice(m_devq);
+  if (m_reference->IsInput())
+  {
+    for (auto* input : device->Inputs())


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+  }
+  else
+  {
+    for (auto* output : device->Outputs())


Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp

 #include "DolphinQt2/Config/Mapping/MappingWidget.h"
 #include "DolphinQt2/Config/Mapping/MappingWindow.h"
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "InputCommon/ControllerInterface/Device.h"
+
+static QString TrunicateDisplayString(const QString& string)


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+#include <QPushButton>
+#include <QSlider>
+#include <QSpinBox>
+#include <QVBoxLayout>


Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp

+#include "InputCommon/ControllerInterface/Device.h"
+
+#include <QRegExp>
+#include <QString>


spycrab · 2017-05-30T18:30:51Z

@ligfx Can you take a look again?

ligfx

Man, controllers are complicated. Still wrapping my head around everything going on here, but I put some initial comments.

Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+
+void IOWindow::ConnectWidgets()
+{
+  connect(m_select_button, &QPushButton::clicked, this,


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+
+  connect(m_button_box, &QDialogButtonBox::clicked, this, &IOWindow::OnDialogButtonPressed);
+  connect(m_devices_combo,
+          static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this,


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+          &IOWindow::OnDeviceChanged);
+  connect(m_range_spinbox, static_cast<void (QSpinBox::*)(int value)>(&QSpinBox::valueChanged),
+          this, &IOWindow::OnRangeChanged);
+  connect(m_range_slider, static_cast<void (QSlider::*)(int value)>(&QSlider::valueChanged), this,


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+    m_expression_text->clear();
+    return;
+  }
+  else


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+    return;
+
+  m_block = true;
+  std::thread([this] {


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+          &IOWindow::OnRangeChanged);
+}
+
+void IOWindow::AppendSelectedOption(const QString& prefix)


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+    return;
+
+  m_expression_text->insertPlainText(
+      MappingCommon::GetExpressionForControl(m_option_list->currentItem()->text(), &m_devq,


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+  m_option_list->clear();
+
+  const auto device = g_controller_interface.FindDevice(m_devq);
+  if (m_reference->IsInput())


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+
+  const auto default_device = m_controller->default_device.ToString();
+
+  m_devices_combo->addItem(QString::fromStdString(default_device));


Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp

 #include "DolphinQt2/Config/Mapping/MappingWidget.h"
 #include "DolphinQt2/Config/Mapping/MappingWindow.h"
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "InputCommon/ControllerInterface/Device.h"
+
+static QString TruncateDisplayString(const QString& string)


Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp

    m_buttons.push_back(button);
+    m_iowindows.push_back(iowindow);


Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp

+    connect(button, &MappingButton::AdvancedPressed, [this, &iowindow, control_ref] {
+      iowindow = new IOWindow(this, control_ref, control_ref->IsInput() ? IOWindow::Type::Input :
+                                                                          IOWindow::Type::Output);
+      iowindow->Open();


Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp

@@ -87,6 +100,12 @@ void MappingWidget::OnClearFields()

 void MappingWidget::Update()
 {
+  for (auto* io : m_iowindows)


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+  setLayout(m_main_layout);
+}
+
+void IOWindow::Update()


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+constexpr int SLIDER_TICK_COUNT = 100;
+
+IOWindow::IOWindow(MappingWidget* parent, ControlReference* ref, IOWindow::Type type)
+    : QDialog(static_cast<QWidget*>(parent)), m_reference(ref), m_parent(parent), m_type(type)


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+
+  Update();
+  exec();
+  m_parent->Update();


Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp

+  QString expr;
+
+  // non-default device
+  // operator== is overloaded, but operator!= isn't


spycrab · 2017-06-05T21:37:18Z

Would you mind taking a look again, @ligfx?

ligfx

Couple of small code things, though I've gone through this code so many times now (thanks for hiding old comments, GitHub) I'm going to assume it's good.

I did find an issue in testing: the text box in the advanced mapping window needs to be disabled when detecting controls, otherwise keyboard presses will show up.

Source/Core/DolphinQt2/Config/Mapping/IOWindow.h

+  ControllerEmu::EmulatedController* m_controller;
+
+  ciface::Core::DeviceQualifier m_devq;
+  bool m_block = false;


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+
+constexpr int SLIDER_TICK_COUNT = 100;
+
+IOWindow::IOWindow(MappingWidget* parent, ControllerEmu::EmulatedController* controller,


Source/Core/DolphinQt2/Config/Mapping/IOWindow.h

+    Output
+  };
+
+  explicit IOWindow(MappingWidget* parent, ControllerEmu::EmulatedController* m_controller,


Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

+        m_option_list->setCurrentItem(list[0]);
+    }
+    m_block = false;
+  }).detach();


MayImilae · 2017-06-07T01:16:57Z

Well, I tried to test this to make sure everything is working, but Qt (at least in the build I just downloaded, the builder is having trouble) doesn't have any indicator lights of when buttons are pressed! Without that ability, testing would require running a game and seeing if it responds, and that's MUCH harder!

I think it might be a good idea to hold off on merging this until after button press notification is added, then it will be a LOT easier to test this PR and make sure everything is working correctly.

spycrab · 2017-06-07T12:07:58Z

@MayImilae I disagree: The only thing worth testing is whether it's creating correct expressions and I think most cases can be handled with one single expression that uses everything once.

MayImilae · 2017-06-07T12:13:50Z

Well, as long as you know it works!

MayImilae

No complaints on the visual design now!

ligfx

👍

spycrab · 2017-06-08T18:35:55Z

@lioncash Any other suggestions?

Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp

+    return;
+  case Qt::MouseButton::MiddleButton:
+    Clear();
+    break;


spycrab force-pushed the qt_mapping_io_win branch 4 times, most recently from 7e408cc to ad845f4 Compare May 25, 2017 22:01

spycrab changed the title ~~Qt mapping I/O windows~~ Qt: Implement advanced mapping I/O windows May 25, 2017

spycrab force-pushed the qt_mapping_io_win branch from ad845f4 to 68dca77 Compare May 26, 2017 11:51

ligfx suggested changes May 28, 2017

View reviewed changes

lioncash reviewed May 28, 2017

View reviewed changes

spycrab force-pushed the qt_mapping_io_win branch 2 times, most recently from 45198f4 to 09cc362 Compare May 29, 2017 17:02

ligfx reviewed May 30, 2017

View reviewed changes

spycrab force-pushed the qt_mapping_io_win branch 2 times, most recently from a90418d to b09a066 Compare June 3, 2017 11:32

ligfx reviewed Jun 3, 2017

View reviewed changes

spycrab force-pushed the qt_mapping_io_win branch 2 times, most recently from 22678cf to 58339df Compare June 4, 2017 00:30

ligfx suggested changes Jun 6, 2017

View reviewed changes

shuffle2 reviewed Jun 6, 2017

View reviewed changes

spycrab force-pushed the qt_mapping_io_win branch 2 times, most recently from f94b8ba to 7173e7f Compare June 7, 2017 13:08

MayImilae approved these changes Jun 7, 2017

View reviewed changes

ligfx approved these changes Jun 8, 2017

View reviewed changes

ligfx mentioned this pull request Jun 8, 2017

ControlReference/ExpressionParser: separate parsing from binding #5577

Merged

leoetlino reviewed Jun 13, 2017

View reviewed changes

Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp Outdated

return;

case Qt::MouseButton::MiddleButton:

Clear();

break;

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Qt: Implement advanced mapping I/O windows

50c13c1

spycrab force-pushed the qt_mapping_io_win branch from 7173e7f to 50c13c1 Compare June 13, 2017 15:17

leoetlino merged commit 38c6015 into dolphin-emu:master Jun 13, 2017

spycrab deleted the qt_mapping_io_win branch June 14, 2017 11:53

leoetlino modified the milestone: Qt Sep 13, 2017


		const auto default_device = m_controller->default_device.ToString();

		m_devices_combo->addItem(QString::fromStdString(default_device));

		m_buttons.push_back(button);
		m_iowindows.push_back(iowindow);


		constexpr int SLIDER_TICK_COUNT = 100;

		IOWindow::IOWindow(MappingWidget* parent, ControllerEmu::EmulatedController* controller,

Qt: Implement advanced mapping I/O windows #5479

Qt: Implement advanced mapping I/O windows #5479

Conversation

spycrab commented May 25, 2017 • edited Loading

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

spycrab commented May 30, 2017

ligfx left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

spycrab commented Jun 5, 2017

ligfx left a comment • edited Loading

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

MayImilae commented Jun 7, 2017

spycrab commented Jun 7, 2017

MayImilae commented Jun 7, 2017

MayImilae left a comment

Choose a reason for hiding this comment

ligfx left a comment

Choose a reason for hiding this comment

spycrab commented Jun 8, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

spycrab commented May 25, 2017 •

edited

Loading

ligfx left a comment •

edited

Loading