Changeset 25 for trunk/XSUCLWF/cxfel.h

Timestamp:

Oct 9, 2013, 3:48:12 PM (11 years ago)

Author:

marrucho

Message:

version du 10/07 installée à xfel

File:

• trunk/XSUCLWF/cxfel.h (modified) (4 diffs)

trunk/XSUCLWF/cxfel.h

@@ -76 +76 @@
         CDialogConfig();
         CDialogConfig(uint16_t *tab_rp_registers_low,uint16_t *tab_rp_registers_high);
+        String* getTp_max();
 
 protected ://privé sauf au niveau des classes dérivées
@@ -88 +89 @@
         static ArrayList* pal; 
 
+        Label* labTp_max;
+        TextBox* valTp_max;
+        Label* labN_cur;
+        ComboBox* valN_cur;
+        Button* btnAppliquer;
+
 private: 
         void SortirBtn_Clicked(Object* pSender,EventArgs* pArgs);//gestionnaire d'evenement de la boite dialogue
+        void BtnAppliquer_Clicked(Object* pSender,EventArgs* pArgs);//gestionnaire d'evenement de la boite dialogue
 };
 
@@ -119 +127 @@
 protected ://privé sauf au niveau des classes dérivées
         String* name;
-        static String* nameLab_1[] = { "dtp(ms)","dt(sec)","dP(dB)","dPSecu(dB)","Nbal",
+        static String* nameLab_1[] = { "dtp(sec)","dt(sec)","dP(dB)","dPSecu(dB)","Nbal",
                 "P_cde(dBm)","Pp(kW)","Nbal_max","Fr(Hz)","N_cur",
-                "SVd","SVfin","SV1","SV2","V_cur(10-9mbar)",
-                "Pick(kW)","Timer","SVil(10-9mbar)","Sleil(mA)","STc(°C)",
+                "SVd(10-9mbar)","SVfin(10-9mbar)","SV1(10-9mbar)","SV2(10-9mbar)","V_cur(10-9mbar)",
+                "Pi_min(kW)","Timer(min)","SVil(10-9mbar)","Sleil(mA)","STc(°C)",
                 "Eil","Nil","Nil_stat","P_last(dBm)","N_last","dPil(dB)"};
 
@@ -131 +139 @@
         static String* nameLab_4[] = {"a","a","a","b","b","b","c","c","c","d","d","d" };
 
+        static String* nameLab_5[] = {"N_cur","Ln(us)","Tp_max(h)","Pi_max(kW)"};
+
+        static String* nameLab_6[] = {"1","2","3","4","5","6","7","8"};
+
         int indexTextBox;//nb de TextBox
+        int indexTextBoxSave;//nb de TextBox après conditionning
 
 private://données avec controle, label, bouton OK, textBox...