Skip to content

Commit

Permalink
- remove the old tabbed animation stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@vwaurich @adeas31
vwaurich authored and adeas31 committed Sep 30, 2016
1 parent 03c48b2 commit 531b4cb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 128 deletions.
122 changes: 7 additions & 115 deletions OMEdit/OMEditGUI/MainWindow.cpp
View file
Expand Up @@ -143,11 +143,6 @@ MainWindow::MainWindow(QSplashScreen *pSplashScreen, bool debug, QWidget *parent
QShortcut *pAlgorithmicDebuggingShortcut = new QShortcut(QKeySequence("Ctrl+f5"), this);
connect(pAlgorithmicDebuggingShortcut, SIGNAL(activated()), SLOT(switchToAlgorithmicDebuggingPerspectiveSlot()));
mpPerspectiveTabbar->setTabToolTip(3, tr("Changes to debugging perspective (%1)").arg(pAlgorithmicDebuggingShortcut->key().toString()));
// 3d animation perspective
mpPerspectiveTabbar->addTab(QIcon(":/Resources/icons/animation.png"), tr("Animation"));
QShortcut *pAnimationShortcut = new QShortcut(QKeySequence("Ctrl+f6"), this);
connect(pAnimationShortcut, SIGNAL(activated()), SLOT(switchToAnimationPerspectiveSlot()));
mpPerspectiveTabbar->setTabToolTip(4, tr("Changes to animation perspective (%1)").arg(pAnimationShortcut->key().toString()));
// change the perspective when perspective tab bar selection is changed
connect(mpPerspectiveTabbar, SIGNAL(currentChanged(int)), SLOT(perspectiveTabChanged(int)));
// Create an object of QStatusBar
Expand Down Expand Up @@ -221,20 +216,6 @@ MainWindow::MainWindow(QSplashScreen *pSplashScreen, bool debug, QWidget *parent
addDockWidget(Qt::RightDockWidgetArea, mpDocumentationDockWidget);
mpDocumentationDockWidget->hide();
connect(mpDocumentationDockWidget, SIGNAL(visibilityChanged(bool)), SLOT(documentationDockWidgetVisibilityChanged(bool)));
// Create an object of AnimationWindowContainer and render it periodically
mpAnimationWindowContainer = new AnimationWindowContainer(this);
renderTimer = new QTimer();
QObject::connect(renderTimer, SIGNAL(timeout()), mpAnimationWindowContainer, SLOT(renderSlotFunction()));
QObject::connect(renderTimer, SIGNAL(timeout()), this, SLOT(updateAnimationTimeContent()));
renderTimer->start(10);
// some widgets for the animation toolbar
mpAnimationSlider = new QSlider(Qt::Horizontal,this);
mpAnimationSlider->setFixedWidth(100);
mpAnimationSlider->setMinimum(0);
mpAnimationSlider->setMaximum(100);
mpAnimationSlider->setSliderPosition(50);
mpAnimationTimeLabel = new QLabel(this);
mpAnimationTimeLabel->setText(QString("Time [s]: ").append(QString::fromStdString("0.000")));
// Create an object of PlotWindowContainer
mpPlotWindowContainer = new PlotWindowContainer(this);
// create an object of VariablesWidget
Expand Down Expand Up @@ -276,7 +257,6 @@ MainWindow::MainWindow(QSplashScreen *pSplashScreen, bool debug, QWidget *parent
mpCentralStackedWidget->addWidget(mpWelcomePageWidget);
mpCentralStackedWidget->addWidget(mpModelWidgetContainer);
mpCentralStackedWidget->addWidget(mpPlotWindowContainer);
mpCentralStackedWidget->addWidget(mpAnimationWindowContainer);
// set the layout
QGridLayout *pCentralgrid = new QGridLayout;
pCentralgrid->setVerticalSpacing(4);
Expand Down Expand Up @@ -2210,9 +2190,6 @@ void MainWindow::perspectiveTabChanged(int tabIndex)
case 3:
switchToAlgorithmicDebuggingPerspective();
break;
case 4:
switchToAnimationPerspective();
break;
default:
switchToWelcomePerspective();
break;
Expand Down Expand Up @@ -2289,16 +2266,6 @@ void MainWindow::switchToAlgorithmicDebuggingPerspectiveSlot()
mpPerspectiveTabbar->setCurrentIndex(3);
}

/*!
* \brief MainWindow::switchToAnimationPerspectiveSlot
* Slot activated when Ctrl+f6 is clicked.
* Switches to animation perspective.
*/
void MainWindow::switchToAnimationPerspectiveSlot()
{
mpPerspectiveTabbar->setCurrentIndex(4);
}

/*!
* \brief MainWindow::showConfigureDialog
* Slot activated when mpDebugConfigurationsAction triggered signal is raised.\n
Expand Down Expand Up @@ -2512,6 +2479,11 @@ void MainWindow::createActions()
mpSimulateWithAlgorithmicDebuggerAction->setStatusTip(Helper::simulateWithAlgorithmicDebuggerTip);
mpSimulateWithAlgorithmicDebuggerAction->setEnabled(false);
connect(mpSimulateWithAlgorithmicDebuggerAction, SIGNAL(triggered()), SLOT(simulateModelWithAlgorithmicDebugger()));
// simulate with animation action
mpSimulateWithAnimationAction = new QAction(QIcon(":/Resources/icons/simulate-animation.png"), Helper::simulateWithAnimation, this);
mpSimulateWithAnimationAction->setStatusTip(Helper::simulateWithAnimationTip);
mpSimulateWithAnimationAction->setEnabled(false);
//connect(mpSimulateWithAnimationAction, SIGNAL(triggered()), SLOT(simulateModelWithAlgorithmicDebugger()));
// simulation setup action
mpSimulationSetupAction = new QAction(QIcon(":/Resources/icons/simulation-center.svg"), Helper::simulationSetup, this);
mpSimulationSetupAction->setStatusTip(Helper::simulationSetupTip);
Expand Down Expand Up @@ -2721,23 +2693,6 @@ void MainWindow::createActions()
mpTLMCoSimulationAction->setStatusTip(Helper::tlmCoSimulationSetupTip);
mpTLMCoSimulationAction->setEnabled(false);
connect(mpTLMCoSimulationAction, SIGNAL(triggered()), SLOT(TLMSimulate()));
// animation action
mpAnimationChooseFileAction = new QAction(QIcon(":/Resources/icons/openFile.png"), Helper::animationChooseFile, this);
mpAnimationChooseFileAction->setStatusTip(Helper::animationChooseFileTip);
mpAnimationChooseFileAction->setEnabled(true);
mpAnimationInitializeAction = new QAction(QIcon(":/Resources/icons/initialize.png"), Helper::animationInitialize, this);
mpAnimationInitializeAction->setStatusTip(Helper::animationInitializeTip);
mpAnimationInitializeAction->setEnabled(true);
mpAnimationPlayAction = new QAction(QIcon(":/Resources/icons/play.png"), Helper::animationPlay, this);
mpAnimationPlayAction->setStatusTip(Helper::animationPlayTip);
mpAnimationPlayAction->setEnabled(true);
mpAnimationPauseAction = new QAction(QIcon(":/Resources/icons/pause.png"), Helper::animationPause, this);
mpAnimationPauseAction->setStatusTip(Helper::animationPauseTip);
mpAnimationPauseAction->setEnabled(true);
connect(mpAnimationChooseFileAction, SIGNAL(triggered()),mpAnimationWindowContainer, SLOT(chooseAnimationFileSlotFunction()));
connect(mpAnimationInitializeAction, SIGNAL(triggered()),mpAnimationWindowContainer, SLOT(initSlotFunction()));
connect(mpAnimationPlayAction, SIGNAL(triggered()),mpAnimationWindowContainer, SLOT(playSlotFunction()));
connect(mpAnimationPauseAction, SIGNAL(triggered()),mpAnimationWindowContainer, SLOT(pauseSlotFunction()));
}

//! Creates the menus
Expand Down Expand Up @@ -2865,6 +2820,7 @@ void MainWindow::createMenus()
pSimulationMenu->addAction(mpSimulateModelAction);
pSimulationMenu->addAction(mpSimulateWithTransformationalDebuggerAction);
pSimulationMenu->addAction(mpSimulateWithAlgorithmicDebuggerAction);
pSimulationMenu->addAction(mpSimulateWithAnimationAction);
pSimulationMenu->addAction(mpSimulationSetupAction);
// add Simulation menu to menu bar
menuBar()->addAction(pSimulationMenu->menuAction());
Expand Down Expand Up @@ -2999,8 +2955,6 @@ void MainWindow::switchToWelcomePerspective()
mpTargetOutputDockWidget->hide();
mpGDBLoggerDockWidget->hide();
mpPlotToolBar->setEnabled(false);
mpAnimationToolBar->setEnabled(false);
mpAnimationWindowContainer->hide();
}

/*!
Expand All @@ -3015,8 +2969,6 @@ void MainWindow::switchToModelingPerspective()
mpModelWidgetContainer->currentModelWidgetChanged(mpModelWidgetContainer->getCurrentMdiSubWindow());
mpVariablesDockWidget->hide();
mpPlotToolBar->setEnabled(false);
mpAnimationToolBar->setEnabled(false);
mpAnimationWindowContainer->hide();

// In case user has tabbed the dock widgets then make LibraryWidget active.
QList<QDockWidget*> tabifiedDockWidgetsList = tabifiedDockWidgets(mpLibraryDockWidget);
Expand Down Expand Up @@ -3065,8 +3017,6 @@ void MainWindow::switchToPlottingPerspective()
*/
mpUndoAction->setEnabled(false);
mpRedoAction->setEnabled(false);
mpAnimationToolBar->setEnabled(false);
mpAnimationWindowContainer->hide();
mpModelSwitcherToolButton->setEnabled(false);
// if not plotwindow is opened then open one for user
if (mpPlotWindowContainer->subWindowList().size() == 0) {
Expand Down Expand Up @@ -3101,8 +3051,6 @@ void MainWindow::switchToAlgorithmicDebuggingPerspective()
mpModelWidgetContainer->currentModelWidgetChanged(mpModelWidgetContainer->getCurrentMdiSubWindow());
mpVariablesDockWidget->hide();
mpPlotToolBar->setEnabled(false);
mpAnimationToolBar->setEnabled(false);
mpAnimationWindowContainer->hide();
// In case user has tabbed the dock widgets then make LibraryWidget active.
QList<QDockWidget*> tabifiedDockWidgetsList = tabifiedDockWidgets(mpLibraryDockWidget);
if (tabifiedDockWidgetsList.size() > 0) {
Expand All @@ -3116,31 +3064,6 @@ void MainWindow::switchToAlgorithmicDebuggingPerspective()
}


/*!
* \brief MainWindow::switchToAnimationPerspective
* Switches to animation perspective.
*/
void MainWindow::switchToAnimationPerspective()
{
storePlotWindowsStateAndGeometry();
mpCentralStackedWidget->setCurrentWidget(mpAnimationWindowContainer);
mpAnimationWindowContainer->showWidgets();
mpAnimationToolBar->setEnabled(true);

mpPlotToolBar->setEnabled(false);
mpUndoAction->setEnabled(false);
mpRedoAction->setEnabled(false);
mpModelSwitcherToolButton->setEnabled(false);
mpVariablesDockWidget->hide();
mpStackFramesDockWidget->hide();
mpBreakpointsDockWidget->hide();
mpLocalsDockWidget->hide();
mpTargetOutputDockWidget->hide();
mpGDBLoggerDockWidget->hide();
mpWelcomePageWidget->hide();
}


/*!
* \brief MainWindow::closeAllWindowsButThis
* Closes all windows except the active window.
Expand Down Expand Up @@ -3270,6 +3193,7 @@ void MainWindow::createToolbars()
mpSimulationToolBar->addAction(mpSimulateModelAction);
mpSimulationToolBar->addAction(mpSimulateWithTransformationalDebuggerAction);
mpSimulationToolBar->addAction(mpSimulateWithAlgorithmicDebuggerAction);
mpSimulationToolBar->addAction(mpSimulateWithAnimationAction);
mpSimulationToolBar->addAction(mpSimulationSetupAction);
// Model Swithcer Toolbar
mpModelSwitcherToolBar = addToolBar(tr("ModelSwitcher Toolbar"));
Expand Down Expand Up @@ -3298,7 +3222,6 @@ void MainWindow::createToolbars()
mpPlotToolBar->addSeparator();
mpPlotToolBar->addAction(mpNewPlotWindowAction);
mpPlotToolBar->addAction(mpNewParametricPlotWindowAction);
mpPlotToolBar->addAction(mpButtonWindowAction);
mpPlotToolBar->addAction(mpAnimationWindowAction);
mpPlotToolBar->addSeparator();
mpPlotToolBar->addAction(mpExportVariablesAction);
Expand All @@ -3315,22 +3238,6 @@ void MainWindow::createToolbars()
mpTLMSimulationToolbar->addAction(mpAlignInterfacesAction);
mpTLMSimulationToolbar->addSeparator();
mpTLMSimulationToolbar->addAction(mpTLMCoSimulationAction);
// Animation Toolbar
mpAnimationToolBar = addToolBar(tr("Animation Toolbar"));
mpAnimationToolBar->setObjectName("Animation Toolbar");
mpAnimationToolBar->setAllowedAreas(Qt::TopToolBarArea);
// add actions to TLM Simulation Toolbar
mpAnimationToolBar->addAction(mpAnimationChooseFileAction);
mpAnimationToolBar->addSeparator();
mpAnimationToolBar->addAction(mpAnimationInitializeAction);
mpAnimationToolBar->addSeparator();
mpAnimationToolBar->addAction(mpAnimationPlayAction);
mpAnimationToolBar->addSeparator();
mpAnimationToolBar->addAction(mpAnimationPauseAction);
mpAnimationToolBar->addSeparator();
mpAnimationToolBar->addWidget(mpAnimationSlider);
mpAnimationToolBar->addWidget(mpAnimationTimeLabel);
connect(mpAnimationSlider, SIGNAL(sliderMoved(int)),mpAnimationWindowContainer, SLOT(sliderSetTimeSlotFunction(int)));
}


Expand Down Expand Up @@ -3537,18 +3444,3 @@ void AboutOMEditWidget::keyPressEvent(QKeyEvent *pEvent)
QWidget::keyPressEvent(pEvent);
}


/*!
* \brief MainWindow::updateAnimationTimeContent
* Displays the animation in mpAnimationTimeLabel and moves mpAnimationSlider
* Hides the widget when ESC key is pressed.
* \param pEvent
*/
void MainWindow::updateAnimationTimeContent(){
double time = mpAnimationWindowContainer->getVisTime();
double timeFrac = mpAnimationWindowContainer->getTimeFraction();
double sliderPos = timeFrac*(mpAnimationSlider->maximum() - mpAnimationSlider->minimum());
//std::cout<<"time "<<time<<" timeFrac "<<timeFrac<<" sliderPos "<<sliderPos<<std::endl;
mpAnimationTimeLabel->setText(QString("Time [s]: ").append(QString::number(time)));
mpAnimationSlider->setSliderPosition(sliderPos);
}
15 changes: 2 additions & 13 deletions OMEdit/OMEditGUI/MainWindow.h
View file
Expand Up @@ -151,6 +151,7 @@ class MainWindow : public QMainWindow
QAction* getSimulateModelAction() {return mpSimulateModelAction;}
QAction* getSimulateWithTransformationalDebuggerAction() {return mpSimulateWithTransformationalDebuggerAction;}
QAction* getSimulateWithAlgorithmicDebuggerAction() {return mpSimulateWithAlgorithmicDebuggerAction;}
QAction* getSimulateWithAnimationAction() {return mpSimulateWithAnimationAction;}
QAction* getSimulationSetupAction() {return mpSimulationSetupAction;}
QAction* getInstantiateModelAction() {return mpInstantiateModelAction;}
QAction* getCheckModelAction() {return mpCheckModelAction;}
Expand Down Expand Up @@ -296,6 +297,7 @@ class MainWindow : public QMainWindow
QAction *mpSimulateModelAction;
QAction *mpSimulateWithTransformationalDebuggerAction;
QAction *mpSimulateWithAlgorithmicDebuggerAction;
QAction *mpSimulateWithAnimationAction;
QAction *mpSimulationSetupAction;
// FMI Menu
QAction *mpExportFMUAction;
Expand Down Expand Up @@ -342,7 +344,6 @@ class MainWindow : public QMainWindow
QAction *mpReSimulateSetupAction;
QAction *mpNewPlotWindowAction;
QAction *mpNewParametricPlotWindowAction;
QAction *mpButtonWindowAction;
QAction *mpAnimationWindowAction;
QAction *mpClearPlotWindowAction;
QAction *mpExportVariablesAction;
Expand All @@ -354,11 +355,6 @@ class MainWindow : public QMainWindow
QAction *mpFetchInterfaceDataAction;
QAction *mpAlignInterfacesAction;
QAction *mpTLMCoSimulationAction;
// Animation Action
QAction* mpAnimationChooseFileAction;
QAction* mpAnimationInitializeAction;
QAction* mpAnimationPlayAction;
QAction* mpAnimationPauseAction;
// Toolbars
QMenu *mpRecentFilesMenu;
QMenu *mpLibrariesMenu;
Expand All @@ -372,11 +368,7 @@ class MainWindow : public QMainWindow
QMenu *mpModelSwitcherMenu;
QToolBar *mpPlotToolBar;
QToolBar *mpTLMSimulationToolbar;
QToolBar *mpAnimationToolBar;
QHash<QString, TransformationsWidget*> mTransformationsWidgetHash;
QTimer *renderTimer;
QSlider *mpAnimationSlider;
QLabel * mpAnimationTimeLabel;
public slots:
void createNewModelicaClass();
void openModelicaFile();
Expand Down Expand Up @@ -442,7 +434,6 @@ public slots:
void updateModelSwitcherMenu(QMdiSubWindow *pSubWindow);
void toggleAutoSave();
void readInterfaceData(LibraryTreeItem *pLibraryTreeItem);
void updateAnimationTimeContent();
private slots:
void perspectiveTabChanged(int tabIndex);
void documentationDockWidgetVisibilityChanged(bool visible);
Expand All @@ -451,7 +442,6 @@ private slots:
void switchToModelingPerspectiveSlot();
void switchToPlottingPerspectiveSlot();
void switchToAlgorithmicDebuggingPerspectiveSlot();
void switchToAnimationPerspectiveSlot();
void showConfigureDialog();
void showAttachToProcessDialog();
private:
Expand All @@ -464,7 +454,6 @@ private slots:
void switchToModelingPerspective();
void switchToPlottingPerspective();
void switchToAlgorithmicDebuggingPerspective();
void switchToAnimationPerspective();
void closeAllWindowsButThis(QMdiArea *pMdiArea);
void tileSubWindows(QMdiArea *pMdiArea, bool horizontally);
void fetchInterfaceDataHelper(LibraryTreeItem *pLibraryTreeItem);
Expand Down
2 changes: 2 additions & 0 deletions OMEdit/OMEditGUI/Util/Helper.cpp
View file
Expand Up @@ -196,6 +196,8 @@ QString Helper::simulateWithTransformationalDebugger;
QString Helper::simulateWithTransformationalDebuggerTip;
QString Helper::simulateWithAlgorithmicDebugger;
QString Helper::simulateWithAlgorithmicDebuggerTip;
QString Helper::simulateWithAnimation;
QString Helper::simulateWithAnimationTip;
QString Helper::simulationSetup;
QString Helper::simulationSetupTip;
QString Helper::simulation;
Expand Down
2 changes: 2 additions & 0 deletions OMEdit/OMEditGUI/Util/Helper.h
View file
Expand Up @@ -202,6 +202,8 @@ class Helper : public QObject
static QString simulateWithTransformationalDebuggerTip;
static QString simulateWithAlgorithmicDebugger;
static QString simulateWithAlgorithmicDebuggerTip;
static QString simulateWithAnimation;
static QString simulateWithAnimationTip;
static QString simulationSetup;
static QString simulationSetupTip;
static QString simulation;
Expand Down
1 change: 1 addition & 0 deletions OMEdit/OMEditGUI/resource_omedit.qrc
View file
Expand Up @@ -25,6 +25,7 @@
<file>Resources/icons/simulate.svg</file>
<file>Resources/icons/simulate-equation.svg</file>
<file>Resources/icons/simulate-debug.svg</file>
<file>Resources/icons/simulate-animation.png</file>
<file>Resources/icons/simulation-center.svg</file>
<file>Resources/css/stylesheet.qss</file>
<file>Resources/icons/check.svg</file>
Expand Down

0 comments on commit 531b4cb

Please sign in to comment.