Mercurial > hg > orthanc

comparison UnitTestsSources/MultiThreadingTests.cpp @ 3785:763533d6dd67 SylvainRouquette/fix-issue169-95b752c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add PreferredTransferSyntax to RemoteModalityParameters DicomUserConnection can now use RemoteModalityParameters.PreferredTransferSyntax instead of using the default transfer syntax (LE-implicit). This way we can transcode by default in LE-explicit. fix issue #169
author sylvain.rouquette@incepto-medical.com
date Wed, 18 Mar 2020 08:59:06 +0100
parents e44e0127e553
children 3801435e34a1
comparison
equal deleted inserted replaced
3541:4beabcea3a5c 3785:763533d6dd67
1409 RemoteModalityParameters modality; 1409 RemoteModalityParameters modality;
1410 modality.SetApplicationEntityTitle("REMOTE"); 1410 modality.SetApplicationEntityTitle("REMOTE");
1411 modality.SetHost("192.168.1.1"); 1411 modality.SetHost("192.168.1.1");
1412 modality.SetPortNumber(1000); 1412 modality.SetPortNumber(1000);
1413 modality.SetManufacturer(ModalityManufacturer_StoreScp); 1413 modality.SetManufacturer(ModalityManufacturer_StoreScp);
1414 modality.SetPreferredTransferSyntax("1.2.840.10008.1.2");
1414 1415
1415 StoreScuOperation operation("TEST", modality); 1416 StoreScuOperation operation("TEST", modality);
1416 1417
1417 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, operation)); 1418 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, operation));
1418 operation.Serialize(s); 1419 operation.Serialize(s);
1494 RemoteModalityParameters modality; 1495 RemoteModalityParameters modality;
1495 modality.SetApplicationEntityTitle("REMOTE"); 1496 modality.SetApplicationEntityTitle("REMOTE");
1496 modality.SetHost("192.168.1.1"); 1497 modality.SetHost("192.168.1.1");
1497 modality.SetPortNumber(1000); 1498 modality.SetPortNumber(1000);
1498 modality.SetManufacturer(ModalityManufacturer_StoreScp); 1499 modality.SetManufacturer(ModalityManufacturer_StoreScp);
1500 modality.SetPreferredTransferSyntax("1.2.840.10008.1.2");
1499 1501
1500 DicomModalityStoreJob job(GetContext()); 1502 DicomModalityStoreJob job(GetContext());
1501 job.SetLocalAet("LOCAL"); 1503 job.SetLocalAet("LOCAL");
1502 job.SetRemoteModality(modality); 1504 job.SetRemoteModality(modality);
1503 job.SetMoveOriginator("MOVESCU", 42); 1505 job.SetMoveOriginator("MOVESCU", 42);
1908 ASSERT_THROW(modality.SetPortNumber(65535), OrthancException); 1910 ASSERT_THROW(modality.SetPortNumber(65535), OrthancException);
1909 modality.SetApplicationEntityTitle("HELLO"); 1911 modality.SetApplicationEntityTitle("HELLO");
1910 modality.SetHost("world"); 1912 modality.SetHost("world");
1911 modality.SetPortNumber(45); 1913 modality.SetPortNumber(45);
1912 modality.SetManufacturer(ModalityManufacturer_Dcm4Chee); 1914 modality.SetManufacturer(ModalityManufacturer_Dcm4Chee);
1915 modality.SetPreferredTransferSyntax("1.2.840.10008.1.2");
1913 modality.Serialize(s, true); 1916 modality.Serialize(s, true);
1914 ASSERT_EQ(Json::objectValue, s.type()); 1917 ASSERT_EQ(Json::objectValue, s.type());
1915 } 1918 }
1916 1919
1917 { 1920 {