Comments + UI tweaks.

Author: Mysticial

SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp

@@ -48,15 +48,9 @@ AudioSelectorWidget::AudioSelectorWidget(QWidget& parent, AudioSession& session)
         QHBoxLayout* input_layout = new QHBoxLayout();
         row0->addLayout(input_layout, 10);
 
-//        if (PreloadSettings::instance().DEVELOPER_MODE){
-//            m_audio_input_box = new NoWheelComboBox(this);
-//            input_layout->addWidget(m_audio_input_box, 7);
-//            m_load_file_button = new QPushButton("Load File", this);
-//            input_layout->addWidget(m_load_file_button, 3);
-//        }else{
-            m_audio_input_box = new NoWheelComboBox(this);
-            input_layout->addWidget(m_audio_input_box, 10);
-//        }
+        m_audio_input_box = new NoWheelComboBox(this);
+        m_audio_input_box->setMaxVisibleItems(20);
+        input_layout->addWidget(m_audio_input_box, 10);
         row0->addSpacing(5);
 
         m_audio_format_box = new NoWheelComboBox(this);
@@ -77,13 +71,13 @@ AudioSelectorWidget::AudioSelectorWidget(QWidget& parent, AudioSession& session)
 
         QHBoxLayout* output_layout = new QHBoxLayout();
         row1->addLayout(output_layout, 10);
+        m_audio_output_box = new NoWheelComboBox(this);
+        m_audio_output_box->setMaxVisibleItems(20);
         if (GlobalSettings::instance().AUDIO_PIPELINE->SHOW_RECORD_FREQUENCIES){
-            m_audio_output_box = new NoWheelComboBox(this);
             output_layout->addWidget(m_audio_output_box, 7);
             m_record_button = new QPushButton("Record Frequencies", this);
             output_layout->addWidget(m_record_button, 3);
         }else{
-            m_audio_output_box = new NoWheelComboBox(this);
             output_layout->addWidget(m_audio_output_box, 10);
         }
         row1->addSpacing(5);

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp

@@ -44,10 +44,12 @@ CameraSelectorWidget::CameraSelectorWidget(
     camera_row->addSpacing(5);
 
     m_camera_box = new NoWheelComboBox(this);
+    m_camera_box->setMaxVisibleItems(20);
     camera_row->addWidget(m_camera_box, 5);
     camera_row->addSpacing(5);
 
     m_resolution_box = new NoWheelComboBox(this);
+    m_resolution_box->setMaxVisibleItems(20);
     camera_row->addWidget(m_resolution_box, 3);
     camera_row->addSpacing(5);
 

SerialPrograms/Source/Controllers/ControllerTypes.h

@@ -10,14 +10,15 @@
 namespace PokemonAutomation{
 
 
+//  This is used only for the UI to indicate if a program may be faster on
+//  tick-precise controllers. There is no functional effect.
 enum class FasterIfTickPrecise{
     NOT_FASTER,
     FASTER,
     MUCH_FASTER,
 };
 
 
-
 enum class ControllerInterface{
     None,
     SerialPABotBase,
@@ -28,7 +29,12 @@ enum class ControllerInterface{
 
 enum class ControllerType{
     None,
+
+    //  There's a difference between the generic 3rd party wired controllers and
+    //  a pro controller connected over USB. If/when we support the latter, we
+    //  will need to split this controller type.
     NintendoSwitch_WiredProController,
+
     NintendoSwitch_WirelessProController,
     NintendoSwitch_LeftJoycon,
     NintendoSwitch_RightJoycon,
@@ -38,9 +44,16 @@ enum class ControllerType{
 enum class ControllerFeature{
     TickPrecise,
     TimingFlexibleMilliseconds,
+
+    //  If we add support gyro or rumble, we will need to split this feature
+    //  since the Pokken controller doesn't support those.
     NintendoSwitch_ProController,
+
     NintendoSwitch_LeftJoycon,
     NintendoSwitch_RightJoycon,
+
+    //  This is leftover from the days of RPCs. But we keep it here as a hack to
+    //  lock ESP32 out of the day skippers since it's too unstable to run those.
     NintendoSwitch_DateSkip,
 };
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -4,6 +4,7 @@
  *
  */
 
+#include "Common/Cpp/Exceptions.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
 #include "SerialPABotBase.h"
 
@@ -57,12 +58,16 @@ ControllerType id_to_controller_type(uint32_t id){
         return ControllerType::NintendoSwitch_LeftJoycon;
     case PABB_CID_NINTENDO_SWITCH_RIGHT_JOYCON:
         return ControllerType::NintendoSwitch_RightJoycon;
-    default:
-        return ControllerType::None;
     }
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid Controller ID: " + std::to_string(id)
+    );
 }
 uint32_t controller_type_to_id(ControllerType controller_type){
     switch (controller_type){
+    case ControllerType::None:
+        return PABB_CID_NONE;
     case ControllerType::NintendoSwitch_WiredProController:
         return PABB_CID_NINTENDO_SWITCH_WIRED_PRO_CONTROLLER;
     case ControllerType::NintendoSwitch_WirelessProController:
@@ -71,9 +76,11 @@ uint32_t controller_type_to_id(ControllerType controller_type){
         return PABB_CID_NINTENDO_SWITCH_LEFT_JOYCON;
     case ControllerType::NintendoSwitch_RightJoycon:
         return PABB_CID_NINTENDO_SWITCH_RIGHT_JOYCON;
-    default:
-        return PABB_CID_NONE;
     }
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid Controller Enum: " + std::to_string((int)controller_type)
+    );
 }
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_SelectorWidget.h

@@ -33,6 +33,7 @@ class SerialPABotBase_SelectorWidget : public NoWheelComboBox{
         , m_parent(parent)
     {
 //        cout << "SerialPABotBase(): " << current << endl;
+        this->setMaxVisibleItems(32);
 
         if (current == nullptr || (
                 current->interface_type != ControllerInterface::None &&
@@ -70,11 +71,16 @@ class SerialPABotBase_SelectorWidget : public NoWheelComboBox{
     }
 
     void refresh_devices(){
+//        cout << "Current = " << width() << " x " << height() << endl;
+//        cout << "sizeHint = " << sizeHint().width() << " x " << sizeHint().height() << endl;
+//        cout << "minimumContentsLength = " << this->minimumContentsLength() << endl;
+
         m_ports.clear();
         this->clear();
 
 //        cout << "SerialPABotBase_SelectorWidget::refresh_devices()" << endl;
 
+
         m_ports.emplace_back(new NullControllerDescriptor());
         for (QSerialPortInfo& port : QSerialPortInfo::availablePorts()){
 #ifdef _WIN32
@@ -86,16 +92,23 @@ class SerialPABotBase_SelectorWidget : public NoWheelComboBox{
             m_ports.emplace_back(new SerialPABotBase_Descriptor(port));
         }
 
+        size_t width = 6;
         int index = 0;
         int c = 0;
         for (const auto& port : m_ports){
-            this->addItem(QString::fromStdString(port->display_name()));
+            QString display_name = QString::fromStdString(port->display_name());
+            width = std::max<size_t>(width, display_name.size());
+            this->addItem(display_name);
             if (*m_parent.session().descriptor() == *m_ports[c]){
                 index = c;
             }
             c++;
         }
 
+        if (this->count() > this->maxVisibleItems()){
+            width++;
+        }
+        setMinimumContentsLength((int)width);
         setCurrentIndex(index);
     }