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

Jump to bottom

Fix DICOM tests and update ctkFileDialog to consider AA_DontUseNativeDialogs attribute #1166

Merged
merged 6 commits into from
Jan 13, 2024
Merged

Fix DICOM tests and update ctkFileDialog to consider AA_DontUseNativeDialogs attribute #1166

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c006c6c
BUG: Fix ctkDICOMDatabaseTest2 comparing upper-cased tag
jcfr Jan 12, 2024
bce599e
BUG: Fix connection with "dicomserver.co.uk" server using port 104 as…
Punzo Jan 8, 2024
02fee35
BUG: Ensure ctkFileDialog respects application attribute AA_DontUseNa…
jcfr Jan 13, 2024
673d1e7
BUG: Fix segfault in ctkDICOMAppWidget support use of native file dialog
jcfr Jan 13, 2024
5d3cd50
BUG: Fix support of interactive mode in ctkDICOMAppWidgetTest1
Punzo Jan 12, 2024
0257b0a
BUG: Fix ctkDICOMBrowserTester checking for use of native file dialog
Punzo Jan 12, 2024
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
2 changes: 1 addition & 1 deletion Applications/ctkDICOMDemoSCU/Testing/Cpp/ctkDICOMDemoSCUTest1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int ctkDICOMDemoSCUTest1(int argc, char * argv [])
{
QCoreApplication app(argc, argv);
QString peer("www.dicomserver.co.uk");
QString port("11112");
QString port("104");
QString aeTitle("MOVESCP");
QStringList parameters;
parameters << peer << port << aeTitle;
Expand Down
2 changes: 1 addition & 1 deletion Applications/ctkDICOMQuery/ctkDICOMQueryMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*
* ../CTK-build/bin/ctkDICOMQuery test.db FINDSCU MI2B2 mi2b2.slicer.org 11112
* or this one:
* ../CTK-build/bin/ctkDICOMQuery test.db FINDSCU DICOMSERVER dicomserver.co.uk 11112
* ../CTK-build/bin/ctkDICOMQuery test.db FINDSCU DICOMSERVER dicomserver.co.uk 104
*
* you can get a similar
* functionality with this command line:
Expand Down
2 changes: 1 addition & 1 deletion Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ int ctkDICOMDatabaseTest2( int argc, char * argv [] )
return EXIT_FAILURE;
}

if ( database.groupElementToTag(group, element) != tag )
if ( database.groupElementToTag(group, element) != tag.toUpper() )
{
std::cerr << "ctkDICOMDatabase: could not convert a uints to tag string" << std::endl;
return EXIT_FAILURE;
Expand Down
2 changes: 1 addition & 1 deletion Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void ctkDICOMServerNodeWidget::readSettings()
defaultServerNode["CheckState"] = static_cast<int>(Qt::Unchecked);
defaultServerNode["AETitle"] = QString("ANYAE");
defaultServerNode["Address"] = QString("dicomserver.co.uk");
defaultServerNode["Port"] = QString("11112");
defaultServerNode["Port"] = QString("104");
defaultServerNode["CGET"] = static_cast<int>(Qt::Checked);
this->addServerNode(defaultServerNode);

Expand Down
6 changes: 6 additions & 0 deletions Libs/Widgets/ctkFileDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
=========================================================================*/

// QT includes
#include <QGuiApplication>
#include <QChildEvent>
#include <QDebug>
#include <QDialogButtonBox>
Expand Down Expand Up @@ -144,6 +145,11 @@ ctkFileDialog::ctkFileDialog(QWidget *parentWidget,
{
Q_D(ctkFileDialog);

if (QGuiApplication::testAttribute(Qt::AA_DontUseNativeDialogs))
{
this->setOptions(QFileDialog::DontUseNativeDialog);
}
Comment on lines +148 to +151
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc: @jamesobutler


d->init();
}

Expand Down