Merge branch 'master' into fix-transparency

Author: cbrightsci

src/Interface/Application/NoteEditor.cc

@@ -55,6 +55,9 @@ NoteEditor::NoteEditor(const QString& moduleName, bool positionAdjustable, QWidg
   connect(buttonBox_->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(ok()));
   connect(buttonBox_->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(cancel()));
 
+  label_2->setHidden(true);
+  alignmentComboBox_->setHidden(true);
+
   //TODO: settable notes
   previousColor_ = Qt::black;
   position_ = Default;
@@ -162,4 +165,4 @@ void NoteEditor::showEvent(QShowEvent* event)
   noteHtmlBackup_ = textEdit_->toHtml();
   fontSizeBackup_ = fontSizeComboBox_->currentIndex();
   QDialog::showEvent(event);
-}
+}

src/Modules/Legacy/Visualization/GenerateStreamLines.cc

@@ -80,14 +80,6 @@ void GenerateStreamLines::execute()
     setAlgoBoolFromState(Parameters::RemoveColinearPoints);
     setAlgoBoolFromState(Parameters::AutoParameters);
     setAlgoOptionFromState(Parameters::StreamlineMethod);
-    /*
-    int method = gui_method_.get();
-    if (method == 0) algo_.set_option("method","AdamsBashforth");
-    else if (method == 2) algo_.set_option("method","Heun");
-    else if (method == 3) algo_.set_option("method","RungeKutta");
-    else if (method == 4) algo_.set_option("method","RungeKuttaFehlberg");
-    else if (method == 5) algo_.set_option("method","CellWalk");
-    */
 
     auto output = algo().run_generic(withInputData((Vector_Field, input)(Seed_Points, seeds)));