Skip to content

Commit

Permalink
Remove/comment unused enums
Browse files Browse the repository at this point in the history 
Mark strings with tr for translation
Use Utilities::FileIconProvider::icon()
check if file is created successfully
change INTO_CPS menu item with Git
remove FMU output directory
  • Loading branch information
@alash325
alash325 committed Feb 14, 2017
1 parent 65bfe93 commit 8699d17
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 134 deletions.
10 changes: 4 additions & 6 deletions OMEdit/OMEditGUI/Git/CleanDialog.cpp
View file
Expand Up @@ -12,7 +12,7 @@
#include "QStandardItemModel"
#include "QApplication"

enum { nameColumn, columnCount };
enum { columnCount };
enum { fileNameRole = Qt::UserRole, isDirectoryRole = Qt::UserRole + 1 };

/*!
Expand All @@ -26,7 +26,7 @@ enum { fileNameRole = Qt::UserRole, isDirectoryRole = Qt::UserRole + 1 };
CleanDialog::CleanDialog(QWidget *pParent)
: QDialog(pParent)
{
setWindowTitle(QString(Helper::applicationName).append(" - ").append("Clean Repository"));
setWindowTitle(QString(Helper::applicationName).append(" - ").append(tr("Clean Repository")));
setAttribute(Qt::WA_DeleteOnClose);
resize(500, 400);
// Select all check box
Expand Down Expand Up @@ -82,9 +82,6 @@ void CleanDialog::getUntrackedFiles()

void CleanDialog::addFile(const QString &workingDirectory, QString fileName, bool checked)
{
QStyle *style = QApplication::style();
const QIcon folderIcon = style->standardIcon(QStyle::SP_DirIcon);
const QIcon fileIcon = style->standardIcon(QStyle::SP_FileIcon);
const QChar slash = QLatin1Char('/');
// Clean the trailing slash of directories
if (fileName.endsWith(slash))
Expand All @@ -95,7 +92,8 @@ void CleanDialog::addFile(const QString &workingDirectory, QString fileName, boo
checked = false;
auto nameItem = new QStandardItem(QDir::toNativeSeparators(fileName));
nameItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
nameItem->setIcon(isDir ? folderIcon : fileIcon);
QFileInfo fileInfo(fileName);
nameItem->setIcon(Utilities::FileIconProvider::icon(fileInfo));
nameItem->setCheckable(true);
nameItem->setCheckState(checked ? Qt::Checked : Qt::Unchecked);
nameItem->setData(QVariant(fi.absoluteFilePath()), fileNameRole);
Expand Down
66 changes: 26 additions & 40 deletions OMEdit/OMEditGUI/Git/CommitChangesDialog.cpp
View file
@@ -1,6 +1,7 @@
#include "CommitChangesDialog.h"
#include "MainWindow.h"
#include "Modeling/ModelWidgetContainer.h"
#include "Modeling/MessagesWidget.h"
#include "Git/GitCommands.h"
#include "util/Helper.h"
#include "QFrame"
Expand All @@ -13,7 +14,7 @@
#include "QFileInfo"

enum { statusColumn, nameColumn, columnCount};
enum { fileNameRole = Qt::UserRole, isDirectoryRole = Qt::UserRole + 1 };
//enum { fileNameRole = Qt::UserRole, isDirectoryRole = Qt::UserRole + 1 };

/*!
* \class CommitChangesDialog
Expand All @@ -26,7 +27,7 @@ enum { fileNameRole = Qt::UserRole, isDirectoryRole = Qt::UserRole + 1 };
CommitChangesDialog::CommitChangesDialog(QWidget *pParent)
: QDialog(pParent)
{
setWindowTitle(QString(Helper::applicationName).append(" - ").append("Commit"));
setWindowTitle(QString(Helper::applicationName).append(" - ").append(tr("Commit")));
setAttribute(Qt::WA_DeleteOnClose);
resize(850, 600);
QString repository = MainWindow::instance()->getModelWidgetContainer()->getCurrentModelWidget()->getLibraryTreeItem()->getFileName();
Expand Down Expand Up @@ -182,7 +183,7 @@ QString CommitChangesDialog::getFileStatus(QString status)
else if (status.trimmed().compare("C")== 0)
return "Copied";
else if (status.trimmed().compare("??")== 0)
return "Untracked";
return "Model Creation";
else
// should never be reached
return "UnknownFileStatus";
Expand All @@ -205,50 +206,35 @@ void CommitChangesDialog::commitFiles()
QString nameStructure = MainWindow::instance()->getModelWidgetContainer()->getCurrentModelWidget()->getLibraryTreeItem()->getNameStructure();
QFileInfo info(filePath);
MainWindow::instance()->getGitCommands()->commitFiles(filePath, mpCommitDescriptionTextBox->toPlainText());

foreach (const QString &fileName, mpModifiedFiles) {
if(!fileName.isEmpty()) {
QString activity = getFileStatus(fileName.mid(0, 2));
QString fileURI = fileName.mid(3);
generateTraceabilityURI(nameStructure, info.absolutePath(), activity, fileURI );
}
}
if(!fileName.isEmpty()) {
QString activity = getFileStatus(fileName.mid(0, 2));
QString fileURI = fileName.mid(3);
generateTraceabilityURI(nameStructure, info.absolutePath(), activity, fileURI );
}
}
accept();
}

void CommitChangesDialog::generateTraceabilityURI(QString nameStructure, QString filePath, QString activity, QString fileURI)
{

QString toolURI, fileNameURI, activityURI, agentURI;
QFile file(filePath + "/" + nameStructure +".md");

// QFileInfo fi("C:/Users/alame60/Desktop/INTOCPS/traceability/OpenModelica/Models/BouncingBall.mo");
// QString base = fi.baseName();
// qDebug()<<"base name"<<base;
// QFile file(base +".md");

/*
* If file not exist it will create
* */
if (!file.open(QIODevice::WriteOnly | QIODevice::Text ))
{
//qDebug() << "FAIL TO CREATE FILE / FILE NOT EXIST***";
}

