spectrum, wifi: Move wifi spectrum value helper class to wifi module

src/spectrum/CMakeLists.txt

@@ -36,7 +36,6 @@ set(source_files
     model/trace-fading-loss-model.cc
     model/tv-spectrum-transmitter.cc
     model/waveform-generator.cc
-    model/wifi-spectrum-value-helper.cc
 )
 
 set(header_files
@@ -77,7 +76,6 @@ set(header_files
     model/trace-fading-loss-model.h
     model/tv-spectrum-transmitter.h
     model/waveform-generator.h
-    model/wifi-spectrum-value-helper.h
     test/spectrum-test.h
 )
 

src/wifi/CMakeLists.txt

@@ -160,6 +160,7 @@ set(source_files
     model/yans-error-rate-model.cc
     model/yans-wifi-channel.cc
     model/yans-wifi-phy.cc
+    model/wifi-spectrum-value-helper.cc
 )
 
 set(header_files
@@ -324,6 +325,7 @@ set(header_files
     model/yans-error-rate-model.h
     model/yans-wifi-channel.h
     model/yans-wifi-phy.h
+    model/wifi-spectrum-value-helper.h
 )
 
 build_lib(

src/wifi/helper/wifi-helper.cc

@@ -968,6 +968,7 @@ WifiHelper::EnableLogComponents(LogLevel logLevel)
     LogComponentEnable("WifiRemoteStationManager", logLevel);
     LogComponentEnable("WifiSpectrumPhyInterface", logLevel);
     LogComponentEnable("WifiSpectrumSignalParameters", logLevel);
+    LogComponentEnable("WifiSpectrumValueHelper", logLevel);
     LogComponentEnable("WifiTxCurrentModel", logLevel);
     LogComponentEnable("WifiTxParameters", logLevel);
     LogComponentEnable("WifiTxTimer", logLevel);
@@ -979,9 +980,6 @@ WifiHelper::EnableLogComponents(LogLevel logLevel)
     LogComponentEnable("WifiHelper", logLevel);
     LogComponentEnable("SpectrumWifiHelper", logLevel);
     LogComponentEnable("YansWifiHelper", logLevel);
-
-    // From Spectrum
-    LogComponentEnable("WifiSpectrumValueHelper", logLevel);
 }
 
 int64_t

src/wifi/model/wifi-phy-common.h

@@ -22,11 +22,11 @@
 #ifndef WIFI_PHY_COMMON_H
 #define WIFI_PHY_COMMON_H
 
+#include "wifi-spectrum-value-helper.h"
 #include "wifi-standards.h"
 
 #include "ns3/fatal-error.h"
 #include "ns3/ptr.h"
-#include "ns3/wifi-spectrum-value-helper.h"
 
 #include <ostream>
 

src/wifi/model/wifi-spectrum-value-helper.h

@@ -22,7 +22,7 @@
 #ifndef WIFI_SPECTRUM_VALUE_HELPER_H
 #define WIFI_SPECTRUM_VALUE_HELPER_H
 
-#include "spectrum-value.h"
+#include <ns3/spectrum-value.h>
 
 namespace ns3
 {