diff --git a/src/SeerArrayVisualizerWidget.cpp b/src/SeerArrayVisualizerWidget.cpp index e9fd249..0506272 100644 --- a/src/SeerArrayVisualizerWidget.cpp +++ b/src/SeerArrayVisualizerWidget.cpp @@ -20,11 +20,15 @@ SeerArrayVisualizerWidget::SeerArrayVisualizerWidget (QWidget* parent) : QWidget(parent) { // Init variables. - _aVariableId = Seer::createID(); // Create two id's for queries. + _aVariableId = Seer::createID(); // Create id's for A queries. _aMemoryId = Seer::createID(); + _aOffsetId = Seer::createID(); + _aStrideId = Seer::createID(); - _bVariableId = Seer::createID(); // Create two id's for queries. + _bVariableId = Seer::createID(); // Create id's for B queries. _bMemoryId = Seer::createID(); + _bOffsetId = Seer::createID(); + _bStrideId = Seer::createID(); _aSeries = 0; _bSeries = 0; @@ -73,14 +77,16 @@ SeerArrayVisualizerWidget::SeerArrayVisualizerWidget (QWidget* parent) : QWidget QObject::connect(aRefreshToolButton, &QToolButton::clicked, this, &SeerArrayVisualizerWidget::handleaRefreshButton); QObject::connect(bRefreshToolButton, &QToolButton::clicked, this, &SeerArrayVisualizerWidget::handlebRefreshButton); QObject::connect(helpToolButton, &QToolButton::clicked, this, &SeerArrayVisualizerWidget::handleHelpButton); - QObject::connect(aArrayLengthLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaRefreshButton); - QObject::connect(bArrayLengthLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebRefreshButton); - QObject::connect(aArrayOffsetLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaRefreshButton); - QObject::connect(bArrayOffsetLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebRefreshButton); - QObject::connect(aArrayStrideLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaRefreshButton); - QObject::connect(bArrayStrideLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebRefreshButton); - QObject::connect(aVariableNameLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaVariableNameLineEdit); - QObject::connect(bVariableNameLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebVariableNameLineEdit); + QObject::connect(aVariableNameLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaVariableNameLineEdit); + QObject::connect(aVariableNameLineEdit, &SeerHistoryLineEdit::editingFinished, this, &SeerArrayVisualizerWidget::handleaVariableNameLineEdit); + QObject::connect(bVariableNameLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebVariableNameLineEdit); + QObject::connect(bVariableNameLineEdit, &SeerHistoryLineEdit::editingFinished, this, &SeerArrayVisualizerWidget::handlebVariableNameLineEdit); + QObject::connect(aArrayLengthLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaRefreshButton); + QObject::connect(bArrayLengthLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebRefreshButton); + QObject::connect(aArrayOffsetLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaRefreshButton); + QObject::connect(bArrayOffsetLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebRefreshButton); + QObject::connect(aArrayStrideLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleaRefreshButton); + QObject::connect(bArrayStrideLineEdit, &SeerHistoryLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handlebRefreshButton); QObject::connect(aArrayDisplayFormatComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &SeerArrayVisualizerWidget::handleaArrayDisplayFormatComboBox); QObject::connect(bArrayDisplayFormatComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &SeerArrayVisualizerWidget::handlebArrayDisplayFormatComboBox); QObject::connect(aAxisComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &SeerArrayVisualizerWidget::handleaAxisComboBox); @@ -554,6 +560,25 @@ void SeerArrayVisualizerWidget::handlebVariableNameLineEdit () { setBVariableName (bVariableNameLineEdit->text()); } +void SeerArrayVisualizerWidget::handleaElementLengthLineEdit () { +} + +void SeerArrayVisualizerWidget::handlebElementLengthLineEdit () { +} + +void SeerArrayVisualizerWidget::handleaElementOffsetLineEdit () { +} + +void SeerArrayVisualizerWidget::handlebElementOffsetLineEdit () { +} + +void SeerArrayVisualizerWidget::handleaElementStrideLineEdit () { +} + +void SeerArrayVisualizerWidget::handlebElementStrideLineEdit () { +} + + void SeerArrayVisualizerWidget::handleaArrayDisplayFormatComboBox (int index) { //qDebug() << index; diff --git a/src/SeerArrayVisualizerWidget.h b/src/SeerArrayVisualizerWidget.h index 7df4079..768ac51 100644 --- a/src/SeerArrayVisualizerWidget.h +++ b/src/SeerArrayVisualizerWidget.h @@ -35,6 +35,12 @@ class SeerArrayVisualizerWidget : public QWidget, protected Ui::SeerArrayVisuali void handleHelpButton (); void handleaVariableNameLineEdit (); void handlebVariableNameLineEdit (); + void handleaElementLengthLineEdit (); + void handlebElementLengthLineEdit (); + void handleaElementOffsetLineEdit (); + void handlebElementOffsetLineEdit (); + void handleaElementStrideLineEdit (); + void handlebElementStrideLineEdit (); void handleaArrayDisplayFormatComboBox (int index); void handlebArrayDisplayFormatComboBox (int index); void handleaAxisComboBox (int index); @@ -62,5 +68,9 @@ class SeerArrayVisualizerWidget : public QWidget, protected Ui::SeerArrayVisuali int _bVariableId; int _aMemoryId; int _bMemoryId; + int _aOffsetId; + int _bOffsetId; + int _aStrideId; + int _bStrideId; }; diff --git a/src/SeerArrayVisualizerWidget.ui b/src/SeerArrayVisualizerWidget.ui index 17ebb66..4787f1d 100644 --- a/src/SeerArrayVisualizerWidget.ui +++ b/src/SeerArrayVisualizerWidget.ui @@ -17,7 +17,7 @@ - + Element stride between values. (default=1) @@ -80,7 +80,7 @@ - + Element stride between values. (default=1) @@ -96,7 +96,7 @@ - + Total number of elements in array. @@ -112,7 +112,7 @@ - + Variable name or expression. @@ -139,7 +139,7 @@ - + Element offset into array. (default=0) @@ -158,7 +158,7 @@ - + Total number of elements in array. @@ -221,7 +221,7 @@ - + Variable address. @@ -237,7 +237,7 @@ - + Element offset into array. (default=0) @@ -256,7 +256,7 @@ - + Variable address. @@ -286,7 +286,7 @@ - + Variable name or expression. @@ -377,7 +377,7 @@ - + 0 @@ -514,9 +514,9 @@
QZoomChartView.h
- QHistoryLineEdit + SeerHistoryLineEdit QLineEdit -
QHistoryLineEdit.h
+
SeerHistoryLineEdit.h
diff --git a/tests/helloarray/helloarray.cpp b/tests/helloarray/helloarray.cpp index 13157f3..d16f717 100644 --- a/tests/helloarray/helloarray.cpp +++ b/tests/helloarray/helloarray.cpp @@ -57,11 +57,13 @@ int main (void) { float phaseIncrement = two_pi/table_size; float currentPhase = 0.0; - float* sine_array = (float*)malloc(table_size*sizeof(float)); + float* sin_array = (float*)malloc(table_size*sizeof(float)); + float* cos_array = (float*)malloc(table_size*sizeof(float)); for (int i = 0; i < 512; i ++){ - sine_array[i] = sin(currentPhase); + sin_array[i] = sin(currentPhase); + cos_array[i] = cos(currentPhase); currentPhase += phaseIncrement; } @@ -79,7 +81,8 @@ int main (void) { free(array); free(int_array); free(float_array); - free(sine_array); + free(sin_array); + free(cos_array); free(x); return 0;