Skip to content

Commit

Permalink
Enhanced the array connection dialog to allow connecting if root comp…
Browse files Browse the repository at this point in the history 
…onent is also array.
  • Loading branch information
@adeas31
adeas31 committed Dec 8, 2015
1 parent 4ef774e commit 61830ae
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 98 deletions.
190 changes: 109 additions & 81 deletions OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp
View file
Expand Up @@ -743,126 +743,151 @@ void LineAnnotation::duplicate()
ConnectionArray::ConnectionArray(GraphicsView *pGraphicsView, LineAnnotation *pConnectionLineAnnotation, QWidget *pParent)
: QDialog(pParent, Qt::WindowTitleHint), mpGraphicsView(pGraphicsView), mpConnectionLineAnnotation(pConnectionLineAnnotation)
{
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::connectArray));
setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::createConnection));
setAttribute(Qt::WA_DeleteOnClose);
// heading
mpHeading = new Label(Helper::connectArray);
mpHeading = new Label(Helper::createConnection);
mpHeading->setFont(QFont(Helper::systemFontInfo.family(), Helper::headingFontSize));
mpHeading->setAlignment(Qt::AlignTop);
// horizontal line
mpHorizontalLine = new QFrame();
mpHorizontalLine->setFrameShape(QFrame::HLine);
mpHorizontalLine->setFrameShadow(QFrame::Sunken);
// Description text
QString indexString = tr("<b>[index]</b>");
QString startComponentDescription;
if (pConnectionLineAnnotation->getStartComponent()->getParentComponent()) {
startComponentDescription = QString("<b>").append(pConnectionLineAnnotation->getStartComponent()->getParentComponent()->getName())
.append(".").append(pConnectionLineAnnotation->getStartComponent()->getName()).append("</b>");
} else {
startComponentDescription = QString("<b>").append(pConnectionLineAnnotation->getStartComponent()->getName()).append("</b>");
}
if (pConnectionLineAnnotation->getStartComponent()->getComponentInfo()) {
if (pConnectionLineAnnotation->getStartComponent()->getComponentInfo()->isArray()) {
startComponentDescription.append(indexString);
mpDescriptionLabel = new Label(tr("Connect to only parts of the connectors, by giving indicies below."));
if (mpConnectionLineAnnotation->getStartComponent()->getParentComponent()) {
mpStartRootComponentLabel = new Label(mpConnectionLineAnnotation->getStartComponent()->getRootParentComponent()->getName());
if (mpConnectionLineAnnotation->getStartComponent()->getRootParentComponent()->getComponentInfo()->isArray()) {
mpStartRootComponentSpinBox = createSpinBox(mpConnectionLineAnnotation->getStartComponent()->getRootParentComponent()->getComponentInfo()->getArrayIndex());
}
}
QString endComponentDescription;
if (pConnectionLineAnnotation->getEndComponent()->getParentComponent()) {
endComponentDescription = QString("<b>").append(pConnectionLineAnnotation->getEndComponent()->getParentComponent()->getName())
.append(".").append(pConnectionLineAnnotation->getEndComponent()->getName()).append("</b>");
} else {
endComponentDescription = QString("<b>").append(pConnectionLineAnnotation->getEndComponent()->getName()).append("</b>");
mpStartComponentLabel = new Label(mpConnectionLineAnnotation->getStartComponent()->getName());
if (mpConnectionLineAnnotation->getStartComponent()->getComponentInfo()->isArray()) {
mpStartComponentSpinBox = createSpinBox(mpConnectionLineAnnotation->getStartComponent()->getComponentInfo()->getArrayIndex());
}
if (pConnectionLineAnnotation->getEndComponent()->getComponentInfo()) {
if (pConnectionLineAnnotation->getEndComponent()->getComponentInfo()->isArray()) {
endComponentDescription.append(indexString);
if (mpConnectionLineAnnotation->getEndComponent()->getParentComponent()) {
mpEndRootComponentLabel = new Label(mpConnectionLineAnnotation->getEndComponent()->getRootParentComponent()->getName());
if (mpConnectionLineAnnotation->getEndComponent()->getRootParentComponent()->getComponentInfo()->isArray()) {
mpEndRootComponentSpinBox = createSpinBox(mpConnectionLineAnnotation->getEndComponent()->getRootParentComponent()->getComponentInfo()->getArrayIndex());
}
}
mpDescriptionLabel = new Label(tr("Connect ").append(startComponentDescription).append(tr(" with ")).append(endComponentDescription));
// start component
if (pConnectionLineAnnotation->getStartComponent()->getParentComponent()) {
mpStartComponentLabel = new Label(tr("Enter <b>index</b> value for <b>").append(pConnectionLineAnnotation->getStartComponent()->getParentComponent()->getName())
.append(".").append(pConnectionLineAnnotation->getStartComponent()->getName()).append("<b>"));
} else {
mpStartComponentLabel = new Label(tr("Enter <b>index</b> value for <b>").append(pConnectionLineAnnotation->getStartComponent()->getName()).append("<b>"));
}
mpStartComponentTextBox = new QLineEdit;
// end component
if (pConnectionLineAnnotation->getEndComponent()->getParentComponent()) {
mpEndComponentLabel = new Label(tr("Enter <b>index</b> value for <b>").append(pConnectionLineAnnotation->getEndComponent()->getParentComponent()->getName())
.append(".").append(pConnectionLineAnnotation->getEndComponent()->getName()).append("</b>"));
} else {
mpEndComponentLabel = new Label(tr("Enter <b>index</b> value for <b>").append(pConnectionLineAnnotation->getEndComponent()->getName()).append("</b>"));
mpEndComponentLabel = new Label(mpConnectionLineAnnotation->getEndComponent()->getName());
if (mpConnectionLineAnnotation->getEndComponent()->getComponentInfo()->isArray()) {
mpEndComponentSpinBox = createSpinBox(mpConnectionLineAnnotation->getEndComponent()->getComponentInfo()->getArrayIndex());
}
mpEndComponentTextBox = new QLineEdit;
// Create the buttons
mpOkButton = new QPushButton(Helper::ok);
mpOkButton->setAutoDefault(true);
connect(mpOkButton, SIGNAL(clicked()), SLOT(saveArrayIndex()));
connect(mpOkButton, SIGNAL(clicked()), SLOT(createArrayConnection()));
mpCancelButton = new QPushButton(Helper::cancel);
mpCancelButton->setAutoDefault(false);
connect(mpCancelButton, SIGNAL(clicked()), SLOT(cancelArrayIndex()));
connect(mpCancelButton, SIGNAL(clicked()), SLOT(cancelArrayConnection()));
// add buttons
mpButtonBox = new QDialogButtonBox(Qt::Horizontal);
mpButtonBox->addButton(mpOkButton, QDialogButtonBox::ActionRole);
mpButtonBox->addButton(mpCancelButton, QDialogButtonBox::ActionRole);
// Create a layout
QGridLayout *mainLayout = new QGridLayout;
mainLayout->addWidget(mpHeading, 0, 0);
mainLayout->addWidget(mpHorizontalLine, 1, 0);
mainLayout->addWidget(mpDescriptionLabel, 2, 0);
int i = 3;
if (pConnectionLineAnnotation->getStartComponent()->getComponentInfo()) {
if (pConnectionLineAnnotation->getStartComponent()->getComponentInfo()->isArray()) {
mainLayout->addWidget(mpStartComponentLabel, i, 0);
mainLayout->addWidget(mpStartComponentTextBox, i+1, 0);
i = i + 2;
QGridLayout *pMainLayout = new QGridLayout;
pMainLayout->setAlignment(Qt::AlignTop);
pMainLayout->addWidget(mpHeading, 0, 0, 1, 2);
pMainLayout->addWidget(mpHorizontalLine, 1, 0, 1, 2);
pMainLayout->addWidget(mpDescriptionLabel, 2, 0, 1, 2);
pMainLayout->addWidget(new Label("connect("), 3, 0);
// connection start horizontal layout
QHBoxLayout *pConnectionStartHorizontalLayout = new QHBoxLayout;
pConnectionStartHorizontalLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
if (mpConnectionLineAnnotation->getStartComponent()->getParentComponent()) {
pConnectionStartHorizontalLayout->addWidget(mpStartRootComponentLabel);
if (mpConnectionLineAnnotation->getStartComponent()->getRootParentComponent()->getComponentInfo()->isArray()) {
pConnectionStartHorizontalLayout->addWidget(mpStartRootComponentSpinBox);
}
}
if (pConnectionLineAnnotation->getEndComponent()->getComponentInfo()) {
if (pConnectionLineAnnotation->getEndComponent()->getComponentInfo()->isArray()) {
mainLayout->addWidget(mpEndComponentLabel, i, 0);
mainLayout->addWidget(mpEndComponentTextBox, i+1, 0);
i = i + 2;
pConnectionStartHorizontalLayout->addWidget(new Label("."));
}
pConnectionStartHorizontalLayout->addWidget(mpStartComponentLabel);
if (mpConnectionLineAnnotation->getStartComponent()->getComponentInfo()->isArray()) {
pConnectionStartHorizontalLayout->addWidget(mpStartComponentSpinBox);
}
pConnectionStartHorizontalLayout->addWidget(new Label(","));
pMainLayout->addLayout(pConnectionStartHorizontalLayout, 3, 1, 1, 1, Qt::AlignLeft);
pMainLayout->addItem(new QSpacerItem(1, 1), 4, 0);
// connection end horizontal layout
QHBoxLayout *pConnectionEndHorizontalLayout = new QHBoxLayout;
pConnectionEndHorizontalLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
if (mpConnectionLineAnnotation->getEndComponent()->getParentComponent()) {
pConnectionEndHorizontalLayout->addWidget(mpEndRootComponentLabel);
if (mpConnectionLineAnnotation->getEndComponent()->getRootParentComponent()->getComponentInfo()->isArray()) {
pConnectionEndHorizontalLayout->addWidget(mpEndRootComponentSpinBox);
}
pConnectionEndHorizontalLayout->addWidget(new Label("."));
}
pConnectionEndHorizontalLayout->addWidget(mpEndComponentLabel);
if (mpConnectionLineAnnotation->getEndComponent()->getComponentInfo()->isArray()) {
pConnectionEndHorizontalLayout->addWidget(mpEndComponentSpinBox);
}
mainLayout->addWidget(mpButtonBox, i, 0);
setLayout(mainLayout);
pConnectionEndHorizontalLayout->addWidget(new Label(");"));
pMainLayout->addLayout(pConnectionEndHorizontalLayout, 4, 1, 1, 1, Qt::AlignLeft);
pMainLayout->addWidget(mpButtonBox, 5, 0, 1, 2, Qt::AlignRight);
setLayout(pMainLayout);
}

/*!
* \brief ConnectionArray::createSpinBox
* Creates a QSpinBox with arrayIndex limit.
* \param arrayIndex
* \return
*/
QSpinBox* ConnectionArray::createSpinBox(QString arrayIndex)
{
QSpinBox *pSpinBox = new QSpinBox;
pSpinBox->setPrefix("[");
pSpinBox->setSuffix("]");
pSpinBox->setSpecialValueText("[:]");
arrayIndex = StringHandler::removeFirstLastCurlBrackets(arrayIndex);
int intArrayIndex = arrayIndex.toInt();
if (intArrayIndex > 0) {
pSpinBox->setMaximum(intArrayIndex);
}
return pSpinBox;
}

void ConnectionArray::saveArrayIndex()
/*!
* \brief ConnectionArray::createArrayConnection
* Slot activated when mpOkButton clicked SIGNAL is raised. Creates an array connection.
*/
void ConnectionArray::createArrayConnection()
{
QString startComponentName, endComponentName;
// set start component name
if (mpConnectionLineAnnotation->getStartComponent()->getParentComponent()) {
startComponentName = QString(mpConnectionLineAnnotation->getStartComponent()->getParentComponent()->getName()).append(".")
.append(mpConnectionLineAnnotation->getStartComponent()->getName());
} else {
startComponentName = mpConnectionLineAnnotation->getStartComponent()->getName();
}
// set the start component name if start component is an array
if (mpConnectionLineAnnotation->getStartComponent()->getComponentInfo()) {
if (mpConnectionLineAnnotation->getStartComponent()->getComponentInfo()->isArray()) {
if (!mpStartComponentTextBox->text().isEmpty()) {
startComponentName = QString(startComponentName).append("[").append(mpStartComponentTextBox->text()).append("]");
startComponentName = mpConnectionLineAnnotation->getStartComponent()->getParentComponent()->getName();
if (mpConnectionLineAnnotation->getStartComponent()->getRootParentComponent()->getComponentInfo()->isArray()) {
if (mpStartRootComponentSpinBox->value() > 0) {
startComponentName += QString("[%1]").arg(mpStartRootComponentSpinBox->value());
}
}
startComponentName += ".";
}
startComponentName += mpConnectionLineAnnotation->getStartComponent()->getName();
if (mpConnectionLineAnnotation->getStartComponent()->getComponentInfo()->isArray()) {
if (mpStartComponentSpinBox->value() > 0) {
startComponentName += QString("[%1]").arg(mpStartComponentSpinBox->value());
}
}
// set end component name
if (mpConnectionLineAnnotation->getEndComponent()->getParentComponent()) {
endComponentName = QString(mpConnectionLineAnnotation->getEndComponent()->getParentComponent()->getName()).append(".")
.append(mpConnectionLineAnnotation->getEndComponent()->getName());
} else {
endComponentName = mpConnectionLineAnnotation->getEndComponent()->getName();
}
// set the end component name if end component is an array
if (mpConnectionLineAnnotation->getEndComponent()->getComponentInfo()) {
if (mpConnectionLineAnnotation->getEndComponent()->getComponentInfo()->isArray()) {
if (!mpEndComponentTextBox->text().isEmpty()) {
endComponentName = QString(endComponentName).append("[").append(mpEndComponentTextBox->text()).append("]");
endComponentName = mpConnectionLineAnnotation->getEndComponent()->getParentComponent()->getName();
if (mpConnectionLineAnnotation->getEndComponent()->getRootParentComponent()->getComponentInfo()->isArray()) {
if (mpEndRootComponentSpinBox->value() > 0) {
endComponentName += QString("[%1]").arg(mpEndRootComponentSpinBox->value());
}
}
endComponentName += ".";
}
endComponentName += mpConnectionLineAnnotation->getEndComponent()->getName();
if (mpConnectionLineAnnotation->getEndComponent()->getComponentInfo()->isArray()) {
if (mpEndComponentSpinBox->value() > 0) {
endComponentName += QString("[%1]").arg(mpEndComponentSpinBox->value());
}
}
mpConnectionLineAnnotation->setStartComponentName(startComponentName);
mpConnectionLineAnnotation->setEndComponentName(endComponentName);
Expand All @@ -872,8 +897,11 @@ void ConnectionArray::saveArrayIndex()
accept();
}

void ConnectionArray::cancelArrayIndex()
/*!
* \brief ConnectionArray::cancelArrayConnection
* Slot activated when mpCancelButton clicked SIGNAL is raised.
*/
void ConnectionArray::cancelArrayConnection()
{
mpGraphicsView->removeCurrentConnection();
reject();
}
14 changes: 10 additions & 4 deletions OMEdit/OMEditGUI/Annotations/LineAnnotation.h
View file
Expand Up @@ -118,16 +118,22 @@ class ConnectionArray : public QDialog
Label *mpHeading;
QFrame *mpHorizontalLine;
Label *mpDescriptionLabel;
Label *mpStartRootComponentLabel;
QSpinBox *mpStartRootComponentSpinBox;
Label *mpStartComponentLabel;
QLineEdit *mpStartComponentTextBox;
QSpinBox *mpStartComponentSpinBox;
Label *mpEndRootComponentLabel;
QSpinBox *mpEndRootComponentSpinBox;
Label *mpEndComponentLabel;
QLineEdit *mpEndComponentTextBox;
QSpinBox *mpEndComponentSpinBox;
QPushButton *mpOkButton;
QPushButton *mpCancelButton;
QDialogButtonBox *mpButtonBox;

QSpinBox* createSpinBox(QString arrayIndex);
public slots:
void saveArrayIndex();
void cancelArrayIndex();
void createArrayConnection();
void cancelArrayConnection();
};

#endif // LINEANNOTATION_H
20 changes: 10 additions & 10 deletions OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
View file
Expand Up @@ -1042,21 +1042,21 @@ void GraphicsView::addConnection(Component *pComponent)
GUIMessages::getMessage(GUIMessages::SAME_COMPONENT_CONNECT), Helper::ok);
removeCurrentConnection();
} else {
// check of any of starting or ending components are array
bool showConnectionArrayDialog = false;
if (pStartComponent->getComponentInfo()) {
if (pStartComponent->getComponentInfo()->isArray()) {
showConnectionArrayDialog = true;
}
}
if (pComponent->getComponentInfo()) {
if (pComponent->getComponentInfo()->isArray()) {
showConnectionArrayDialog = true;
}
if ((pStartComponent->getParentComponent() && pStartComponent->getRootParentComponent()->getComponentInfo()->isArray()) ||
(pStartComponent->getComponentInfo() && pStartComponent->getComponentInfo()->isArray()) ||
(pComponent->getParentComponent() && pComponent->getRootParentComponent()->getComponentInfo()->isArray()) ||
(pComponent->getComponentInfo() && pComponent->getComponentInfo()->isArray())) {
showConnectionArrayDialog = true;
}
if (showConnectionArrayDialog) {
ConnectionArray *pConnectionArray = new ConnectionArray(this, mpConnectionLineAnnotation,
mpModelWidget->getModelWidgetContainer()->getMainWindow());
pConnectionArray->exec();
// if user cancels the array connection
if (!pConnectionArray->exec()) {
removeCurrentConnection();
}
} else {
QString startComponentName, endComponentName;
if (pStartComponent->getParentComponent()) {
Expand Down
4 changes: 2 additions & 2 deletions OMEdit/OMEditGUI/Util/Helper.cpp
View file
Expand Up @@ -252,7 +252,7 @@ QString Helper::findReplaceModelicaText;
QString Helper::left;
QString Helper::center;
QString Helper::right;
QString Helper::connectArray;
QString Helper::createConnection;
QString Helper::findVariables;
QString Helper::viewClass;
QString Helper::viewClassTip;
Expand Down Expand Up @@ -442,7 +442,7 @@ void Helper::initHelperVariables()
Helper::left = tr("Left");
Helper::center = tr("Center");
Helper::right = tr("Right");
Helper::connectArray = tr("Connect Array");
Helper::createConnection = tr("Create Connection");
Helper::findVariables = tr("Find Variables");
Helper::viewClass = tr("View Class");
Helper::viewClassTip = tr("Opens the class details");
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Util/Helper.h
View file
Expand Up @@ -259,7 +259,7 @@ class Helper : public QObject
static QString left;
static QString center;
static QString right;
static QString connectArray;
static QString createConnection;
static QString findVariables;
static QString viewClass;
static QString viewClassTip;
Expand Down

0 comments on commit 61830ae

Please sign in to comment.