modification of HPLC controller special gui stuff

src/controllers/lss/d22/hplc/HplcController.cpp

@@ -201,11 +201,34 @@ HplcController::HplcController(const HplcController& controller) {
 	m_count.copy(controller.m_count);
 	m_hplcSample.copy(controller.m_hplcSample);
 
+//	m_pumpH.assign(cloneController(controller.m_pumpH->getName()));
+//	m_pumpD.assign(cloneController(controller.m_pumpD->getName()));
+//	m_alias.assign(cloneController(controller.m_alias->getName()));
+//	m_collector.assign(cloneController(controller.m_collector->getName()));
+//	m_detector.assign(cloneController(controller.m_detector->getName()));
+//	m_valveH.assign(cloneController(controller.m_valveH->getName()));
+//	m_valveD.assign(cloneController(controller.m_valveD->getName()));
+//	m_valvePOST.assign(cloneController(controller.m_valvePOST->getName()));
+//	m_valveANTE.assign(cloneController(controller.m_valveANTE->getName()));
+//	m_count.assign(cloneController(controller.m_count->getName()));
+//	m_hplcSample.assign(cloneController(controller.m_hplcSample->getName()));
+
 
 	m_isStopped = false;
 }
 
 HplcController::~HplcController() {
+//	removeCloneController(m_pumpH.get());
+//	removeCloneController(m_pumpD.get());
+//	removeCloneController(m_alias.get());
+//	removeCloneController(m_collector.get());
+//	removeCloneController(m_detector.get());
+//	removeCloneController(m_valveH.get());
+//	removeCloneController(m_valveD.get());
+//	removeCloneController(m_valvePOST.get());
+//	removeCloneController(m_valveANTE.get());
+//	removeCloneController(m_count.get());
+//	removeCloneController(m_hplcSample.get());
 
 }
 
@@ -235,11 +258,11 @@ void HplcController::postConfiguration() {
 
 	// test init with default values
 	for (int32 i = 0; i < numberValvePositions(); ++i) {
-		valveHPositionNames.set(i, "");
-		valveDPositionNames.set(i, "");
-		elutionValvePositionNames.set(i, "");
-		equilibrationValvePositionNames.set(i, "");
-		valvePositions.set(i, "");
+//		valveHPositionNames.set(i, "");
+//		valveDPositionNames.set(i, "");
+//		elutionValvePositionNames.set(i, "");
+//		equilibrationValvePositionNames.set(i, "");
+//		valvePositions.set(i, "");
 	}
 
 	elutionValve.setEnumeratedValues(valvePositions);
@@ -252,8 +275,8 @@ void HplcController::postConfiguration() {
 	samplePositions.resize(numberOfSamples());
 
 	for (int32 i = 0; i < numberOfSamples(); ++i) {
-		sampleNames.set(i, "");
-		samplePositions.set(i, "");
+//		sampleNames.set(i, "");
+//		samplePositions.set(i, "");
 	}
 
 	sample.setEnumeratedLabels(sampleNames);

src/controllers/lss/d22/hplc/HplcSample.cpp

@@ -60,15 +60,15 @@ void HplcSample::postConfiguration() {
 	valvePositions.resize(6);
 
 	// Set default values
-	for (int32 i = 0; i < 6; i++) {
-		int index = i + 1;
-		std::stringstream st;
-		st << index;
-		std::string value = st.str();
-		valveHPositionNames.set(i, value);
-		valveDPositionNames.set(i, value);
-		valvePositions.set(i, value);
-	}
+//	for (int32 i = 0; i < 6; i++) {
+//		int index = i + 1;
+//		std::stringstream st;
+//		st << index;
+//		std::string value = st.str();
+//		valveHPositionNames.set(i, value);
+//		valveDPositionNames.set(i, value);
+//		valvePositions.set(i, value);
+//	}
 
 	// To avoid problems of synchronization fix the size of the properties sampleNames and samplePositions to 10.
 	sampleNames.resize(10);