Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor Python console fixes #1049

Merged
merged 2 commits into from
Oct 25, 2022
Merged

Minor Python console fixes #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562adac
COMP: Fix build error introduced in previous commit
lassoan Oct 25, 2022
d54e88b
ENH: Change run file keyboard shortcut in Python console
lassoan Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Libs/Visualization/VTK/Widgets/ctkVTKRenderView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,11 @@ public Q_SLOTS:
void lookFromAxis(const ctkAxesWidget::Axis& axis);

/// \deprecated
/// \brief Change camera to look from a given axis to the focal point
/// Translate/Rotate the camera to look from a given axis
/// \brief Change camera to look from a given axis to the focal point.
/// Translate/Rotate the camera to look from a given axis.
/// \param fov is not used (it is kept for backward compatibility of the API)
/// \sa lookFromAxis(const ctkAxesWidget::Axis&)
void lookFromAxis(const ctkAxesWidget::Axis& axis, double fov = 10.);
void lookFromAxis(const ctkAxesWidget::Axis& axis, double fov);

public:

Expand Down
2 changes: 1 addition & 1 deletion Libs/Widgets/ctkConsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void ctkConsolePrivate::init()
this->CommandPosition = 0;

this->RunFileAction = new QAction(q->tr("&Run file"), q);
this->RunFileAction->setShortcut(q->tr("Ctrl+r"));
this->RunFileAction->setShortcut(q->tr("Ctrl+g"));
connect(this->RunFileAction, SIGNAL(triggered()), q, SLOT(runFile()));
q->addAction(this->RunFileAction);

Expand Down
8 changes: 4 additions & 4 deletions Libs/Widgets/ctkConsole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
All rights reserved.

ParaView is a free software; you can redistribute it and/or modify it
under the terms of the ParaView license version 1.2.
under the terms of the ParaView license version 1.2.

See http://www.paraview.org/paraview/project/license.html for the full ParaView license.
A copy of this license can be obtained by contacting
Expand Down Expand Up @@ -105,7 +105,7 @@ class CTK_WIDGETS_EXPORT ctkConsole : public QWidget
{
NoRunFileUserInterface = 0x00,
RunFileButton = 0x01, /*!< Show a button at the bottom of the console to run a file */
RunFileShortcut = 0x02, /*!< Add the shortcut CTRL+r to run a file */
RunFileShortcut = 0x02, /*!< Add the shortcut CTRL+G to run a file */
};
Q_DECLARE_FLAGS(RunFileOptions, RunFileOption)

Expand All @@ -115,7 +115,7 @@ class CTK_WIDGETS_EXPORT ctkConsole : public QWidget

/// Returns the current formatting that will be used by printMessage()
Q_INVOKABLE QTextCharFormat getFormat() const;

/// Sets formatting that will be used by printMessage()
Q_INVOKABLE void setFormat(const QTextCharFormat& Format);

Expand Down Expand Up @@ -273,7 +273,7 @@ public Q_SLOTS:
virtual void runFile(const QString& filePath);

/// Open a file dialog to select a file and run it.
/// Shortcut: CTRL+O
/// Shortcut: CTRL+G
/// \sa runFile(QString), exec()
virtual void runFile();

Expand Down