Skip to content

Commit db2cfae

Browse files
jamesobutlerjcfr
authored andcommitted
COMP: Update PythonQt with previously missing commit
There was a missing PythonQt commit that was not cherry-picked over when the new branch was created that started to be used by CTK in b9906ab PythonQt: $ git shortlog ef4ebfb..ec7e141 Jean-Christophe Fillion-Robin (1): [commontk] Revert part of r91 preventing QFlags from being wrapped This commit includes reverting of c425018 and 3811bca which was trying to handle the updated PythonQt with that missing commit.
1 parent 3845903 commit db2cfae

14 files changed

+18
-15
lines changed

CMakeExternals/PythonQt.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
9191

9292
ctkFunctionExtractOptimizedLibrary(PYTHON_LIBRARIES PYTHON_LIBRARY)
9393

94-
set(revision_tag ef4ebfbae0620e688c9732baeb7ae09fc2f75dc2) # patched-v3.6.1-2025-12-22-469f01f6a
94+
set(revision_tag ec7e1416e17fae645f3b99a8df4533719e17cbf6) # patched-v3.6.1-2025-12-22-469f01f6a
9595
if(${proj}_REVISION_TAG)
9696
set(revision_tag ${${proj}_REVISION_TAG})
9797
endif()

Libs/Core/ctkErrorLogLevel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
class CTK_CORE_EXPORT ctkErrorLogLevel : public QObject
3333
{
3434
Q_OBJECT
35+
Q_FLAGS(LogLevel)
3536
public:
3637
typedef QObject Superclass;
3738
ctkErrorLogLevel(QObject* parent = 0);
@@ -49,7 +50,6 @@ class CTK_CORE_EXPORT ctkErrorLogLevel : public QObject
4950
Fatal = 0x100,
5051
None = 0x200,
5152
};
52-
Q_ENUM(LogLevel)
5353
Q_DECLARE_FLAGS(LogLevels, LogLevel)
5454

5555
QString operator ()(LogLevel logLevel);

Libs/Core/ctkErrorLogTerminalOutput.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class ctkErrorLogTerminalOutputPrivate;
3636
class CTK_CORE_EXPORT ctkErrorLogTerminalOutput : public QObject
3737
{
3838
Q_OBJECT
39+
Q_FLAGS(TerminalOutputs)
3940

4041
public:
4142
typedef QObject Superclass;
@@ -49,7 +50,6 @@ class CTK_CORE_EXPORT ctkErrorLogTerminalOutput : public QObject
4950
StandardOutput = 0x2,
5051
All = StandardError | StandardOutput
5152
};
52-
Q_ENUM(TerminalOutput)
5353
Q_DECLARE_FLAGS(TerminalOutputs, TerminalOutput)
5454

5555
bool enabled()const;

Libs/Visualization/VTK/Widgets/ctkVTKDataSetModel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class CTK_VISUALIZATION_VTK_WIDGETS_EXPORT ctkVTKDataSetModel
5151
{
5252
Q_OBJECT
5353
QVTK_OBJECT
54+
Q_FLAGS(AttributeType AttributeTypes)
5455

5556
/// This property holds the type of attribute that should be listed in the model.
5657
/// By default all attributes are considered.
@@ -83,7 +84,6 @@ class CTK_VISUALIZATION_VTK_WIDGETS_EXPORT ctkVTKDataSetModel
8384
EdgeFlagAttribute = 0x100,
8485
AllAttribute = NoAttribute | ScalarsAttribute | VectorsAttribute | NormalsAttribute | TCoordsAttribute | TensorsAttribute | GlobalIDsAttribute | PedigreeIDsAttribute | EdgeFlagAttribute
8586
};
86-
Q_ENUM(AttributeType)
8787
Q_DECLARE_FLAGS(AttributeTypes, AttributeType)
8888

8989
virtual void setDataSet(vtkDataSet* dataSet);

Libs/Visualization/VTK/Widgets/ctkVTKPropertyWidget.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ class CTK_VISUALIZATION_VTK_WIDGETS_EXPORT ctkVTKPropertyWidget
4040
QVTK_OBJECT;
4141
typedef QWidget Superclass;
4242

43+
Q_FLAGS(GroupsState)
44+
4345
/// Show/Hide, expand/collapse groups in the widget.
4446
/// Groups are visible by default and Color is the only expanded group.
4547
/// \sa groupsState(), setGroupsState()
@@ -63,7 +65,6 @@ class CTK_VISUALIZATION_VTK_WIDGETS_EXPORT ctkVTKPropertyWidget
6365
AllVisible = RepresentationVisible | ColorVisible | LightingVisible | MaterialVisible,
6466
AllCollapsed = RepresentationCollapsed | ColorCollapsed | LightingCollapsed | MaterialCollapsed
6567
};
66-
Q_ENUM(GroupState)
6768
Q_DECLARE_FLAGS(GroupsState, GroupState)
6869

6970
/// Construct a ctkVTKPropertyWidget with a default vtkProperty.

