Replace obsolete StoreSCP class

sjswerdloff · Dec 31, 2024 · 6ab9f2c · 6ab9f2c
1 parent 33f0115
commit 6ab9f2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 202 deletions.
diff --git a/tdwii_plus_examples/TDWII_PPVS_subscriber/cstore_handler.py b/tdwii_plus_examples/TDWII_PPVS_subscriber/cstore_handler.py
diff --git a/tdwii_plus_examples/TDWII_PPVS_subscriber/ppvsscp.py b/tdwii_plus_examples/TDWII_PPVS_subscriber/ppvsscp.py
@@ -6,10 +6,10 @@
 from tdwii_plus_examples import tdwii_config
 from tdwii_plus_examples.basescp import BaseSCP
 from tdwii_plus_examples.TDWII_PPVS_subscriber.nevent_receiver import NEventReceiver
-from tdwii_plus_examples.TDWII_PPVS_subscriber.storescp import StoreSCP
+from tdwii_plus_examples.cstorescp import CStoreSCP
 
 
-class PPVS_SCP(NEventReceiver, StoreSCP):
+class PPVS_SCP(NEventReceiver, CStoreSCP):
     def __init__(
         self,
         ae_title: str = "PPVS_SCP",
@@ -27,15 +27,15 @@ def __init__(
         if port < 1:
             port = tdwii_config.known_ae_port[ae_title]
         self.nevent_callback = nevent_callback
-        StoreSCP.__init__(
+        CStoreSCP.__init__(
             self,
             ae_title=ae_title,
             port=port,
             logger=logger,
             bind_address=bind_address,
+            sop_classes=None,  # use first 128 SOP Classes
+            transfer_syntaxes=None,  # use pynetdicom defaults xfer syntaxes
             custom_handler=custom_cstore_handler,
-            storage_presentation_contexts=storage_presentation_contexts,
-            transfer_syntaxes=transfer_syntaxes,
             store_directory=store_directory,
         )
         NEventReceiver.__init__(
@@ -48,11 +48,11 @@ def __init__(
         )
 
     def _add_contexts(self):
-        StoreSCP._add_contexts(self)
+        CStoreSCP._add_contexts(self)
         NEventReceiver._add_contexts(self)
 
     def _add_handlers(self):
-        StoreSCP._add_handlers(self)
+        CStoreSCP._add_handlers(self)
         NEventReceiver._add_handlers(self)
 
     def run(self):

diff --git a/tdwii_plus_examples/TDWII_PPVS_subscriber/storescp.py b/tdwii_plus_examples/TDWII_PPVS_subscriber/storescp.py