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

kx_utils/kx_pult.h

@@ -21,6 +21,7 @@
 #include <QLabel>
 #include "kx_coeffs.h"
 #include "kx_protocol_x.h"
+#include "kx_protocol_c.h"
 #include "piqt.h"
 #include "session_manager.h"
 #include "qpievaluator.h"
@@ -80,6 +81,7 @@ private:
 	void progress(int val, int max);
 	void clearSelected();
 	QString typeName(const QString & n) const;
+	int parseHeader(const QString & file, QMap<int, KDesc> & map);
 	
 	EVENT_HANDLER1(void, received, bool, ok);
 	EVENT_HANDLER(void, pip_sendFailed) {emit q_k_sendFailed();}
@@ -91,15 +93,15 @@ private:
 	QVector<QLabel * > values;
 	
 	Ui::KX_Pult * ui;
-	PIString config_, name_;
+	PIString config_, name_x, name_c;
 	QDir dir;
-	QString outdir, kdesc_file;
+	QString outdir, kdesc_file, cdesc_file;
 	QFile file;
 	QTime tm, ctm;
 	QIcon icon_record, icon_stop;
 	QTextStream stream;
 	QTimer timer_diag;
-	QMap<int, KDesc> kdesc;
+	QMap<int, KDesc> kdesc, cdesc;
 	QMap<QString, int> knames;
 	QSet<int> calculated;
 	QStringList knames_sort;
@@ -110,6 +112,7 @@ private:
 	//QVector<float> k, x;
 	KX_Coefficients coeffs;
 	__KX_Protocol_X * prot_x;
+	__KX_Protocol_C * prot_c;
 	int csize, wcnt, timer, timer_update, clear_target;
 	bool needWrite, isPause, need_update, show_x;
 
@@ -119,12 +122,15 @@ private slots:
 	void updateGraph();
 	void updateDiag();
 	void updateKDesc(bool ask_move = false);
+	void updateCDesc();
 	void updateTree(bool move = false);
+	void updateCommands();
 	void filterTree();
 	void calculate();
 	void renew(bool write = true);
 	void toggledX(int index, bool on);
 	void changedX(int index, int num);
+	void commandClicked();
 	void k_sendFailed();
 	void k_sendSucceed();
 	void k_receiveFailed();
@@ -137,8 +143,10 @@ private slots:
 	void on_buttonRead_clicked();
 	void on_buttonWrite_clicked();
 	void on_buttonResize_clicked();
-	void on_buttonSetDesc_clicked();
-	void on_buttonReparseDesc_clicked() {updateKDesc(true);}
+	void on_buttonSetKDesc_clicked();
+	void on_buttonReparseKDesc_clicked() {updateKDesc(true);}
+	void on_buttonSetCDesc_clicked();
+	void on_buttonReparseCDesc_clicked() {updateCDesc();}
 	void on_buttonCalculate_clicked() {calculate();}
 	void on_buttonApply_clicked() {renew();}
 	void on_spinSize_valueChanged(int);