Libs/Widgets/ctkColorPickerButton.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class ctkColorPickerButtonPrivate;
3838
class CTK_WIDGETS_EXPORT ctkColorPickerButton : public QPushButton
3939
{
4040
Q_OBJECT
41+
Q_FLAGS(ColorDialogOption ColorDialogOptions)
4142

4243
/// This property controls the name of the color.
4344
/// Black (0,0,0) by default.
@@ -62,7 +63,6 @@ class CTK_WIDGETS_EXPORT ctkColorPickerButton : public QPushButton
6263
DontUseNativeDialog = 0x00000004,
6364
UseCTKColorDialog = 0x0000000C
6465
};
65-
Q_ENUM(ColorDialogOption)
6666
Q_DECLARE_FLAGS(ColorDialogOptions, ColorDialogOption)
6767

6868
/// By default, the color is black

Libs/Widgets/ctkConsole.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@ class CTK_WIDGETS_EXPORT ctkConsole : public QWidget
7979
Q_PROPERTY(int cursorPosition READ cursorPosition)
8080
Q_PROPERTY(int cursorColumn READ cursorColumn)
8181
Q_PROPERTY(int cursorLine READ cursorLine)
82+
Q_FLAGS(EditorHint EditorHints)
8283
Q_PROPERTY(EditorHints editorHints READ editorHints WRITE setEditorHints)
8384
Q_ENUM(Qt::ScrollBarPolicy)
8485
Q_PROPERTY(Qt::ScrollBarPolicy scrollBarPolicy READ scrollBarPolicy WRITE setScrollBarPolicy)
8586
Q_PROPERTY(QList<QKeySequence> completerShortcuts READ completerShortcuts WRITE setCompleterShortcuts)
87+
Q_FLAGS(RunFileOption RunFileOptions)
8688
Q_PROPERTY(RunFileOptions runFileOptions READ runFileOptions WRITE setRunFileOptions)
8789
Q_PROPERTY(int maxVisibleCompleterItems READ maxVisibleCompleterItems WRITE setMaxVisibleCompleterItems)
8890
Q_PROPERTY(QString commandBuffer READ commandBuffer WRITE setCommandBuffer)
@@ -97,7 +99,6 @@ class CTK_WIDGETS_EXPORT ctkConsole : public QWidget
9799
RemoveTrailingSpaces = 0x02, /*!< Remove trailing spaces of the entered command */
98100
SplitCopiedTextByLine = 0x4 /*!< Copied text is split by lines and each one is executed (expected the last one) */
99101
};
100-
Q_ENUM(EditorHint)
101102
Q_DECLARE_FLAGS(EditorHints, EditorHint)
102103

103104
enum RunFileOption
@@ -106,7 +107,6 @@ class CTK_WIDGETS_EXPORT ctkConsole : public QWidget
106107
RunFileButton = 0x01, /*!< Show a button at the bottom of the console to run a file */
107108
RunFileShortcut = 0x02, /*!< Add the shortcut CTRL+G to run a file */
108109
};
109-
Q_ENUM(RunFileOption)
110110
Q_DECLARE_FLAGS(RunFileOptions, RunFileOption)
111111

112112
ctkConsole(QWidget* parentObject = 0);

Libs/Widgets/ctkCrosshairLabel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class ctkCrosshairLabelPrivate;
4343
class CTK_WIDGETS_EXPORT ctkCrosshairLabel : public QLabel
4444
{
4545
Q_OBJECT
46+
Q_FLAGS(CrosshairType CrosshairTypes)
4647
Q_PROPERTY(bool showCrosshair READ showCrosshair WRITE setShowCrosshair)
4748
// QT designer does not yet support QPen properties, so we provide the
4849
// temporary properties crosshairColor and lineWidth.
@@ -65,7 +66,6 @@ class CTK_WIDGETS_EXPORT ctkCrosshairLabel : public QLabel
6566
SimpleCrosshair = 0,
6667
BullsEyeCrosshair
6768
};
68-
Q_ENUM(CrosshairType)
6969
Q_DECLARE_FLAGS(CrosshairTypes, CrosshairType)
7070

7171
/// Set/get whether or not to draw the crosshair. Default True.

Libs/Widgets/ctkDirectoryButton.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ class CTK_WIDGETS_EXPORT ctkDirectoryButton: public QWidget
8181
Q_PROPERTY(QFileDialog::Options options READ options WRITE setOptions)
8282
#else
8383
Q_PROPERTY(Options options READ options WRITE setOptions)
84+
Q_FLAGS(Option Options);
8485
#endif
8586

8687
public:
@@ -96,7 +97,6 @@ class CTK_WIDGETS_EXPORT ctkDirectoryButton: public QWidget
9697
ReadOnly = 0x00000020,
9798
HideNameFilterDetails = 0x00000040
9899
};
99-
Q_ENUM(Option)
100100
Q_DECLARE_FLAGS(Options, Option)
101101
#endif
102102

Libs/Widgets/ctkDoubleSpinBox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class ctkValueProxy;
4545
class CTK_WIDGETS_EXPORT ctkDoubleSpinBox : public QWidget
4646
{
4747
Q_OBJECT
48+
Q_FLAGS(DecimalsOption DecimalsOptions)
4849

4950
Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
5051
Q_PROPERTY(bool frame READ hasFrame WRITE setFrame)
@@ -151,7 +152,6 @@ class CTK_WIDGETS_EXPORT ctkDoubleSpinBox : public QWidget
151152
/// \sa decimals
152153
DecimalPointAlwaysVisible = 0x080
153154
};
154-
Q_ENUM(DecimalsOption)
155155
Q_DECLARE_FLAGS(DecimalsOptions, DecimalsOption)
156156

157157
enum SizeHintPolicy

0 commit comments

Comments
 (0)