// PARAVIS : ParaView wrapper SALOME module
//
-// Copyright (C) 2010-2015 CEA/DEN, EDF R&D
+// Copyright (C) 2010-2019 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <vtkProcessModule.h>
#include <vtkPVSession.h>
#include <vtkPVProgressHandler.h>
-#include <vtkOutputWindow.h>
#include <vtkEventQtSlotConnect.h>
#include <vtkNew.h>
#include <vtkSMProxy.h>
#include <pqActiveObjects.h>
#include <pqHelpReaction.h>
#include <pqPluginManager.h>
-#include <pqPythonDialog.h>
+
//#include <pqPythonDialog.h>
#include <pqPythonManager.h>
#include <pqLoadDataReaction.h>
#include <pqPythonScriptEditor.h>
#include <pqAnimationScene.h>
#include <pqServerManagerModel.h>
#include <pqAnimationTimeToolbar.h>
+#include <pqPipelineBrowserWidget.h>
+#include <pqCoreUtilities.h>
+
+#if PY_VERSION_HEX < 0x03050000
+static char*
+Py_EncodeLocale(const wchar_t *arg, size_t *size)
+{
+ return _Py_wchar2char(arg, size);
+}
+static wchar_t*
+Py_DecodeLocale(const char *arg, size_t *size)
+{
+ return _Py_char2wchar(arg, size);
+}
+#endif
//----------------------------------------------------------------------------
PVGUI_Module* ParavisModule = 0;
myFiltersMenuId( -1 ),
myMacrosMenuId(-1),
myRecentMenuId(-1),
+ myCatalystMenuId(-1),
myOldMsgHandler(0),
myTraceWindow(0),
myInitTimer(0),
Q_INIT_RESOURCE( PVGUI );
#endif
ParavisModule = this;
-
- // Clear old copies of embedded macros files
- QString aDestPath = QString( "%1/.config/%2/Macros" ).arg( QDir::homePath() ).arg( QApplication::applicationName() );
- QStringList aFilter;
- aFilter << "*.py";
-
- QDir aDestDir(aDestPath);
- QStringList aDestFiles = aDestDir.entryList(aFilter, QDir::Files);
- foreach (QString aMacrosPath, getEmbeddedMacrosList()) {
- QString aMacrosName = QFileInfo(aMacrosPath).fileName();
- if (aDestFiles.contains(aMacrosName)) {
- aDestDir.remove(aMacrosName);
- }
- }
}
/*!
// Initialize ParaView client and associated behaviors
// and connect to externally launched pvserver
- PVViewer_Core::ParaviewInitApp(aDesktop, anApp->logWindow());
+ PVViewer_Core::ParaviewInitApp(aDesktop);
+
+ // Clear old copies of embedded macros files
+ //QString aDestPath = QString( "%1/.config/%2/Macros" ).arg( QDir::homePath() ).arg( QApplication::applicationName() );
+ QString aDestPath = pqCoreUtilities::getParaViewUserDirectory() + "/Macros";
+ QStringList aFilter;
+ aFilter << "*.py";
+
+ QDir aDestDir(aDestPath);
+ QStringList aDestFiles = aDestDir.entryList(aFilter, QDir::Files);
+ foreach(QString aMacrosPath, getEmbeddedMacrosList()) {
+ QString aMacrosName = QFileInfo(aMacrosPath).fileName();
+ if (aDestFiles.contains(aMacrosName)) {
+ aDestDir.remove(aMacrosName);
+ }
+ }
+
myGuiElements = PVViewer_GUIElements::GetInstance(aDesktop);
+
// [ABN]: careful with the order of the GUI element creation, the loading of the configuration
// and the connection to the server. This order is very sensitive if one wants to make
// sure all menus, etc ... are correctly populated.
PVViewer_ViewManager* viewMgr =
dynamic_cast<PVViewer_ViewManager*>( anApp->getViewManager( PVViewer_Viewer::Type(), false ) );
if ( !viewMgr ) {
- viewMgr = new PVViewer_ViewManager( anApp->activeStudy(), anApp->desktop(), anApp->logWindow() );
+ viewMgr = new PVViewer_ViewManager( anApp->activeStudy(), anApp->desktop() );
anApp->addViewManager( viewMgr );
connect( viewMgr, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
anApp, SLOT( onCloseView( SUIT_ViewManager* ) ) );
{
QApplication::restoreOverrideCursor();
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-/*!
- \brief Handler method for the output of messages.
-*/
-static void ParavisMessageOutput(QtMsgType type, const char *msg)
-{
- switch(type)
- {
- case QtDebugMsg:
- vtkOutputWindow::GetInstance()->DisplayText(msg);
- break;
- case QtWarningMsg:
- vtkOutputWindow::GetInstance()->DisplayErrorText(msg);
- break;
- case QtCriticalMsg:
- vtkOutputWindow::GetInstance()->DisplayErrorText(msg);
- break;
- case QtFatalMsg:
- vtkOutputWindow::GetInstance()->DisplayErrorText(msg);
- break;
- }
-}
-#else
-/*!
- \brief Handler method for the output of messages.
-*/
-static void ParavisMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
-{
- switch(type)
- {
- case QtDebugMsg:
- vtkOutputWindow::GetInstance()->DisplayText(msg.toLatin1().constData());
- break;
- case QtWarningMsg:
- vtkOutputWindow::GetInstance()->DisplayErrorText(msg.toLatin1().constData());
- break;
- case QtCriticalMsg:
- vtkOutputWindow::GetInstance()->DisplayErrorText(msg.toLatin1().constData());
- break;
- case QtFatalMsg:
- vtkOutputWindow::GetInstance()->DisplayErrorText(msg.toLatin1().constData());
- break;
- }
-}
-#endif
+
/*!
\brief Activate module.
\param study current study
*/
bool PVGUI_Module::activateModule( SUIT_Study* study )
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- myOldMsgHandler = qInstallMsgHandler(ParavisMessageOutput);
-#else
- myOldMsgHandler = qInstallMessageHandler(ParavisMessageOutput);
-#endif
SUIT_ExceptionHandler::addCleanUpRoutine( paravisCleanUp );
storeCommonWindowsState();
if ( mySourcesMenuId != -1 ) menuMgr()->show(mySourcesMenuId);
if ( myFiltersMenuId != -1 ) menuMgr()->show(myFiltersMenuId);
if ( myMacrosMenuId != -1 ) menuMgr()->show(myMacrosMenuId);
+ if ( myCatalystMenuId != -1 ) menuMgr()->show(myCatalystMenuId);
// Update the various menus with the content pre-loaded in myGuiElements
// QMenu* srcMenu = menuMgr()->findMenu( mySourcesMenuId );
}
if ( myRecentMenuId != -1 ) menuMgr()->show(myRecentMenuId);
-
+
+ // VSR 18/10/2018 - 0023170: Workaround to re-select current index after module activation
+ QItemSelectionModel* selection_model = myGuiElements->getPipelineBrowserWidget()->getSelectionModel();
+ QModelIndex idx = selection_model->currentIndex();
+ selection_model->clearCurrentIndex();
+ selection_model->setCurrentIndex(idx, QItemSelectionModel::ClearAndSelect);
+
return isDone;
}
menuMgr()->hide(mySourcesMenuId);
menuMgr()->hide(myFiltersMenuId);
menuMgr()->hide(myMacrosMenuId);
+ menuMgr()->hide(myCatalystMenuId);
setMenuShown( false );
setToolShown( false );
SUIT_ExceptionHandler::removeCleanUpRoutine( paravisCleanUp );
if (myOldMsgHandler)
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- qInstallMsgHandler(myOldMsgHandler);
-#else
qInstallMessageHandler(myOldMsgHandler);
-#endif
+
restoreCommonWindowsState();
return LightApp_Module::deactivateModule( study );
*/
void PVGUI_Module::executeScript( const char* script )
{
+ // ???
+ // Not sure this is the right fix, but the PYTHON_MANAGER has a function named
+ // executeScript() which seems to do what the runScript on pyShellDialog() class
+ // was doing.
+#ifndef WNT
+ pqPythonManager* manager =
+ qobject_cast<pqPythonManager*>(pqApplicationCore::instance()->manager("PYTHON_MANAGER"));
+
+ if ( manager ) {
+ manager->executeScript(script);
+ }
+#endif
+ /*
#ifndef WNT
pqPythonManager* manager = qobject_cast<pqPythonManager*>(
pqApplicationCore::instance()->manager( "PYTHON_MANAGER" ) );
}
}
#endif
+ */
}
///**
// PyObject * elem = PyList_GetItem(lst, i);
// if (PyString_Check(elem))
// {
-// std::cout << "At pos:" << i << ", " << PyString_AsString(elem) << std::endl;
+// std::cout << "At pos:" << i << ", " << Py_EncodeLocale(PyUnicode_AS_UNICODE(elem), NULL) << std::endl;
// }
// else
// std::cout << "At pos:" << i << ", not a string!" << std::endl;
vtkPythonScopeGilEnsurer psge;
PyObject * mods(PySys_GetObject(const_cast<char*>("modules")));
PyObject * trace_mod(PyDict_GetItemString(mods, "paraview.smtrace")); // module was already (really) imported by vtkSMTrace
- if (PyModule_Check(trace_mod)) {
+ if (trace_mod && trace_mod != Py_None && PyModule_Check(trace_mod)) {
vtkSmartPyObject save_cam(PyObject_GetAttrString(trace_mod, const_cast<char*>("SaveCameras")));
vtkSmartPyObject camera_trace(PyObject_CallMethod(save_cam, const_cast<char*>("get_trace"), NULL));
// Convert to a single string
- vtkSmartPyObject ret(PyString_FromString(end_line.toStdString().c_str()));
+ vtkSmartPyObject ret(PyUnicode_FromUnicode(Py_DecodeLocale(end_line.toStdString().c_str(), NULL), end_line.size()));
vtkSmartPyObject final_string(PyObject_CallMethod(ret, const_cast<char*>("join"),
const_cast<char*>("O"), (PyObject*)camera_trace));
- if (PyString_CheckExact(final_string))
+ if (PyUnicode_CheckExact(final_string))
{
- QString camera_qs(PyString_AsString(final_string)); // deep copy
+ QString camera_qs(Py_EncodeLocale(PyUnicode_AS_UNICODE(final_string.GetPointer()), NULL)); // deep copy
traceString = traceString + end_line + end_line + QString("#### saving camera placements for all active views")
+ end_line + end_line + camera_qs + end_line;
}
