From 45dc67224cd8b9dc058e34a2768262dd6cd8db94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 25 Feb 2009 14:36:24 +0000 Subject: [PATCH] Dennis: Various Log Viewer fixes git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5066 383ad7c9-94d9-4d36-a494-682f7c89f535 --- Core/Core.cc | 12 +- Core/Core.hh | 4 +- Core/ParseIni.cc | 8 +- Core/optionHandling.cc | 2 +- OpenFlipper.cc | 2 +- Subdivision.tag | 1340 +++++++++++++++++------- common/GlobalOptions.cc | 14 +- common/GlobalOptions.hh | 15 +- widgets/coreWidget/CoreWidget.cc | 115 +- widgets/coreWidget/CoreWidget.hh | 7 +- widgets/glWidget/QtSlideWindow.cc | 14 +- widgets/optionsWidget/optionsWidget.cc | 8 +- 12 files changed, 1116 insertions(+), 425 deletions(-) diff --git a/Core/Core.cc b/Core/Core.cc index 12c0634e..460194a7 100644 --- a/Core/Core.cc +++ b/Core/Core.cc @@ -752,9 +752,13 @@ void Core::fullscreen( bool _state ) { //----------------------------------------------------------------------------- -void Core::showLogger(bool _state) { - if ( OpenFlipper::Options::gui() ) - coreWidget_->showLogger( _state ); +void Core::loggerState(int _state) { + OpenFlipper::Options::LoggerState state = static_cast (_state); + if ( OpenFlipper::Options::gui() && + (state == OpenFlipper::Options::Hidden || + state == OpenFlipper::Options::InScene || + state == OpenFlipper::Options::Normal)) + coreWidget_->showLogger(state); } //----------------------------------------------------------------------------- @@ -1070,7 +1074,7 @@ void Core::setDescriptions(){ emit setSlotDescription("fullscreen(bool)", "Enable or disable fullscreen mode", QStringList("enabled") , QStringList("Enable or disable fullscreen mode")); - emit setSlotDescription("showLogger(bool)", "Show or hide logger window", QStringList("Show or hide logger window"), QStringList()); + emit setSlotDescription("loggerState(int)", "Change the logger window state", QStringList("Change the logger window state"), QStringList()); emit setSlotDescription("showToolbox(bool)", "Show or hide toolbox", QStringList("Show or hide the toolbox"), QStringList()); emit setSlotDescription("multiViewMode(int)", "Switch MultiView Mode", QStringList("Mode"), QStringList("0: One Viewer\n 1: Grid \n 2: Horizontal split")); diff --git a/Core/Core.hh b/Core/Core.hh index ae9bea9e..51d4e8a3 100644 --- a/Core/Core.hh +++ b/Core/Core.hh @@ -273,8 +273,8 @@ public slots: /// set fullscreen mode void fullscreen( bool _state ); - /// Hide or show logging window - void showLogger(bool _state); + /// Change the logging window state + void loggerState(int _state); /// Show or hide toolbox void showToolbox( bool _state ); diff --git a/Core/ParseIni.cc b/Core/ParseIni.cc index 56a80daf..c1c3e092 100644 --- a/Core/ParseIni.cc +++ b/Core/ParseIni.cc @@ -164,9 +164,9 @@ void Core::readApplicationOptions(INIFile& _ini) { //============================================================================ // Load the setting for the loger window //============================================================================ - bool hideLogger = false; - if ( _ini.get_entry( hideLogger, "Options" , "HideLogger") ) - OpenFlipper::Options::hideLogger(hideLogger); + int loggerState = 0; + if ( _ini.get_entry( loggerState, "Options" , "LoggerState") ) + OpenFlipper::Options::loggerState(static_cast (loggerState)); //============================================================================ // Load the setting for the toolbox window @@ -470,7 +470,7 @@ void Core::writeApplicationOptions(INIFile& _ini) { draw_modes = drawModeToList( OpenFlipper::Options::standardDrawMode() ); _ini.add_entry("Options","StandardDrawModes",draw_modes); - _ini.add_entry("Options","HideLogger", OpenFlipper::Options::hideLogger() ); + _ini.add_entry("Options","LoggerState", OpenFlipper::Options::loggerState() ); _ini.add_entry("Options","HideToolbox", OpenFlipper::Options::hideToolbox() ); // check if we are in fullscreen mode: diff --git a/Core/optionHandling.cc b/Core/optionHandling.cc index f8e7396e..d4641cf3 100644 --- a/Core/optionHandling.cc +++ b/Core/optionHandling.cc @@ -69,7 +69,7 @@ void Core::applyOptions(){ coreWidget_->setWindowState( (coreWidget_->windowState() | Qt::WindowFullScreen) ^ Qt::WindowFullScreen); // Logger - coreWidget_->showLogger( !OpenFlipper::Options::hideLogger() ); + coreWidget_->showLogger( OpenFlipper::Options::loggerState() ); // Prepare Picking Debugger Flag ACG::SceneGraph::PickTarget target; diff --git a/OpenFlipper.cc b/OpenFlipper.cc index 8b3249ea..0361ccbc 100644 --- a/OpenFlipper.cc +++ b/OpenFlipper.cc @@ -234,7 +234,7 @@ bool parseCommandLineOptions(CSimpleOpt& args){ OpenFlipper::Options::hideToolbox(true); break; case OPT_HIDDDEN_LOGGER: - OpenFlipper::Options::hideLogger(true); + OpenFlipper::Options::loggerState(OpenFlipper::Options::Hidden); break; case OPT_FULLSCREEN: OpenFlipper::Options::fullScreen(true); diff --git a/Subdivision.tag b/Subdivision.tag index 527d74bf..1b8b0970 100644 --- a/Subdivision.tag +++ b/Subdivision.tag @@ -19,14 +19,21 @@ /data/home1/moebius/projects/OpenFlipper/OpenFlipper/BasePlugin/ PluginFunctions_8hh OpenFlipper/common/Types.hh - OpenFlipper/common/ViewerProperties.hh PluginFunctions PluginFunctions::ObjectIterator + PluginFunctions::BaseObjectIterator DLLEXPORT ObjectIterator - objects_end + objectsEnd namespacePluginFunctions.html - d1ebd6bab5cdb61704584c9f7a8fa1e3 + 25c8015c612b1aaf3a840ca072ce68ca + () + + + DLLEXPORT BaseObjectIterator + baseObjectsEnd + namespacePluginFunctions.html + 0170e02e7bd4ef07a4b3718d82ef4978 () @@ -38,9 +45,9 @@ bool - get_picked_object + getPickedObject namespacePluginFunctions.html - 5a5a6830d7f7289647fa6fecec7ab36c + f54bc387d31df6054829e57377bb617d (const unsigned int _node_idx, BaseObjectData *&_object) @@ -66,79 +73,86 @@ bool - get_source_identifiers + getSourceIdentifiers namespacePluginFunctions.html - 585008c20534d0ac70ffd428bdbb14ef + 949b8b558e9119de7bf9cb26326fa4e0 (std::vector< int > &_identifiers) bool - get_target_identifiers + getTargetIdentifiers namespacePluginFunctions.html - 7845369871c9fb0596dbc1c52aaf45c1 + b71e4cf2dd51eb0281b2f7b9d243dcb2 (std::vector< int > &_identifiers) bool - get_all_meshes + getAllMeshes namespacePluginFunctions.html - ca145e68854ad4b3be4fec112737e08c + bd08c0d79cb35d559e76c3c3b822ac58 (std::vector< int > &_identifiers) - bool - get_all_object_identifiers + DLLEXPORT bool + getAllObjectIdentifiers namespacePluginFunctions.html - c42895597dc095942768517d7aa70cf4 + 79c4165f279935b30fe6d3db99ae04d3 (std::vector< int > &_identifiers) bool - get_object + getObject namespacePluginFunctions.html - 634e1aa080dbbd82e96144b0483fd085 + 457fae57adecd43d140a3328ee935df3 (const int _identifier, BaseObject *&_object) bool - get_object + getObject namespacePluginFunctions.html - 17125357788f11bf91380cd146aa6a3d + 14147706f895f469852959e21f29e7fc (const int _identifier, BaseObjectData *&_object) - bool - object_exists + DLLEXPORT bool + objectExists namespacePluginFunctions.html - 924e6965de6c3a36291811c121ded9df + 839512f6451ed80e09d4cc2b1e6324ab (const int _identifier) int - object_count + objectCount namespacePluginFunctions.html - 7c8f86352f3912f2d11f94e00d9fb2c6 + 5bbfd68dc2841f7e3256d14b716a06ae () int - target_count + targetCount namespacePluginFunctions.html - 45a2037e6dfdbed46d38bb95b22a947c + 1cf8f6cdf2dcb91bbed498d53d2d382c () int - source_count + sourceCount namespacePluginFunctions.html - 48e21304e2102dbb519d71e644fbb453 + 3fdc4340584fcb0f039d8c141b2d3de2 () int - visible_count + visibleCount namespacePluginFunctions.html - 211e3474ca5477b24af33f3cf0afe654 + a394f1c74b7eed4a844d2cbc78a010f7 + () + + + int + viewers + namespacePluginFunctions.html + 79838d9a4e7a09b4de2a2e2c043f1a9c () @@ -157,16 +171,16 @@ bool - scenegraph_pick + scenegraphPick namespacePluginFunctions.html - e20d1424a44165838009bc1828f982ff + 093d540f6cd68dce6b43417c563ceb8d (ACG::SceneGraph::PickTarget _pickTarget, const QPoint &_mousePos, unsigned int &_nodeIdx, unsigned int &_targetIdx, ACG::Vec3d *_hitPointPtr=0) bool - scenegraph_pick + scenegraphPick namespacePluginFunctions.html - da942b5e50f2ca047ed4fc54b6834e51 + c3421597cd5815f735d768c9c1b68933 (const unsigned int _examiner, ACG::SceneGraph::PickTarget _pickTarget, const QPoint &_mousePos, unsigned int &_nodeIdx, unsigned int &_targetIdx, ACG::Vec3d *_hitPointPtr=0) @@ -204,13 +218,6 @@ 354c6201d4629d6607ebd0a43d2125e2 (const unsigned int _examiner, std::string _mode) - - ACG::GLState & - glState - namespacePluginFunctions.html - 42afb52dcbd4fef6986d372f2f8118f8 - () - void getCurrentViewImage @@ -260,13 +267,6 @@ a7ad2d5b69ca3cc449a3e702fb4e5d4f () - - Viewer::ViewerProperties & - viewerProperties - namespacePluginFunctions.html - 897bdc5ebf036348c0e543380c2a6cfa - (int _id) - void allowRotation @@ -275,172 +275,122 @@ (bool _mode) - void - setMainGLContext - namespacePluginFunctions.html - bf5a1e13a33047b0af8399456e5363a0 - () - - - void - viewingDirection - namespacePluginFunctions.html - 30c72bddf5bcdd6b39abe24e6b8267a7 - (const ACG::Vec3d &_dir, const ACG::Vec3d &_up) - - - void - setScenePos - namespacePluginFunctions.html - 0b648e6b44a59282e5edfc8eda51c675 - (const ACG::Vec3d &_center, const double _radius) - - - void - setScenePos - namespacePluginFunctions.html - a6fa94d1d14e272693d9d12138fb88c2 - (const ACG::Vec3d &_center) - - - const ACG::Vec3d & - sceneCenter - namespacePluginFunctions.html - f8548472c36e305d995dbd7531a8d1e0 - () - - - double - sceneRadius - namespacePluginFunctions.html - 259318bab04fb94a356fa923384f36bf - () - - - void - translate + QPoint + mapToGlobal namespacePluginFunctions.html - d53f8c6306496ee49021ae68d8873fc7 - (const ACG::Vec3d &_vector) + 499ada11f6b60e736f314d03395dd808 + (const QPoint _point) - void - rotate + QPoint + mapToLocal namespacePluginFunctions.html - 5edf7564992ebddd3e5b5ed4207c72bc - (const ACG::Vec3d &_axis, const double _angle, const ACG::Vec3d &_center) + 6da01f4b28ec6cca2a6699cd7c93f244 + (const QPoint _point) void - viewHome + setDataRoot namespacePluginFunctions.html - 9ad0d550a7d8849130166a8b0c8470d3 - () + 500a4c2660d974cc5d9ab8ea0604a5ff + (BaseObject *_root) - void - viewAll + BaseObjectData * + baseObjectData namespacePluginFunctions.html - c4811a358a7fcd79f1b8ea2b6fdfb8e3 - () + ffb238a514f9754ca2a3680ccb4b59a4 + (BaseObject *_object) + + + RPCWrappers.hh + /data/home1/moebius/projects/OpenFlipper/OpenFlipper/BasePlugin/ + RPCWrappers_8hh + RPC - ACG::Vec3d - viewingDirection - namespacePluginFunctions.html - 74db7476ef45e6a94c2a3556ca362551 + QScriptEngine * + getScriptEngine + namespaceRPC.html + f304d9b8acaf062a11d5c6e86e26d604 () - ACG::Vec3d - eyePos - namespacePluginFunctions.html - c7b81abe92e8f2e4f5d07c6b6ba48f46 - () + QScriptValue + callFunction + namespaceRPC.html + e1cebc67ceb99d35de2019d715df84ae + (QString _plugin, QString _functionName) - ACG::Vec3d - upVector - namespacePluginFunctions.html - 67be45b4919eb692a281fd7ee1ca4a1e - () + QScriptValue + callFunction + namespaceRPC.html + 01e60295c1a3a9392b0a952e98a2b4cd + (QString _plugin, QString _functionName, std::vector< QScriptValue > _parameters) void - orthographicProjection - namespacePluginFunctions.html - 642fd4181e6702ade84257495b56f9c2 - () + callFunction + namespaceRPC.html + 6163023fc134501980dc8dd2d0ecb10c + (QString _plugin, QString _functionName, T0 _t0) void - perspectiveProjection - namespacePluginFunctions.html - 7ec716d6a176219b3937994a91ac169a - () + callFunction + namespaceRPC.html + d261db93cb95ed7caa5cb83e4c2d1a0e + (QString _plugin, QString _functionName, T0 _t0, T1 _t1) void - setDrawMode - namespacePluginFunctions.html - a0d5f7587ac6b1cdd1ae5a84feb428ef - (const unsigned int _mode) - - - unsigned int - drawMode - namespacePluginFunctions.html - 43d94fd55d1a0e22c5c9cba49c52c66b - () + callFunction + namespaceRPC.html + 7bbc7f5cca6c4634e14ec498bb8c4afa + (QString _plugin, QString _functionName, T0 _t0, T1 _t1, T2 _t2) void - setGlobalDrawMode - namespacePluginFunctions.html - 47c8bcb0fcca09628f1f9470906d27df - (const unsigned int _mode) + callFunction + namespaceRPC.html + 88f136b1547274daa6c584a97bc55ae5 + (QString _plugin, QString _functionName, T0 _t0, T1 _t1, T2 _t2, T3 _t3) - void - setBackColor - namespacePluginFunctions.html - 37a6e72ec175b6ae536f99aa0ca38f61 - (OpenMesh::Vec4f _color) + ReturnValue + callFunctionValue + namespaceRPC.html + 4849b4603b17d2a8b4749978a59101fe + (QString _plugin, QString _functionName) - QPoint - mapToGlobal - namespacePluginFunctions.html - 499ada11f6b60e736f314d03395dd808 - (const QPoint _point) + ReturnValue + callFunctionValue + namespaceRPC.html + aa3f04f79f84e88db1861f74156cb42e + (QString _plugin, QString _functionName, T0 _t0) - QPoint - mapToLocal - namespacePluginFunctions.html - 6da01f4b28ec6cca2a6699cd7c93f244 - (const QPoint _point) + ReturnValue + callFunctionValue + namespaceRPC.html + c8ec66eb93e570ff5e7dc510da6617da + (QString _plugin, QString _functionName, T0 _t0, T1 _t1) - void - flyTo - namespacePluginFunctions.html - b06ba401a82fc57b90afa01f9e29af07 - (const ACG::Vec3d &_position, const ACG::Vec3d &_center, double _time) + ReturnValue + callFunctionValue + namespaceRPC.html + f999327657a8bc7ba27d429f9409feaa + (QString _plugin, QString _functionName, T0 _t0, T1 _t1, T2 _t2, T3 _t3) void - setDataRoot - namespacePluginFunctions.html - 500a4c2660d974cc5d9ab8ea0604a5ff - (BaseObject *_root) - - - BaseObjectData * - baseObjectData - namespacePluginFunctions.html - ffb238a514f9754ca2a3680ccb4b59a4 - (BaseObject *_object) + setScriptEngine + namespaceRPC.html + a2690ae5183818a8ad2e2f175d425968 + (QScriptEngine *_engine) @@ -493,16 +443,16 @@ GlobalDefines_8hh #define - OM_FORCE_STATIC_CAST + GCC_VERSION GlobalDefines_8hh.html - 9ea21f5ddf8cd6c7e8abd4c48673fcab + dbba0f726fc66d7100916c683b7568ae #define - USE_OPENMP + OM_FORCE_STATIC_CAST GlobalDefines_8hh.html - 01df339826abe970836832ae79e5f894 + 9ea21f5ddf8cd6c7e8abd4c48673fcab @@ -616,6 +566,13 @@ 2edc0f88cd2fd6afc2b50bd44fdf58eb () + + QIcon & + OpenFlipperIcon + namespaceOpenFlipper_1_1Options.html + c5ed65be932af2a2b2dc4d4fd7de065c + () + QString fontsDirStr @@ -840,6 +797,13 @@ cd2f1faa7f12cc12634bbb92db06f8c5 () + + bool + isDarwin + namespaceOpenFlipper_1_1Options.html + e2a6e277c3e54ef8b27ced4c607e1ecc + () + QString dirSeparator @@ -903,48 +867,6 @@ 2f2d3cc7de72adbf2f4ac9356aa6c530 () - - void - animation - namespaceOpenFlipper_1_1Options.html - fed0d617d9db544bd778fc02d9c837ff - (bool _animation) - - - bool - animation - namespaceOpenFlipper_1_1Options.html - bb52e0e9b838fef19c63f6c8b1e189f0 - () - - - void - backfaceCulling - namespaceOpenFlipper_1_1Options.html - ed6ed751e36ab95a29bf423cb2f85021 - (bool _backfaceCulling) - - - bool - backfaceCulling - namespaceOpenFlipper_1_1Options.html - 73c17200256f7609fb79c2b654bf077a - () - - - void - twoSidedLighting - namespaceOpenFlipper_1_1Options.html - fce9476037e3dc278bf3012858361a38 - (bool _twoSidedLighting) - - - bool - twoSidedLighting - namespaceOpenFlipper_1_1Options.html - 763cc9f51b329e7a24b320a66928aa05 - () - void wheelZoomFactor @@ -1756,6 +1678,7 @@ ViewerProperties.hh /data/home1/moebius/projects/OpenFlipper/OpenFlipper/common/ ViewerProperties_8hh + OpenFlipper/common/GlobalDefines.hh Viewer::ViewerProperties PickingMode @@ -1848,14 +1771,15 @@ Plugin Interfaces interfaces KeyPlugin + RPCPlugin BasePlugin ToolboxPlugin MousePlugin PickingPlugin TexturePlugin INIPlugin - MenubarPlugin LoggingPlugin + MenubarPlugin pluginProgramming @@ -1936,6 +1860,13 @@ c500b033dc68fb00ed571f0424f954a4 (int) + + virtual void + visibilityChanged + classBaseInterface.html + bde4f5e0eb032df25cee02f78e696b3d + () + virtual void activeObjectChanged @@ -3095,6 +3026,13 @@ 4ba499f73a95a5595519e20fbbaf1677 () + + void + readGUIOptions + classCore.html + 92d93955c4a8e4873c687236c5e416ec + (INIFile &_ini) + void readApplicationOptions @@ -3158,27 +3096,6 @@ ce1115b7dac51436b408bc2fd0bd4230 () - - void - translate - classCore.html - ac6e21d790ce73a00b603e8d872672df - (Vector _vec) - - - void - rotate - classCore.html - 9d64d351cf75351b720abe57b65f591b - (Vector _axis, double _angle, Vector _center) - - - void - setViewingDirection - classCore.html - 48819454934fd4b7cf8e9367ed20d97a - (Vector _direction, Vector _upvector) - void fullscreen @@ -3202,10 +3119,10 @@ void - setDrawMode + multiViewMode classCore.html - 23b2b4eb6e23a58e8869df5daea4c5fc - (QString _mode) + e2a9f86c1727d8687388c0baa9b78e55 + (int _mode) void @@ -3487,6 +3404,13 @@ c86dff1812e25d8afeaf1e20de0cdc86 (int _identifier) + + void + slotVisibilityChanged + classCore.html + 48ced2c370c1160ec8739b05412a6247 + () + void slotActiveObjectChanged @@ -3806,6 +3730,13 @@ 5f8996f83bc9c2e625c04bc007ca92a9 + + bool + shiftPressed_ + classCoreWidget.html + ad0b57e8c9f9caf14200df011a4cf289 + + void loadKeyBindings @@ -4130,17 +4061,31 @@ void - updateGlobalOptions + changeBackgroundColor classCoreWidget.html - 413c073ba2419770eb430012e22dc7ab + a79f7f9d75b8525d95c322b03a792cfe () void - changeBackgroundColor + slotChangeAnimation classCoreWidget.html - a79f7f9d75b8525d95c322b03a792cfe - () + 58d00f8fd95415f49db9a5465ca79b50 + (bool _animation) + + + void + slotChangeBackFaceCulling + classCoreWidget.html + c00ec81c76d1ccd505816bc755ed624e + (bool _backFaceCulling) + + + void + slotChangeTwoSidedLighting + classCoreWidget.html + d16aba88f828ca01b2c30062a24ef55e + (bool _lighting) void @@ -4667,6 +4612,20 @@ 802a6c37b67d8c6b22f8d6a3869aa160 + + QtSlideWindow * + slidingLogger_ + classCoreWidget.html + 11204888c9ec1d531e1d9186fa5e80f0 + + + + QWidget * + tempLogWidget + classCoreWidget.html + 4c50e773e01d9c21868359ad171e0a9a + + ACG::QtWidgets::QtSceneGraphDialog * sceneGraphDialog_ @@ -4811,10 +4770,17 @@ 5ed9d6acc10a25f0b2488d0587e3840a (int, QString)=0 - - virtual QWidget * - saveOptionsWidget - classFileInterface.html + + virtual + ~FileInterface + classFileInterface.html + e65a01c7d0f025d504acb88dc8e223f4 + () + + + virtual QWidget * + saveOptionsWidget + classFileInterface.html 7c833c5577f76b7fcdeb43ef03fb4b2a (QString)=0 @@ -5100,10 +5066,10 @@ (const std::string &_name, bool _mouseTracking) - Viewer::ViewerProperties + Viewer::ViewerProperties & properties_ classglViewer.html - d28fbefa8fbd0e360da20175493ffcb7 + a9ce09d920545983b8fe8f439f866ce9 @@ -5419,8 +5385,8 @@ glViewer classglViewer.html - a2cf4ae4c2c221a96e2b8eff892cf653 - (QtGLGraphicsScene *_scene, QGLWidget *_glWidget, QGraphicsWidget *_parent=0, const char *_name=0, QStatusBar *_statusBar=0) + 94402cf84761f0f4df9854e67da5d9e5 + (QtGLGraphicsScene *_scene, QGLWidget *_glWidget, Viewer::ViewerProperties &_properties, QGraphicsWidget *_parent=0, const char *_name=0, QStatusBar *_statusBar=0) virtual @@ -6715,6 +6681,13 @@ 45b6a3e59f49fe5d6c522d27fe102d86 (QStringList &) + + virtual + ~LoadSaveInterface + classLoadSaveInterface.html + e1002bcd9c8b19677c560cb7834d625e + () + virtual void fileOpened @@ -6758,6 +6731,13 @@ d9724024d8924ba7bb70f6ba8f8c2de9 (QString)=0 + + virtual + ~LoggingInterface + classLoggingInterface.html + 0098b23e68799067757bd0dce5fb52b7 + () + virtual void logOutput @@ -7156,8 +7136,8 @@ QtGLGraphicsScene classQtGLGraphicsScene.html - ab9ea27b34b8691562b5d5027d0e65f1 - (std::vector< glViewer * > *_views) + 4532a92487fbe3c5b024c4d1e511ed99 + (std::vector< glViewer * > *_views, QtMultiViewLayout *_layout) virtual void @@ -7205,8 +7185,8 @@ glViewer * findView classQtGLGraphicsScene.html - 2cd9123f872fd669320b3caafb66c710 - (const QPointF &p) + 09a14a5812de53d4b9aa3e01ccde3bf4 + (const QPointF &_p, bool _setActive=false) std::vector< glViewer * > * @@ -7215,6 +7195,13 @@ a03f0031f03479a525adbac1e8dbd29c + + QtMultiViewLayout * + layout_ + classQtGLGraphicsScene.html + cfcd405b55b329ac28c1bf18e575bfdf + + QtGLGraphicsView @@ -7343,6 +7330,157 @@ + + QtGraphicsButton + classQtGraphicsButton.html + + void + pressed + classQtGraphicsButton.html + f2c5455500ce2cc533e8ca32a2543ac8 + () + + + + QtGraphicsButton + classQtGraphicsButton.html + 8203c3642ad838f710b79084b4d63908 + (const QImage &_image, QGraphicsItem *_parent=0, int _width=-1, int _height=-1) + + + virtual QRectF + boundingRect + classQtGraphicsButton.html + db92807e8ce12d233fae1181f07b9617 + () const + + + virtual void + paint + classQtGraphicsButton.html + 89bcccba3c6148a1ff1e3db07d518f80 + (QPainter *_painter, const QStyleOptionGraphicsItem *_option, QWidget *_widget=0) + + + virtual void + hoverEnterEvent + classQtGraphicsButton.html + 7c4ce50a6d6a58220d29494d3ed8e7c0 + (QGraphicsSceneHoverEvent *_event) + + + virtual void + hoverLeaveEvent + classQtGraphicsButton.html + 3806d69aa197a368b38d0b4f4bd9bedc + (QGraphicsSceneHoverEvent *_event) + + + virtual void + mousePressEvent + classQtGraphicsButton.html + 8287bcc8aba5109850d88ab24eab7332 + (QGraphicsSceneMouseEvent *_event) + + + virtual void + mouseReleaseEvent + classQtGraphicsButton.html + b57081e33213bb8bfdf7cf70318f9c5e + (QGraphicsSceneMouseEvent *_event) + + + virtual QVariant + itemChange + classQtGraphicsButton.html + 61a15bfcd1257cad39125be7be302cd1 + (GraphicsItemChange _change, const QVariant &_value) + + + void + setCheckable + classQtGraphicsButton.html + 54e9d5558a3d64eb0abd6445b8acdfa9 + (bool _value) + + + void + setChecked + classQtGraphicsButton.html + 2f2095734e75d5c582f83e1d65e2a4d2 + (bool _value) + + + bool + isChecked + classQtGraphicsButton.html + ac839a015cc781f256c1201e6ebce520 + () const + + + bool + checkable_ + classQtGraphicsButton.html + 14f70b83b19e3e77e4bfd076d89bf792 + + + + bool + checked_ + classQtGraphicsButton.html + 0032e1fc460e34fb49d582208f2f236a + + + + bool + pressed_ + classQtGraphicsButton.html + 8efecdbded7d30fc8f8685d79f992253 + + + + bool + over_ + classQtGraphicsButton.html + a6ab67f2a2c4a7919e0fa4bcddae41d1 + + + + int + width_ + classQtGraphicsButton.html + 1ac56ed7c1500a3d3cc125591f2f1b1d + + + + int + height_ + classQtGraphicsButton.html + fbe4c890d328b1475ef90fad6950f673 + + + + QPixmap + normalPix_ + classQtGraphicsButton.html + d1552558a745fa2f258b6b21a4170f0c + + + + QPixmap + overPix_ + classQtGraphicsButton.html + c2df1f7b5c29d8da7656021198563419 + + + + QPixmap + checkedPix_ + classQtGraphicsButton.html + f8e3957bc2b6518290eeca5ed75a4844 + + + QtMultiViewLayout classQtMultiViewLayout.html @@ -7451,6 +7589,157 @@ [4] + + QtSlideWindow + classQtSlideWindow.html + + + QtSlideWindow + classQtSlideWindow.html + fead5916fba62a8fd75927631329c88e + (QString _name=0, QGraphicsItem *_parent=0) + + + void + updateGeometry + classQtSlideWindow.html + 1ce4662787acb07ef19cdb2f788e3932 + () + + + void + attachWidget + classQtSlideWindow.html + baac412f54edf8f16c8185c4ee132573 + (QWidget *_m) + + + void + detachWidget + classQtSlideWindow.html + 480341dcbe14a429d6476128068d5e73 + () + + + void + detachPressed + classQtSlideWindow.html + f95b1c400e286b5487dc62f9ee15a0fb + () + + + void + dialogClosed + classQtSlideWindow.html + 91ab018325d1eda01c0d8fce53fec4e7 + () + + + void + autohidePressed + classQtSlideWindow.html + 549df7b3cd42b98a1a6101244d9f66b1 + () + + + virtual void + paintWindowFrame + classQtSlideWindow.html + f6a432c0ffdda4fd12617d7e5421eeaf + (QPainter *_painter, const QStyleOptionGraphicsItem *_option, QWidget *_widget=0) + + + virtual bool + windowFrameEvent + classQtSlideWindow.html + 18f52538ccd58064d7262f765ea143f8 + (QEvent *_e) + + + virtual Qt::WindowFrameSection + windowFrameSectionAt + classQtSlideWindow.html + 47ec299a1d88ac734055fcb8cd399800 + (const QPointF &_pos) const + + + virtual void + hoverEnterEvent + classQtSlideWindow.html + a6a75282465cc6eff10f1b70bd4f06d0 + (QGraphicsSceneHoverEvent *_event) + + + virtual void + hoverLeaveEvent + classQtSlideWindow.html + af32cdf3d808a21b81cd1c19b48f3ae6 + (QGraphicsSceneHoverEvent *_event) + + + virtual void + resizeEvent + classQtSlideWindow.html + f1559e6e37ec6e4c10992389c0958d9a + (QGraphicsSceneResizeEvent *_event) + + + virtual void + moveEvent + classQtSlideWindow.html + 66eaa223ffa9ca70891bec3440b6adfc + (QGraphicsSceneMoveEvent *_event) + + + QString + name_ + classQtSlideWindow.html + 5a2e3f7f9371fdd5234f92158ffaf1d8 + + + + QWidget * + mainWidget_ + classQtSlideWindow.html + 42ffcdf5153a151326f75bb88e0df021 + + + + QtGraphicsButton * + autohideButton_ + classQtSlideWindow.html + f378b6f9d186c9c3e016baee8a7a5aff + + + + QtGraphicsButton * + detachButton_ + classQtSlideWindow.html + 8e092299b233234ee1ad888b77dc618e + + + + QTimeLine * + hideTimeLine_ + classQtSlideWindow.html + f4aee0c2d6e3af6f934f8ddcea76a92d + + + + QGraphicsItemAnimation * + hideAnimation_ + classQtSlideWindow.html + c37139dc14cd44c77fce9eb69a095660 + + + + QDialog * + dialog_ + classQtSlideWindow.html + dc6d2a7cc2accfdeecf4221a500de617 + + + RPCInterface classRPCInterface.html @@ -7496,6 +7785,13 @@ 831515a71a6e6effe54d859732a073e1 (QString, QObject *&) + + virtual + ~RPCInterface + classRPCInterface.html + d5fb61f820baec94a83bd122fc93be9e + () + ScriptingWrapper @@ -7574,6 +7870,13 @@ 4e79d06e3951a46dfdff03676919763a (QString, QString &, QStringList &, QStringList &) + + virtual + ~ScriptInterface + classScriptInterface.html + 0e077be7c424854cfb9e001bc35bbb38 + () + virtual void slotScriptInfo @@ -7809,13 +8112,35 @@ PluginFunctions namespacePluginFunctions.html PluginFunctions::ObjectIterator + PluginFunctions::BaseObjectIterator DLLEXPORT ObjectIterator - objects_end + objectsEnd + namespacePluginFunctions.html + 25c8015c612b1aaf3a840ca072ce68ca + () + + + DLLEXPORT BaseObjectIterator + baseObjectsEnd namespacePluginFunctions.html - d1ebd6bab5cdb61704584c9f7a8fa1e3 + 0170e02e7bd4ef07a4b3718d82ef4978 () + + bool + object_exists + namespacePluginFunctions.html + 2b2ad93729336892c9f6ccc64dec4975 + (const int _identifier) + + + bool + get_all_object_identifiers + namespacePluginFunctions.html + a6820be88cefee7a0f0e98d124cfa4b7 + (std::vector< int > &_identifiers) + void get_all_objects @@ -7838,25 +8163,11 @@ (BaseObject *_root) - void - setViewers - namespacePluginFunctions.html - 8955188d50725b0bde4f048900bbd3dc - (std::vector< glViewer * > _examiner_widgets) - - - void - setRootNode - namespacePluginFunctions.html - b49f3df01bed203c614e7e6e748277fb - (SeparatorNode *_root_node) - - - void - setSceneGraphRootNode + int + viewers namespacePluginFunctions.html - 42b42db6bee14300b3c80a7e7a209041 - (SeparatorNode *_root_node) + 79838d9a4e7a09b4de2a2e2c043f1a9c + () void @@ -7872,18 +8183,32 @@ c092e03e4f2fd8744c6ea4b721bf8c13 () + + QPoint + mapToGlobal + namespacePluginFunctions.html + 499ada11f6b60e736f314d03395dd808 + (const QPoint _point) + + + QPoint + mapToLocal + namespacePluginFunctions.html + 6da01f4b28ec6cca2a6699cd7c93f244 + (const QPoint _point) + bool - scenegraph_pick + scenegraphPick namespacePluginFunctions.html - e20d1424a44165838009bc1828f982ff + 093d540f6cd68dce6b43417c563ceb8d (ACG::SceneGraph::PickTarget _pickTarget, const QPoint &_mousePos, unsigned int &_nodeIdx, unsigned int &_targetIdx, ACG::Vec3d *_hitPointPtr=0) bool - scenegraph_pick + scenegraphPick namespacePluginFunctions.html - da942b5e50f2ca047ed4fc54b6834e51 + c3421597cd5815f735d768c9c1b68933 (const unsigned int _examiner, ACG::SceneGraph::PickTarget _pickTarget, const QPoint &_mousePos, unsigned int &_nodeIdx, unsigned int &_targetIdx, ACG::Vec3d *_hitPointPtr=0) @@ -7928,13 +8253,6 @@ 10625157f033ef4f8e3c73554450e1b0 (Viewer::ActionMode _mode) - - ACG::GLState & - glState - namespacePluginFunctions.html - 42afb52dcbd4fef6986d372f2f8118f8 - () - void getCurrentViewImage @@ -7949,13 +8267,6 @@ a7ad2d5b69ca3cc449a3e702fb4e5d4f () - - Viewer::ViewerProperties & - viewerProperties - namespacePluginFunctions.html - 897bdc5ebf036348c0e543380c2a6cfa - (int _id) - void allowRotation @@ -7991,11 +8302,46 @@ 2458aef543b14b2ac0b06c50d168414e (ACG::SceneGraph::BaseNode *_node) + + void + setViewers + namespacePluginFunctions.html + e449258cdd3312c615fbb8903cb0402a + (std::vector< glViewer * > _viewerWidgets) + + + void + setViewerProperties + namespacePluginFunctions.html + 9e974bfcabd2e2d6ead4d9bca86d5bba + (std::vector< Viewer::ViewerProperties * > _viewerProperties) + + + glViewer * + viewer + namespacePluginFunctions.html + 5907c06476bf9a92db09a09481b42cef + (int _viewerId) + + + void + setRootNode + namespacePluginFunctions.html + b49f3df01bed203c614e7e6e748277fb + (SeparatorNode *_root_node) + + + void + setSceneGraphRootNode + namespacePluginFunctions.html + 42b42db6bee14300b3c80a7e7a209041 + (SeparatorNode *_root_node) + bool - get_picked_object + getPickedObject namespacePluginFunctions.html - 5a5a6830d7f7289647fa6fecec7ab36c + f54bc387d31df6054829e57377bb617d (const unsigned int _node_idx, BaseObjectData *&_object) @@ -8021,122 +8367,101 @@ bool - get_source_identifiers + getSourceIdentifiers namespacePluginFunctions.html - 585008c20534d0ac70ffd428bdbb14ef + 949b8b558e9119de7bf9cb26326fa4e0 (std::vector< int > &_identifiers) bool - get_target_identifiers + getTargetIdentifiers namespacePluginFunctions.html - 7845369871c9fb0596dbc1c52aaf45c1 + b71e4cf2dd51eb0281b2f7b9d243dcb2 (std::vector< int > &_identifiers) bool - get_object + getObject namespacePluginFunctions.html - 634e1aa080dbbd82e96144b0483fd085 + 457fae57adecd43d140a3328ee935df3 (const int _identifier, BaseObject *&_object) bool - get_object + getObject namespacePluginFunctions.html - 17125357788f11bf91380cd146aa6a3d + 14147706f895f469852959e21f29e7fc (const int _identifier, BaseObjectData *&_object) bool - object_exists - namespacePluginFunctions.html - 924e6965de6c3a36291811c121ded9df - (const int _identifier) - - - bool - get_all_meshes - namespacePluginFunctions.html - ca145e68854ad4b3be4fec112737e08c - (std::vector< int > &_identifiers) - - - bool - get_all_object_identifiers + getAllMeshes namespacePluginFunctions.html - c42895597dc095942768517d7aa70cf4 + bd08c0d79cb35d559e76c3c3b822ac58 (std::vector< int > &_identifiers) int - object_count + objectCount namespacePluginFunctions.html - 7c8f86352f3912f2d11f94e00d9fb2c6 + 5bbfd68dc2841f7e3256d14b716a06ae () int - target_count + targetCount namespacePluginFunctions.html - 45a2037e6dfdbed46d38bb95b22a947c + 1cf8f6cdf2dcb91bbed498d53d2d382c () int - source_count + sourceCount namespacePluginFunctions.html - 48e21304e2102dbb519d71e644fbb453 + 3fdc4340584fcb0f039d8c141b2d3de2 () int - visible_count + visibleCount namespacePluginFunctions.html - 211e3474ca5477b24af33f3cf0afe654 + a394f1c74b7eed4a844d2cbc78a010f7 () - void - setBackColor + DLLEXPORT bool + getAllObjectIdentifiers namespacePluginFunctions.html - 37a6e72ec175b6ae536f99aa0ca38f61 - (OpenMesh::Vec4f _color) + 79c4165f279935b30fe6d3db99ae04d3 + (std::vector< int > &_identifiers) - QPoint - mapToGlobal + DLLEXPORT bool + objectExists namespacePluginFunctions.html - 499ada11f6b60e736f314d03395dd808 - (const QPoint _point) + 839512f6451ed80e09d4cc2b1e6324ab + (const int _identifier) - QPoint - mapToLocal + void + setBackColor namespacePluginFunctions.html - 6da01f4b28ec6cca2a6699cd7c93f244 - (const QPoint _point) + 37a6e72ec175b6ae536f99aa0ca38f61 + (OpenMesh::Vec4f _color) void setDrawMode namespacePluginFunctions.html - a0d5f7587ac6b1cdd1ae5a84feb428ef - (const unsigned int _mode) + 1efe4bee421b08165a9265b92fc12205 + (const unsigned int _mode, int _viewer=ALL_VIEWERS) unsigned int drawMode namespacePluginFunctions.html - 43d94fd55d1a0e22c5c9cba49c52c66b - () - - - void - setGlobalDrawMode - namespacePluginFunctions.html - 47c8bcb0fcca09628f1f9470906d27df - (const unsigned int _mode) + c8dc53f80aa94843ced3697c966ff241 + (int _viewer=ACTIVE_VIEWER) void @@ -8163,29 +8488,29 @@ void viewingDirection namespacePluginFunctions.html - 30c72bddf5bcdd6b39abe24e6b8267a7 - (const ACG::Vec3d &_dir, const ACG::Vec3d &_up) + 8bb70fdba72b880eb2f84cf4a73a297d + (const ACG::Vec3d &_dir, const ACG::Vec3d &_up, int _viewer=ALL_VIEWERS) void setScenePos namespacePluginFunctions.html - 0b648e6b44a59282e5edfc8eda51c675 - (const ACG::Vec3d &_center, const double _radius) + 5f9d50f4c35ac7b665e143fff6a5694d + (const ACG::Vec3d &_center, const double _radius, int _viewer=ALL_VIEWERS) void setScenePos namespacePluginFunctions.html - a6fa94d1d14e272693d9d12138fb88c2 - (const ACG::Vec3d &_center) + 46f9e4e95fc926bf456d671d3009fe20 + (const ACG::Vec3d &_center, int _viewer=ALL_VIEWERS) const ACG::Vec3d & sceneCenter namespacePluginFunctions.html - f8548472c36e305d995dbd7531a8d1e0 - () + 9d5d7cd0859781aa075ed1fa16510514 + (int _viewer=ACTIVE_VIEWER) double @@ -8198,50 +8523,57 @@ void translate namespacePluginFunctions.html - d53f8c6306496ee49021ae68d8873fc7 - (const ACG::Vec3d &_vector) + 03c04f127e8b245e0ddbfdc46a03dfcc + (const ACG::Vec3d &_vector, int _viewer=ALL_VIEWERS) void rotate namespacePluginFunctions.html - 5edf7564992ebddd3e5b5ed4207c72bc - (const ACG::Vec3d &_axis, const double _angle, const ACG::Vec3d &_center) + 772833a79fff199451a1aad6f18bf63f + (const ACG::Vec3d &_axis, const double _angle, const ACG::Vec3d &_center, int _viewer=ALL_VIEWERS) void viewHome namespacePluginFunctions.html - 9ad0d550a7d8849130166a8b0c8470d3 - () + 373653112fd9d0f657aa512062730d10 + (int _viewer=ALL_VIEWERS) void viewAll namespacePluginFunctions.html - c4811a358a7fcd79f1b8ea2b6fdfb8e3 - () + fb6ba50cd13b03ae5c8ed921b82f9157 + (int _viewer=ALL_VIEWERS) ACG::Vec3d viewingDirection namespacePluginFunctions.html - 74db7476ef45e6a94c2a3556ca362551 - () + 4067da1ac9e8293333368d209531596e + (int _viewer=ACTIVE_VIEWER) ACG::Vec3d eyePos namespacePluginFunctions.html - c7b81abe92e8f2e4f5d07c6b6ba48f46 - () + 22dfd6ee3f9eac0a55c3a8fb720c7693 + (int _viewer=ACTIVE_VIEWER) ACG::Vec3d upVector namespacePluginFunctions.html - 67be45b4919eb692a281fd7ee1ca4a1e - () + 749649c3a78bff74e47d00de34a77853 + (int _viewer=ACTIVE_VIEWER) + + + Viewer::ViewerProperties & + viewerProperties + namespacePluginFunctions.html + 897bdc5ebf036348c0e543380c2a6cfa + (int _id) void @@ -8271,6 +8603,13 @@ 6912bcdbedb83b624d8f3a9b7c171e23 + + static std::vector< Viewer::ViewerProperties * > + viewerProperties_ + namespacePluginFunctions.html + 3a84db5e243a8b1d13112fea6bd831c9 + + static glViewer * examiner_widget_ @@ -8306,6 +8645,20 @@ 0034857058dc22d14b7ea49f473bc04b + + const int + ALL_VIEWERS + namespacePluginFunctions.html + e806c205fc44df6f63379c56a0c467c3 + + + + const int + ACTIVE_VIEWER + namespacePluginFunctions.html + 696cc98abfbe469ae9ad57328c0103ab + + PluginFunctions::ObjectIterator @@ -8444,6 +8797,231 @@ + + PluginFunctions::BaseObjectIterator + classPluginFunctions_1_1BaseObjectIterator.html + + BaseObject + value_type + classPluginFunctions_1_1BaseObjectIterator.html + 9bb01bead020c596d0add83d47193f4e + + + + BaseObject * + value_handle + classPluginFunctions_1_1BaseObjectIterator.html + 827dcfcb07b86c8f6ea9a8699a515812 + + + + value_type & + reference + classPluginFunctions_1_1BaseObjectIterator.html + 73103be943ef243af150993be3a499ea + + + + value_type * + pointer + classPluginFunctions_1_1BaseObjectIterator.html + 4fe74a88166e7799b56ad53ce2e53602 + + + + + BaseObjectIterator + classPluginFunctions_1_1BaseObjectIterator.html + d6054ca8b620fcbb3360e77100132d5b + (IteratorRestriction _restriction=ALL_OBJECTS, DataType _dataType=DATA_ALL) + + + + BaseObjectIterator + classPluginFunctions_1_1BaseObjectIterator.html + 53f6bed2c770f92226c534289ad2237f + (BaseObject *pos, IteratorRestriction _restriction=ALL_OBJECTS, DataType _dataType=DATA_ALL) + + + + operator value_handle + classPluginFunctions_1_1BaseObjectIterator.html + 1cbb2c924ee7e933c97e9ee0c07021f7 + () + + + bool + operator== + classPluginFunctions_1_1BaseObjectIterator.html + ebb015419ec9ff78c52376aba5f93deb + (const BaseObjectIterator &_rhs) + + + bool + operator!= + classPluginFunctions_1_1BaseObjectIterator.html + 940de25e07e5eea6fdbc2cb02d56c43f + (const BaseObjectIterator &_rhs) + + + BaseObjectIterator & + operator= + classPluginFunctions_1_1BaseObjectIterator.html + 53475118734fff977a5e522f2fcedc50 + (const BaseObjectIterator &_rhs) + + + pointer + operator-> + classPluginFunctions_1_1BaseObjectIterator.html + 473ea103ca8b1a7ca2818a93d8330c1b + () + + + BaseObjectIterator & + operator++ + classPluginFunctions_1_1BaseObjectIterator.html + 6417a932e63c5427cbe3b802f104d7c2 + () + + + BaseObjectIterator & + operator-- + classPluginFunctions_1_1BaseObjectIterator.html + bc726ec2bd89582b4650952579486358 + () + + + BaseObject * + operator* + classPluginFunctions_1_1BaseObjectIterator.html + 26d0c6691552ca1a1743bf00e6d93d56 + () + + + BaseObject * + index + classPluginFunctions_1_1BaseObjectIterator.html + e680007513d168bd9b7577b6d40a858f + () + + + BaseObject * + pos_ + classPluginFunctions_1_1BaseObjectIterator.html + 1f46ab5a606c51960ba9956c24b2b21d + + + + DataType + dataType_ + classPluginFunctions_1_1BaseObjectIterator.html + 7f03b0cdf3036019a157b206fa97b59f + + + + IteratorRestriction + restriction_ + classPluginFunctions_1_1BaseObjectIterator.html + 4cd6828fffebfd81daae0123349043eb + + + + + RPC + namespaceRPC.html + + QScriptValue + callFunction + namespaceRPC.html + 01e60295c1a3a9392b0a952e98a2b4cd + (QString _plugin, QString _functionName, std::vector< QScriptValue > _parameters) + + + QScriptValue + callFunction + namespaceRPC.html + e1cebc67ceb99d35de2019d715df84ae + (QString _plugin, QString _functionName) + + + void + setScriptEngine + namespaceRPC.html + a2690ae5183818a8ad2e2f175d425968 + (QScriptEngine *_engine) + + + QScriptEngine * + getScriptEngine + namespaceRPC.html + f304d9b8acaf062a11d5c6e86e26d604 + () + + + void + callFunction + namespaceRPC.html + 6163023fc134501980dc8dd2d0ecb10c + (QString _plugin, QString _functionName, T0 _t0) + + + void + callFunction + namespaceRPC.html + d261db93cb95ed7caa5cb83e4c2d1a0e + (QString _plugin, QString _functionName, T0 _t0, T1 _t1) + + + void + callFunction + namespaceRPC.html + 7bbc7f5cca6c4634e14ec498bb8c4afa + (QString _plugin, QString _functionName, T0 _t0, T1 _t1, T2 _t2) + + + void + callFunction + namespaceRPC.html + 88f136b1547274daa6c584a97bc55ae5 + (QString _plugin, QString _functionName, T0 _t0, T1 _t1, T2 _t2, T3 _t3) + + + ReturnValue + callFunctionValue + namespaceRPC.html + 4849b4603b17d2a8b4749978a59101fe + (QString _plugin, QString _functionName) + + + ReturnValue + callFunctionValue + namespaceRPC.html + aa3f04f79f84e88db1861f74156cb42e + (QString _plugin, QString _functionName, T0 _t0) + + + ReturnValue + callFunctionValue + namespaceRPC.html + c8ec66eb93e570ff5e7dc510da6617da + (QString _plugin, QString _functionName, T0 _t0, T1 _t1) + + + ReturnValue + callFunctionValue + namespaceRPC.html + f999327657a8bc7ba27d429f9409feaa + (QString _plugin, QString _functionName, T0 _t0, T1 _t1, T2 _t2, T3 _t3) + + + static QScriptEngine * + engine_ + namespaceRPC.html + 0fe26dbf58b2d748d64984b01011a212 + + + widgets/aboutWidget/ /data/home1/moebius/projects/OpenFlipper/OpenFlipper/widgets/aboutWidget/ @@ -8484,9 +9062,13 @@ PickingInterface.hh PluginFunctions.cc PluginFunctions.hh + PluginFunctionsBaseIterator.cc PluginFunctionsCore.hh PluginFunctionsIterator.cc + PluginFunctionsViewControls.hh RPCInterface.hh + RPCWrappers.cc + RPCWrappers.hh ScriptInterface.hh StatusbarInterface.hh TextureInterface.hh @@ -8601,8 +9183,12 @@ QtGLGraphicsView.hh QtGLViewerLayout.cc QtGLViewerLayout.hh + QtGraphicsButton.cc + QtGraphicsButton.hh QtMultiViewLayout.cc QtMultiViewLayout.hh + QtSlideWindow.cc + QtSlideWindow.hh widgets/helpBrowser/ diff --git a/common/GlobalOptions.cc b/common/GlobalOptions.cc index 10d24f38..fc954806 100644 --- a/common/GlobalOptions.cc +++ b/common/GlobalOptions.cc @@ -119,7 +119,7 @@ static bool drawModesInContextMenu_ = true; static bool hideToolbox_ = false; /// Store the logger gui Mode mode -static bool hideLogger_ = false; +static LoggerState loggerState_ = InScene; /// Store if we should go into multiview Mode static bool multiView_ = true; @@ -501,14 +501,14 @@ unsigned int examinerWidgets() { } -/// Set if we start the logging widget closed -void hideLogger( bool _hide) { - hideLogger_ = _hide; +/// Set to current +void loggerState( LoggerState _state) { + loggerState_ = _state; } -/// Start the logging widget closed? -bool hideLogger( ) { - return hideLogger_; +/// Current state of the logging window? +LoggerState loggerState( ) { + return loggerState_; } /// Set if we start the toolbox widget closed diff --git a/common/GlobalOptions.hh b/common/GlobalOptions.hh index 337e4da5..955bf8d3 100644 --- a/common/GlobalOptions.hh +++ b/common/GlobalOptions.hh @@ -400,13 +400,20 @@ void fontsDir(QDir _dir); DLLEXPORT unsigned int examinerWidgets(); - /// Set if we start the logging widget closed + /// State of the logging widget + enum LoggerState { + InScene, + Normal, + Hidden + }; + + /// Set the logging widget state DLLEXPORT - void hideLogger( bool _hide); + void loggerState( LoggerState _state); - /// Start the logging widget closed? + /// What is the current state of the logging widget? DLLEXPORT - bool hideLogger( ); + LoggerState loggerState( ); /// Set if we start the toolbox widget closed DLLEXPORT diff --git a/widgets/coreWidget/CoreWidget.cc b/widgets/coreWidget/CoreWidget.cc index 08b65af7..f1ca7fe6 100644 --- a/widgets/coreWidget/CoreWidget.cc +++ b/widgets/coreWidget/CoreWidget.cc @@ -154,14 +154,28 @@ CoreWidget( QVector& _viewModes, logWidget_->setLineWrapMode( QTextEdit::NoWrap ); originalLoggerSize_ = 0; + loggerState_ = OpenFlipper::Options::Normal; QList wsizes( splitter_->sizes() ); - if (OpenFlipper::Options::hideLogger()) { + + if (OpenFlipper::Options::loggerState() == OpenFlipper::Options::InScene) { slidingLogger_->attachWidget (logWidget_); splitter_->insertWidget (1, tempLogWidget); wsizes[0] = 1; wsizes[1] = 0; splitter_->setSizes(wsizes); + loggerState_ = OpenFlipper::Options::InScene; + } else if (OpenFlipper::Options::loggerState() == OpenFlipper::Options::Hidden) { + splitter_->insertWidget (1, tempLogWidget); + wsizes[0] = 1; + wsizes[1] = 0; + splitter_->setSizes(wsizes); + loggerState_ = OpenFlipper::Options::Hidden; + } else { + // Set initial values to have a usable state + wsizes[0] = 480; + wsizes[1] = 240; + splitter_->setSizes(wsizes); } // ====================================================================== @@ -511,18 +525,95 @@ CoreWidget::setFullscreen(bool _state ) { */ void CoreWidget::toggleLogger() { - // toggle - OpenFlipper::Options::hideLogger( !OpenFlipper::Options::hideLogger() ); + + switch (OpenFlipper::Options::loggerState ()) + { + case OpenFlipper::Options::InScene: + OpenFlipper::Options::loggerState(OpenFlipper::Options::Normal); + break; + case OpenFlipper::Options::Normal: + OpenFlipper::Options::loggerState(OpenFlipper::Options::Hidden); + break; + case OpenFlipper::Options::Hidden: + OpenFlipper::Options::loggerState(OpenFlipper::Options::InScene); + break; + } // Hide/Show Logger - showLogger( !OpenFlipper::Options::hideLogger() ); + showLogger( OpenFlipper::Options::loggerState() ); } /** Hide or show logger */ void -CoreWidget::showLogger(bool _state) { +CoreWidget::showLogger(OpenFlipper::Options::LoggerState _state) { //Hide Logger + if (_state == loggerState_) + return; + + switch (_state) + { + case OpenFlipper::Options::InScene: + { + QList wsizes( splitter_->sizes() ); + + // Remember old size + if (loggerState_ == OpenFlipper::Options::Normal) + originalLoggerSize_ = wsizes[1]; + + if ( originalLoggerSize_ == 0) + originalLoggerSize_ = 240; + + splitter_->insertWidget (1, tempLogWidget); + wsizes[0] = wsizes[0]+wsizes[1]; + wsizes[1] = 0; + splitter_->setSizes(wsizes); + logWidget_->resize (logWidget_->width (), originalLoggerSize_); + slidingLogger_->attachWidget (logWidget_); + } + break; + case OpenFlipper::Options::Normal: + { + if ( originalLoggerSize_ == 0) + originalLoggerSize_ = 240; + + QList wsizes( splitter_->sizes() ); + + if (loggerState_ == OpenFlipper::Options::InScene) + originalLoggerSize_ = logWidget_->height (); + + slidingLogger_->detachWidget (); + splitter_->insertWidget (1, logWidget_); + + wsizes[0] = wsizes[0]+wsizes[1] - originalLoggerSize_; + wsizes[1] = originalLoggerSize_; + splitter_->setSizes(wsizes); + } + break; + case OpenFlipper::Options::Hidden: + { + QList wsizes( splitter_->sizes() ); + + // Remember old size + if (loggerState_ == OpenFlipper::Options::Normal) + originalLoggerSize_ = wsizes[1]; + + if (loggerState_ == OpenFlipper::Options::InScene) + { + slidingLogger_->detachWidget (); + originalLoggerSize_ = logWidget_->height (); + } + + splitter_->insertWidget (1, tempLogWidget); + wsizes[0] = wsizes[0]+wsizes[1]; + wsizes[1] = 0; + splitter_->setSizes(wsizes); + } + break; + } + loggerState_ = _state; + +/* if ( !_state ) { QList wsizes( splitter_->sizes() ); @@ -563,20 +654,8 @@ CoreWidget::showLogger(bool _state) { wsizes[0] = wsizes[0]+wsizes[1] - height; wsizes[1] = height; splitter_->setSizes(wsizes); -/* - if ( originalLoggerSize_ == 0) - originalLoggerSize_ = 240; - - QList wsizes( splitter_->sizes() ); - - if (wsizes[0] == 0) - wsizes[0] = height(); - - wsizes[0] = wsizes[0]+wsizes[1] - originalLoggerSize_; - wsizes[1] = originalLoggerSize_; - splitter_->setSizes(wsizes); - */ } + */ } //----------------------------------------------------------------------------- diff --git a/widgets/coreWidget/CoreWidget.hh b/widgets/coreWidget/CoreWidget.hh index 0ea26071..2ab1c155 100644 --- a/widgets/coreWidget/CoreWidget.hh +++ b/widgets/coreWidget/CoreWidget.hh @@ -49,6 +49,7 @@ //== INCLUDES ================================================================= #include "OpenFlipper/common/Types.hh" +#include #include #include #include @@ -82,6 +83,7 @@ #include + struct ViewMode{ QString name; bool custom; //is the mode defined by the user? @@ -291,7 +293,7 @@ public: void toggleLogger(); /// Change visibility of the logger - void showLogger(bool _state); + void showLogger(OpenFlipper::Options::LoggerState _state); /// Hide or show toolbox area void toggleToolbox(); @@ -299,6 +301,9 @@ public: /// Show or hide toolbox void showToolbox( bool _state ); + private: + OpenFlipper::Options::LoggerState loggerState_; + /** @} */ diff --git a/widgets/glWidget/QtSlideWindow.cc b/widgets/glWidget/QtSlideWindow.cc index ad4d0118..565746b8 100644 --- a/widgets/glWidget/QtSlideWindow.cc +++ b/widgets/glWidget/QtSlideWindow.cc @@ -43,7 +43,7 @@ #define BACKGROUND_BLUE 0xff #define BACKGROUND_ALPHA 0xcf -#define SLIDE_DURATION 500 +#define SLIDE_DURATION 1000 //== INCLUDES ================================================================= @@ -100,8 +100,10 @@ QtSlideWindow::QtSlideWindow(QString _name, QGraphicsItem *_parent) : hideAnimation_->setItem (this); hideAnimation_->setTimeLine (hideTimeLine_); + hideAnimation_->setTranslationAt (0.0, 0, geometry ().height ()); for (int i = 0; i < geometry ().height (); ++i) - hideAnimation_->setTranslationAt (i / geometry ().height (), 0, geometry ().height () - i); + hideAnimation_->setTranslationAt (0.25 + (i / (geometry ().height () * 2.0)), 0, geometry ().height () - i); + hideAnimation_->setTranslationAt (1.0, 0, 0); hide (); } @@ -234,8 +236,10 @@ void QtSlideWindow::resizeEvent (QGraphicsSceneResizeEvent *_event) if (hideAnimation_) { hideAnimation_->clear (); + hideAnimation_->setTranslationAt (0.0, 0, geometry ().height ()); for (int i = 0; i < geometry ().height (); ++i) - hideAnimation_->setTranslationAt (i / geometry ().height (), 0, geometry ().height () - i); + hideAnimation_->setTranslationAt (0.25 + (i / (geometry ().height () * 2.0)), 0, geometry ().height () - i); + hideAnimation_->setTranslationAt (1.0, 0, 0); } } @@ -247,8 +251,10 @@ void QtSlideWindow::moveEvent (QGraphicsSceneMoveEvent *_event) if (hideAnimation_) { hideAnimation_->clear (); + hideAnimation_->setTranslationAt (0.0, 0, geometry ().height ()); for (int i = 0; i < geometry ().height (); ++i) - hideAnimation_->setTranslationAt (i / geometry ().height (), 0, geometry ().height () - i); + hideAnimation_->setTranslationAt (0.25 + (i / (geometry ().height () * 2.0)), 0, geometry ().height () - i); + hideAnimation_->setTranslationAt (1.0, 0, 0); } } diff --git a/widgets/optionsWidget/optionsWidget.cc b/widgets/optionsWidget/optionsWidget.cc index f9b865bc..f91888fb 100644 --- a/widgets/optionsWidget/optionsWidget.cc +++ b/widgets/optionsWidget/optionsWidget.cc @@ -127,7 +127,8 @@ void OptionsWidget::showEvent ( QShowEvent * /*event*/ ) { fullscreen->setChecked( OpenFlipper::Options::fullScreen() ); splash->setChecked( OpenFlipper::Options::splash() ); toolbox->setChecked( !OpenFlipper::Options::hideToolbox() ); - logger->setChecked( !OpenFlipper::Options::hideLogger() ); +#warning FIXME + logger->setChecked( OpenFlipper::Options::loggerState() != OpenFlipper::Options::Hidden); enableLogFile->setChecked( OpenFlipper::Options::logFileEnabled() ); //paths @@ -359,7 +360,10 @@ void OptionsWidget::slotApply() { OpenFlipper::Options::fullScreen( fullscreen->isChecked() ); OpenFlipper::Options::splash( splash->isChecked() ); OpenFlipper::Options::hideToolbox( !toolbox->isChecked() ); - OpenFlipper::Options::hideLogger( !logger->isChecked() ); + if (logger->isChecked()) + OpenFlipper::Options::loggerState( OpenFlipper::Options::Normal ); + else + OpenFlipper::Options::loggerState( OpenFlipper::Options::Hidden ); OpenFlipper::Options::logFileEnabled( enableLogFile->isChecked() ); //paths -- GitLab