/*for Reading line by line from text file
while (!file.atEnd()) {
QByteArray line = file.readLine();
qDebug() << "read output - " << line;
}*/
// open the file for writing
if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
QDateTime time = QDateTime::currentDateTime();

/*for writing line by line to text file */
fileNameURI = "Entity.file:" + fileURI + "#"+ MainWindow::instance()->getGitCommands()->getGitHash(MainWindow::instance()->getModelWidgetContainer()->getCurrentModelWidget()->getLibraryTreeItem()->getFileName());
toolURI = "Entity.softwareTool:" + MainWindow::instance()->getOMCProxy()->getVersion();
agentURI = "Agent:" + mpAuthorTextBox->text();
activityURI = "Activity." + activity +":" + time.toString("yyyy-MM-dd-hh-mm-ss");
QTextStream stream(&file);
stream << fileNameURI << "," << activityURI << "," << agentURI <<"," << toolURI;
file.flush();
file.close();
/*for writing line by line to text file */
fileNameURI = "Entity.file:" + fileURI + "#"+ MainWindow::instance()->getGitCommands()->getGitHash(MainWindow::instance()->getModelWidgetContainer()->getCurrentModelWidget()->getLibraryTreeItem()->getFileName());
toolURI = "Entity.softwareTool:" + MainWindow::instance()->getOMCProxy()->getVersion();
agentURI = "Agent:" + mpAuthorTextBox->text();
activityURI = "Activity." + activity +":" + time.toString("yyyy-MM-dd-hh-mm-ss");
QTextStream textSstream(&file);
textSstream << fileNameURI << "," << activityURI << "," << agentURI <<"," << toolURI;
file.flush();
file.close();
} else {
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::CompositeModel, "", false, 0, 0, 0, 0,
tr("The traceability information is not created in a file. One possible reason could be the model is not Modelica model"),
Helper::scriptingKind, Helper::notificationLevel));
}
}
14 changes: 7 additions & 7 deletions OMEdit/OMEditGUI/Git/GitCommands.cpp
View file
Expand Up @@ -20,7 +20,6 @@
GitCommands::GitCommands(QObject *pParent)
: QObject(pParent)
{
//mpMainWindow = pMainWindow;
mpGitProcess = new QProcess;
}

