git-svn-id: svn://db.shs.com.ru/libs@386 a8b55f48-bf90-11e4-a774-851b48703e85

cd_utils/cdutils_types.cpp

@@ -18,7 +18,7 @@ CDType::CDType() {
 	cd_type_ = cdNull;
 	parent = 0;
 	avg_size = 1;
-	mode_ = X_Current;
+	mode_ = rmode_ = X_Current;
 //	debug_cnt = cdtype_debug_cnt;
 //	cdtype_debug_cnt++;
 //	piCout << "[CDType]" << "create Null" << debug_cnt;
@@ -41,7 +41,7 @@ CDType::CDType(int i, const PIString & n, const PIString & t, const PIString & v
 	calculated = x_enabled = false;
 	parent = 0;
 	avg_size = 1;
-	mode_ = X_Current;
+	mode_ = rmode_ = X_Current;
 	if (type_ == "e") {
 		enum_values = parseEnumComment(comment_);
 //		piCout << enum_values.size() << enum_values;
@@ -122,7 +122,8 @@ PIStringList CDType::pathString() const {
 void CDType::readX(PIByteArray & ba) {
 	if (ba.size() < 5) return;
 	uchar t(0); ba >> t;
-	switch ((XMode)t) {
+	rmode_ = (XMode)t;
+	switch (rmode_) {
 	case X_Current:
 		ba >> value_d;
 		break;

cd_utils/cdutils_types.h

@@ -59,6 +59,7 @@ public:
 	void setXMode(XMode mode) {mode_ = mode;}
 	void setAvg(int avg) {avg_size = avg;}
 	XMode xmode() const {return mode_;}
+	XMode xmode_rec() const {return rmode_;}
 	int avg() const {return avg_size;}
 	bool isSelectedX() const {return x_enabled;}
 	void readX(PIByteArray & ba);
@@ -81,7 +82,7 @@ protected:
 	bool value_b, calculated, x_enabled;
 	PIVector<double> avg_h;
 	int avg_size;
-	XMode mode_;
+	XMode mode_, rmode_;
 };
 
 

cd_utils/cdutils_x.cpp

@@ -44,6 +44,11 @@ PIVector<PIDeque<int> > XInterface::enabledList() const {
 }
 
 
+void XInterface::setEnabledList(const PIVector<PIDeque<int> > & l) {
+	CDCore::instance()->x_selected = l;
+}
+
+
 void XInterface::lock() {
 	CDCore::instance()->x_mutex.lock();
 }

cd_utils/cdutils_x.h

@@ -27,6 +27,7 @@ public:
 	void setEnabled(const CDType & x, bool en);
 	void setDisabled(const CDType & x, bool dis) {setEnabled(x, !dis);}
 	PIVector<PIDeque<int> > enabledList() const;
+	void setEnabledList(const PIVector<PIDeque<int> > & l);
 	void lock();
 	void unlock();