Commit 5be972a8 authored by Emmanuel Promayon's avatar Emmanuel Promayon

FIXED conflicts with current develop

parents 67afeef4 4f37ebc3
......@@ -614,7 +614,7 @@ void ImpMainWindow::saveHistoryAsSCXML() {
Application::saveHistoryAsSXML();
}
// ------------------------- openDataDirectoryMenuBuilder ---------------------------
// ------------------------- updateOpenDirectoryMenu ---------------------------
void ImpMainWindow::updateOpenDirectoryMenu() {
QStringList dirExt = ExtensionManager::getDataDirectoryExtNames();
......
......@@ -119,26 +119,24 @@ public slots:
///@}
protected:
/** @name initialization/update methods */
///@{
/// update the viewer's menu
void updateViewMenu();
/** @name Extension and ComponentPlugin attributes */
///@{
/// update the ioen data directory menu depending on registered plugins
/// update the open data directory menu depending on registered plugins
void updateOpenDirectoryMenu();
/// update the recent document menu
void updateRecentDocumentsMenu();
///@}
/** @name initialization/update methods */
///@{
/// set the current QAction enable state depending on the current selection
void updateActionStates();
///@}
/** initializes all QActions of the application */
void initActions();
///@}
/// the main toolbar
QToolBar* mainToolbar;
......
......@@ -64,20 +64,20 @@ public:
static const QStringList getComponentDirectories();
/** get all the action directories. It gets all the valid directories
* where components are installed, and insert them in this particular order:
* where actions are installed, and insert them in this particular order:
* 1. current working directory (build install tree)
* 2. user config directory (user install tree)
* 3. CamiTK SDK installation directory (global install tree)
*/
static const QStringList getActionDirectories();
/** get all the viewers directories. It gets all the valid directories
* where components are installed, and insert them in this particular order:
* 1. current working directory (build install tree)
* 2. user config directory (user install tree)
* 3. CamiTK SDK installation directory (global install tree)
*/
static const QStringList getViewerDirectories();
/** get all the viewers directories. It gets all the valid directories
* where viewers are installed, and insert them in this particular order:
* 1. current working directory (build install tree)
* 2. user config directory (user install tree)
* 3. CamiTK SDK installation directory (global install tree)
*/
static const QStringList getViewerDirectories();
/** Get a valid camitk test data directory name. It returns the first valid
* test data directory that is found. Checking is done in this particular order:
......
/*****************************************************************************
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2018 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
* This file is part of CamiTK.
*
* CamiTK is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* CamiTK is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with CamiTK. If not, see <http://www.gnu.org/licenses/>.
*
* $CAMITK_LICENCE_END$
****************************************************************************/
// -- Core stuff
#include <Application.h>
#include <MainWindow.h>
#include <Core.h>
#include <Action.h>
using namespace camitk;
#include <TextViewer.h>
#include <QMenuBar>
/** This program demonstrates how to build a CamiTK Application with only
* one viewer. This particular Viewer is the demo viewer MyViewer.
*
* The program also show how you can add a simple menu with three items:
* - fileOpen to open any known component file
* - editPreference that automatically show all the default application preferences
* (i.e. the list of installed extensions) and all the viewers' preferences
* In this example the viewer preferences are just the choice of colors.
* - the viewer menu which is build by the viewer. In this example, it contains
* only one item (a checkbox to inverse the colors)
*/
int main(int argc, char* argv[]) {
// create a camitk application
Application a("textviewer-tutorial", argc, argv);
// create a textViewer instance
Viewer* textViewer = Application::getViewer("TextViewer");
// add myViewer to the main window
a.getMainWindow()->setCentralViewer(textViewer);
// get the open action
QAction* fileOpen = Application::getAction("Open")->getQAction();
// get the edit preferences action
QAction* editPreference = new QAction("&Edit Preferences...", a.getMainWindow());
a.getMainWindow()->connect(editPreference, SIGNAL(triggered()), textViewer, SLOT(editPreference()));
// create menu
QMenu* simpleMenu = new QMenu("&Simple Menu");
simpleMenu->addAction(fileOpen);
simpleMenu->addAction(editPreference);
simpleMenu->addMenu(textViewer->getMenu()); // add the viewer menu
a.getMainWindow()->menuBar()->addMenu(simpleMenu);
// open an image volume
Application::open(Core::getTestDataDir() + "/brain.mha");
// let's go!
return a.exec();
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment