diff --git a/src/musrgui/PGetTheoryBlockDialog.cpp b/src/musrgui/PGetTheoryBlockDialog.cpp index 2ac3b639..350d7bec 100644 --- a/src/musrgui/PGetTheoryBlockDialog.cpp +++ b/src/musrgui/PGetTheoryBlockDialog.cpp @@ -61,6 +61,53 @@ PGetTheoryBlockDialog::PGetTheoryBlockDialog(PAdmin *admin, } } +//---------------------------------------------------------------------------------------------------- +/** + *
+ */
+QString PGetTheoryBlockDialog::getTheoFuncString()
+{
+ QString str = "????";
+ int idx = fTheoryFunction_comboBox->currentItem();
+ PTheory *theoItem = fAdmin->getTheoryItem(idx);
+ if (theoItem == 0)
+ return str;
+
+ // add theory function name
+ str = theoItem->name + " ";
+ if (theoItem->name == "userFcn") {
+ str += "libMyLibrary.so TMyFunction ";
+ }
+ // add pseudo parameters
+ for (int i=0; i
+ */
+void PGetTheoryBlockDialog::addPlus()
+{
+ QString str = getTheoFuncString() + "\n+\n";
+ fTheoryBlock_textEdit->append(str);
+}
+
+//----------------------------------------------------------------------------------------------------
+/**
+ *
+ */
+void PGetTheoryBlockDialog::addMultiply()
+{
+ QString str = getTheoFuncString() + "\n";
+ fTheoryBlock_textEdit->append(str);
+}
+
//----------------------------------------------------------------------------------------------------
/**
*
diff --git a/src/musrgui/PGetTheoryBlockDialog.h b/src/musrgui/PGetTheoryBlockDialog.h
index de874181..c85f57fb 100644
--- a/src/musrgui/PGetTheoryBlockDialog.h
+++ b/src/musrgui/PGetTheoryBlockDialog.h
@@ -45,6 +45,9 @@ class PGetTheoryBlockDialog : public PGetTheoryBlockDialogBase
QString getTheoryBlock() { return fTheoryBlock_textEdit->text(); }
private slots:
+ QString getTheoFuncString();
+ void addPlus();
+ void addMultiply();
void helpContents();
private:
diff --git a/src/musrgui/PSubTextEdit.cpp b/src/musrgui/PSubTextEdit.cpp
index 2b8831ef..fbaf779a 100644
--- a/src/musrgui/PSubTextEdit.cpp
+++ b/src/musrgui/PSubTextEdit.cpp
@@ -153,7 +153,7 @@ void PSubTextEdit::insertTheoryBlock()
PGetTheoryBlockDialog *dlg = new PGetTheoryBlockDialog(fAdmin);
if (dlg->exec() == QDialog::Accepted) {
insert(dlg->getTheoryBlock());
- insert("\n\n");
+ insert("\n");
}
}
diff --git a/src/musrgui/forms/PGetTheoryBlockDialogBase.ui b/src/musrgui/forms/PGetTheoryBlockDialogBase.ui
index e41b5ebb..17fe301c 100644
--- a/src/musrgui/forms/PGetTheoryBlockDialogBase.ui
+++ b/src/musrgui/forms/PGetTheoryBlockDialogBase.ui
@@ -110,32 +110,6 @@
-