Expand Down Expand Up @@ -103,7 +102,7 @@ void GitCommands::createGitRepository(QString repositoryPath)
{
if(isGitInstalled()) {
mpGitProcess->setWorkingDirectory(repositoryPath);
mpGitProcess->setProcessChannelMode(QProcess::MergedChannels);
//mpGitProcess->setProcessChannelMode(QProcess::MergedChannels);
mpGitProcess->start("git", QStringList() << "init");
mpGitProcess->waitForFinished();
QString createRepo = mpGitProcess->readAllStandardOutput();
Expand All @@ -118,7 +117,7 @@ void GitCommands::createGitRepository(QString repositoryPath)
pMessageBox->setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::information));
pMessageBox->setIcon(QMessageBox::Information);
pMessageBox->setAttribute(Qt::WA_DeleteOnClose);
pMessageBox->setText("Git not found in your system");
pMessageBox->setText("Git not found in the system");
pMessageBox->exec();
}
}
Expand All @@ -144,15 +143,16 @@ void GitCommands::addStructuresToRepository(QString repositoryPath)
*/
bool GitCommands::isGitInstalled()
{
mpGitProcess->setProcessChannelMode(QProcess::MergedChannels);
// mpGitProcess->setProcessChannelMode(QProcess::MergedChannels);
mpGitProcess->start("git", QStringList() << "--version");
mpGitProcess->waitForFinished();
QString git = mpGitProcess->readAllStandardOutput();
/* Check for git installation */
if (!git.isEmpty()){
return true ;
if(!git.isEmpty()){
return true ;
}
return false;
else
return false;
}

/*!
Expand Down
4 changes: 2 additions & 2 deletions OMEdit/OMEditGUI/Git/RevertCommitsDialog.cpp
View file
Expand Up @@ -22,7 +22,7 @@
RevertCommitsDialog::RevertCommitsDialog(QWidget *pParent)
: QDialog(pParent)
{
setWindowTitle(QString(Helper::applicationName).append(" - ").append("Revert Commit"));
setWindowTitle(QString(Helper::applicationName).append(" - ").append(tr("Revert Commit")));
setAttribute(Qt::WA_DeleteOnClose);
resize(500, 400);
QString repository = MainWindow::instance()->getModelWidgetContainer()->getCurrentModelWidget()->getLibraryTreeItem()->getFileName();
Expand Down Expand Up @@ -154,7 +154,7 @@ enum Columns
LogCommitDialog::LogCommitDialog(RevertCommitsDialog *pRevertCommitsDialog)
: QDialog(pRevertCommitsDialog)
{
setWindowTitle(QString(Helper::applicationName).append(" - ").append("Select Commit"));
setWindowTitle(QString(Helper::applicationName).append(" - ").append(tr("Select Commit")));
setAttribute(Qt::WA_DeleteOnClose);
resize(500, 400);
mpRevertCommitsDialog = pRevertCommitsDialog;
Expand Down
40 changes: 20 additions & 20 deletions OMEdit/OMEditGUI/MainWindow.cpp
View file
Expand Up @@ -2810,7 +2810,7 @@ void MainWindow::createActions()
mpAttachDebuggerToRunningProcessAction = new QAction(Helper::attachToRunningProcess, this);
mpAttachDebuggerToRunningProcessAction->setStatusTip(Helper::attachToRunningProcessTip);
connect(mpAttachDebuggerToRunningProcessAction, SIGNAL(triggered()), SLOT(showAttachToProcessDialog()));
// INTO-CPS Menu
// Git and traceability Menu
// Create git repository action
mpCreateGitRepositoryAction = new QAction(Helper::createGitReposiory, this);
mpCreateGitRepositoryAction->setStatusTip(Helper::createGitReposioryTip);
Expand Down Expand Up @@ -3193,30 +3193,30 @@ void MainWindow::createMenus()
pDebugMenu->addAction(mpAttachDebuggerToRunningProcessAction);
// add Debug menu to menu bar
menuBar()->addAction(pDebugMenu->menuAction());
// INTO-CPS menu
QMenu *pINTOCPSMenu = new QMenu(menuBar());
pINTOCPSMenu->setTitle(tr("&INTO-CPS"));
// Git menu
QMenu *pGitMenu = new QMenu(menuBar());
pGitMenu->setTitle(tr("&Git"));
// Traceability actions
QMenu *pTraceabilityMenu = new QMenu(menuBar());
pTraceabilityMenu->setObjectName("TraceabilityMenu");
pTraceabilityMenu->setObjectName(tr("TraceabilityMenu"));
pTraceabilityMenu->setTitle(tr("Traceability"));
pTraceabilityMenu->addAction(mpTraceabilityPushAction);
pTraceabilityMenu->addAction(mpTraceabilityQueryAction);
// add actions to INTO-CPS menu
pINTOCPSMenu->addAction(mpCreateGitRepositoryAction);
pINTOCPSMenu->addSeparator();
pINTOCPSMenu->addAction(mpLogCurrentFileAction);
pINTOCPSMenu->addAction(mpStageCurrentFileForCommitAction);
pINTOCPSMenu->addAction(mpUnstageCurrentFileFromCommitAction);
pINTOCPSMenu->addSeparator();
pINTOCPSMenu->addAction(mpCommitFilesAction);
pINTOCPSMenu->addAction(mpRevertCommitAction);
pINTOCPSMenu->addSeparator();
pINTOCPSMenu->addAction(mpCleanWorkingDirectoryAction);
pINTOCPSMenu->addSeparator();
pINTOCPSMenu->addAction(pTraceabilityMenu->menuAction());
// add INTO-CPS menu to menu bar
menuBar()->addAction(pINTOCPSMenu->menuAction());
// add actions to Git menu
pGitMenu->addAction(mpCreateGitRepositoryAction);
pGitMenu->addSeparator();
pGitMenu->addAction(mpLogCurrentFileAction);
pGitMenu->addAction(mpStageCurrentFileForCommitAction);
pGitMenu->addAction(mpUnstageCurrentFileFromCommitAction);
pGitMenu->addSeparator();
pGitMenu->addAction(mpCommitFilesAction);
pGitMenu->addAction(mpRevertCommitAction);
pGitMenu->addSeparator();
pGitMenu->addAction(mpCleanWorkingDirectoryAction);
pGitMenu->addSeparator();
pGitMenu->addAction(pTraceabilityMenu->menuAction());
// add Git menu to menu bar
menuBar()->addAction(pGitMenu->menuAction());
// Tools menu
QMenu *pToolsMenu = new QMenu(menuBar());
pToolsMenu->setTitle(tr("&Tools"));
Expand Down

0 comments on commit 8699d17

Please sign in to comment.