BUG: Use port 104 as default for www.dicomserver.co.uk

commontk · Jan 9, 2024 · 0d82ac9 · 0d82ac9
1 parent ddbdb76
commit 0d82ac9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Applications/ctkDICOMDemoSCU/Testing/Cpp/ctkDICOMDemoSCUTest1.cpp b/Applications/ctkDICOMDemoSCU/Testing/Cpp/ctkDICOMDemoSCUTest1.cpp
@@ -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;

diff --git a/Applications/ctkDICOMQuery/ctkDICOMQueryMain.cpp b/Applications/ctkDICOMQuery/ctkDICOMQueryMain.cpp
@@ -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:

diff --git a/Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMServerNodeWidget2Test1.cpp b/Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMServerNodeWidget2Test1.cpp
@@ -72,7 +72,7 @@ int ctkDICOMServerNodeWidget2Test1( int argc, char * argv [] )
   CHECK_QSTRING(widget.getServer("MedicalConnections")->callingAETitle(), "CTK");
   CHECK_QSTRING(widget.getServer("MedicalConnections")->calledAETitle(), "ANYAE");
   CHECK_QSTRING(widget.getServer("MedicalConnections")->host(), "dicomserver.co.uk");
-  CHECK_INT(widget.getServer("MedicalConnections")->port(), 11112);
+  CHECK_INT(widget.getServer("MedicalConnections")->port(), 104);
   CHECK_QSTRING(widget.getServer("MedicalConnections")->retrieveProtocolAsString(), "CGET");
   CHECK_INT(widget.getServer("MedicalConnections")->connectionTimeout(), 30);
 

diff --git a/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp
@@ -56,7 +56,7 @@ ctkDICOMServerNodeWidget::ctkDICOMServerNodeWidget(QWidget* parentWidget)
   , d_ptr(new ctkDICOMServerNodeWidgetPrivate)
 {
   Q_D(ctkDICOMServerNodeWidget);
- 
+
   d->setupUi(this);
 
   // checkable headers.
@@ -122,7 +122,7 @@ int ctkDICOMServerNodeWidget::addServerNode(const QMap<QString, QVariant>& node)
 {
   Q_D(ctkDICOMServerNodeWidget);
   const int row = this->addServerNode();
-  
+
   QTableWidgetItem *newItem;
   newItem = new QTableWidgetItem( node["Name"].toString() );
   newItem->setCheckState( Qt::CheckState(node["CheckState"].toInt()) );
@@ -164,7 +164,7 @@ void ctkDICOMServerNodeWidget::saveSettings()
 
   QSettings settings;
   const int rowCount = d->NodeTable->rowCount();
-  
+
   settings.setValue("ServerNodeCount", rowCount);
   for (int row = 0; row < rowCount; ++row)
     {
@@ -204,13 +204,13 @@ void ctkDICOMServerNodeWidget::readSettings()
     defaultServerNode["CGET"] = static_cast<int>(Qt::Unchecked);
     this->addServerNode(defaultServerNode);
 
-    // the uk example - see http://www.dicomserver.co.uk/ 
+    // the uk example - see http://www.dicomserver.co.uk/
     // and http://www.medicalconnections.co.uk/
     defaultServerNode["Name"] = QString("MedicalConnections");
     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);
 

diff --git a/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget2.cpp b/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget2.cpp
@@ -1054,7 +1054,7 @@ void ctkDICOMServerNodeWidget2::readSettings()
     defaultServerNode["Calling AETitle"] = QString("CTK");
     defaultServerNode["Called AETitle"] = QString("ANYAE");
     defaultServerNode["Address"] = QString("dicomserver.co.uk");
-    defaultServerNode["Port"] = QString("11112");
+    defaultServerNode["Port"] = QString("104");
     defaultServerNode["Protocol"] = QString("CGET");
     defaultServerNode["Timeout"] = QString("30");
     defaultServerNode["Proxy"] = QString("");