comparison widgets/PluginParameterDialog.cpp @ 147:e2ad3543c8a1

* stepsize/blocksize from plugin dialog actually working, though with some
  puzzlement

 
 #include "PluginParameterBox.h"
 #include "WindowTypeSelector.h"
 
 #include "vamp-sdk/Plugin.h"
+#include "vamp-sdk/PluginHostAdapter.h"
 
 #include <QGridLayout>
 #include <QLabel>
 #include <QGroupBox>
 #include <QHBoxLayout>

 
     QLabel *outputLabel = 0;
 
     if (output != "") {
 
-        Vamp::Plugin *fePlugin = dynamic_cast<Vamp::Plugin *>(plugin);
+        Vamp::PluginHostAdapter *fePlugin = dynamic_cast<Vamp::PluginHostAdapter *>(m_plugin);
 
         if (fePlugin) {
 
             std::vector<Vamp::Plugin::OutputDescriptor> od =
                 fePlugin->getOutputDescriptors();

                         outputLabel->setWordWrap(true);
                         break;
                     }
                 }
             }
-        } else {
-            std::cerr << "Plugin " << plugin << " is not a feature extraction plugin" << std::endl;//!!!
         }
     }
 
     QLabel *versionLabel = new QLabel(QString("%1")
                                       .arg(plugin->getPluginVersion()));

 
     QLabel *typeLabel = new QLabel(plugin->getType().c_str());
     typeLabel->setWordWrap(true);
     typeLabel->setFont(font);
 
-    subgrid->addWidget(new QLabel(tr("Name:")), 0, 0);
+    QLabel *label = new QLabel(tr("Name:"));
+    label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+    subgrid->addWidget(label, 0, 0);
     subgrid->addWidget(nameLabel, 0, 1);
 
-    subgrid->addWidget(new QLabel(tr("Type:")), 1, 0);
+    label = new QLabel(tr("Type:"));
+    label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+    subgrid->addWidget(label, 1, 0);
     subgrid->addWidget(typeLabel, 1, 1);
 
     int outputOffset = 0;
     if (outputLabel) {
-        subgrid->addWidget(new QLabel(tr("Output:")), 2, 0);
+        label = new QLabel(tr("Output:"));
+        label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+        subgrid->addWidget(label, 2, 0);
         subgrid->addWidget(outputLabel, 2, 1);
         outputOffset = 1;
     }
 
-    subgrid->addWidget(new QLabel(tr("Maker:")), 2 + outputOffset, 0);
+    label = new QLabel(tr("Maker:"));
+    label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+    subgrid->addWidget(label, 2 + outputOffset, 0);
     subgrid->addWidget(makerLabel, 2 + outputOffset, 1);
 
-    subgrid->addWidget(new QLabel(tr("Copyright:  ")), 3 + outputOffset, 0);
+    label = new QLabel(tr("Copyright:  "));
+    label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+    subgrid->addWidget(label, 3 + outputOffset, 0);
     subgrid->addWidget(copyrightLabel, 3 + outputOffset, 1);
 
-    subgrid->addWidget(new QLabel(tr("Version:")), 4 + outputOffset, 0);
+    label = new QLabel(tr("Version:"));
+    label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+    subgrid->addWidget(label, 4 + outputOffset, 0);
     subgrid->addWidget(versionLabel, 4 + outputOffset, 1);
 
     subgrid->setColumnStretch(1, 2);
 
     QGroupBox *paramBox = new QGroupBox;

         }
     }
 
     if (showWindowSize) {
 
-        Vamp::Plugin *fePlugin = dynamic_cast<Vamp::Plugin *>(plugin);
+        Vamp::PluginHostAdapter *fePlugin = dynamic_cast<Vamp::PluginHostAdapter *>(m_plugin);
         int size = 1024;
         int increment = 1024;
         if (fePlugin) {
             size = fePlugin->getPreferredBlockSize();
             std::cerr << "Feature extraction plugin \"" << fePlugin->getDescription() << "\" reports preferred block size as " << size << std::endl;

                 } else {
                     increment = size/2;
                 }
             }
         } else {
-            std::cerr << "Plugin " << plugin << " is not a feature extraction plugin" << std::endl;//!!!
+            std::cerr << "Plugin " << plugin << " is not a feature extraction plugin (it's a " << typeid(*plugin).name() << ")" << std::endl;//!!!
         }
 
         QGroupBox *windowBox = new QGroupBox;
         windowBox->setTitle(tr("Processing"));
         advancedLayout->addWidget(windowBox);

         //!!! deal with block and step sizes (coming from the plugin's
         // preferences) that don't fit into the default list
 
         QComboBox *blockSizeCombo = new QComboBox;
         blockSizeCombo->setEditable(true);
+        bool found = false;
         for (int i = 0; i < 14; ++i) {
             int val = pow(2, i + 3);
             blockSizeCombo->addItem(QString("%1").arg(val));
-            if (val == size) blockSizeCombo->setCurrentIndex(i);
+            if (val == size) {
+                blockSizeCombo->setCurrentIndex(i);
+                found = true;
+            }
+        }
+        if (!found) {
+            blockSizeCombo->addItem(QString("%1").arg(size));
+            blockSizeCombo->setCurrentIndex(blockSizeCombo->count() - 1);
         }
         blockSizeCombo->setValidator(new QIntValidator(1, pow(2, 18), this));
         connect(blockSizeCombo, SIGNAL(textChanged(QString)),
                 this, SLOT(blockSizeComboChanged(QString)));
         windowLayout->addWidget(blockSizeCombo, 0, 1);

 
             windowLayout->addWidget(new QLabel(tr("Window increment:")), 1, 0);
         
             QComboBox *incrementCombo = new QComboBox;
             incrementCombo->setEditable(true);
+            found = false;
             for (int i = 0; i < 14; ++i) {
                 int val = pow(2, i + 3);
                 incrementCombo->addItem(QString("%1").arg(val));
-                if (val == increment) incrementCombo->setCurrentIndex(i);
+                if (val == increment) {
+                    incrementCombo->setCurrentIndex(i);
+                    found = true;
+                }
+            }
+            if (!found) {
+                incrementCombo->addItem(QString("%1").arg(increment));
+                incrementCombo->setCurrentIndex(incrementCombo->count() - 1);
             }
             incrementCombo->setValidator(new QIntValidator(1, pow(2, 18), this));
             connect(incrementCombo, SIGNAL(textChanged(QString)),
                     this, SLOT(incrementComboChanged(QString)));
             windowLayout->addWidget(incrementCombo, 1, 1);

 void
 PluginParameterDialog::incrementComboChanged(QString text)
 {
     m_stepSize = text.toInt();
     //!!! rename increment to step size throughout
-    std::cerr << "Increment changed to " << m_blockSize << std::endl;
+    std::cerr << "Increment changed to " << m_stepSize << std::endl;
 }
 
 void
 PluginParameterDialog::windowTypeChanged(WindowType type)
 {