Merge branch 'amdadev' into develop

Benjamin Renard
2 parents 6593ba1b 6fd24604
Showing 5 changed files with 16 additions and 3 deletions Show diff stats
CMakeLists.txt
src/ParamGetImpl/DDServerInterface/VirtualInstrument.cc
src/ParamOutputImpl/Plot/Time/TimePlot.cc
src/Parameters/DataTypeMath.hh
src/TimeTableCatalog/VOTableWriter.cc
@@ -4,7 +4,7 @@ PROJECT(AMDA-Kernel)
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
@@ -224,6 +224,16 @@ namespace DDServerInterface {
 					sleep(2);
 					error = lDDClient.DD_SetTime(lId, startTime);
 				}
+				if (error == NODATAATTIME) {
+					// In some case, GlobalStart can be not exactly the real first time's record of a dataset...
+					int offset = 0;
+					while (error == NODATAATTIME && offset < 60) {
+						++offset;
+						LOG4CXX_DEBUG(gLogger, "VirtualInstrument::getParamPusher: DD_SetTime("<< startTime << ") returns = (" << error << ")");
+						Double2DD_Time(startTime,_globalStartTime+offset);
+						error = lDDClient.DD_SetTime(lId, startTime);
+					}
+				}
 				if (error < 0)
 				{
 					lDDClient.DD_Close(lId);
@@ -1792,7 +1792,7 @@ namespace plot
 		AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId());
 		//get computed values
-		int startIndex, nbData;
+		int startIndex, nbData = 0;
 		data.getIntervalBounds(startDate, stopDate, startIndex, nbData);
 		Color crtColor;
@@ -1564,7 +1564,7 @@ template&lt;typename Type&gt;
 bool isValid(const std::string& num) {
     bool flag = true;
     try {
-        Type tmp = boost::lexical_cast<Type>(num);
+        boost::lexical_cast<Type>(num);
     } catch (boost::bad_lexical_cast &e) {
         flag = false;
     }
@@ -193,6 +193,9 @@ void VOTableWriter::writeVOTable(const TimeTable&amp; pTT,
 				case ParameterDescription::ParameterType::String:
 					size = -1;
 					break;
+				default:
+					// Nothing to do
+					break;
 			}
 		}