From 2dc40d13f59499877c50a3c674d2139ba5c66623 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Tue, 2 Feb 2010 02:30:19 +0000
Subject: [PATCH] Put the constructor and destructor of the Calibration Manager
as protected to prevent multi-instantiation of the CalibrationManager -
Destructor and COnstructor are now protected
---
NPLib/CalibrationManager/CalibrationManager.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/NPLib/CalibrationManager/CalibrationManager.h b/NPLib/CalibrationManager/CalibrationManager.h
index 69df3a9f7..8597adf7d 100644
--- a/NPLib/CalibrationManager/CalibrationManager.h
+++ b/NPLib/CalibrationManager/CalibrationManager.h
@@ -33,7 +33,7 @@ using namespace std ;
class CalibrationManager
{
- public: // Constructor and Destructor
+ protected: // Constructor and Destructor are protected because the class is a singleton
CalibrationManager(string configFileName);
~CalibrationManager();
@@ -61,9 +61,9 @@ class CalibrationManager
double ApplyCalibration(string ParameterPath , double RawValue);
- public: // To be called after initialisation
- // Loop over the file list and catch the file used for calibration
- void LoadParameterFromFile();
+ public: // To be called after initialisation
+ // Loop over the file list and catch the file used for calibration
+ void LoadParameterFromFile();
private:
--
GitLab