Changeset 37 for trunk/XSUCLWF/cxfel.h

Timestamp:

May 16, 2014, 6:30:01 PM (10 years ago)

Author:

marrucho

Message:

version du 16 mai 2014 utilisée

File:

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

trunk/XSUCLWF/cxfel.h

@@ -28 +28 @@
 using namespace System::Threading;
 using namespace System::Collections;
+
+
 
 #define NB_BANCS                                4
@@ -67 +69 @@
 //      TextBox* GetTextBox();
 //      void SetVal(String*);
+        void SetValNumP(String*);
+        void SetValNumC1(String*);
+        void SetValNumC2(String*);
+
+        String* GetValNumP();
+        String* GetValNumC1();
+        String* GetValNumC2();
+
 protected:
         static int nbInstance=0;//variable de classe
@@ -77 +87 @@
         CDialogConfig(uint16_t *tab_rp_registers_low,uint16_t *tab_rp_registers_high);
         String* getTp_max();
+        String* getN_cur();
 
 protected ://privé sauf au niveau des classes dérivées
@@ -94 +105 @@
         ComboBox* valN_cur;
         Button* btnAppliquer;
+        Label* labN_cur4Reprise;
+        TextBox* valN_cur4Reprise;
+        Button* btnN_curAppliquer;
+
+        static int lectBddFic=true;//bdd=true, fichier=false
+
+        GroupBox* gboxAuto;
+        RadioButton* rbAutoBdd;//lecture bdd
+    RadioButton* rbAutoFichier;//lecture fichier
+        Button* BtnAppliquerAuto;
 
 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
+
+        void BtnAppliquerAuto_Clicked(Object* pSender,EventArgs* pArgs);//gestionnaire d'evenement de la boite dialogue
+        void Radio_Clicked(Object* pSender, EventArgs* pArgs);//remplit automatiquement la zone de texte
+
+        void btnN_curAppliquer_Clicked(Object* pSender,EventArgs* pArgs);//gestionnaire d'evenement de la boite dialogue
 };
 
@@ -127 +153 @@
 protected ://privé sauf au niveau des classes dérivées
         String* name;
-        static String* nameLab_1[] = { "dtp(sec)","dt(sec)","dP(dB)","dPSecu(dB)","Nbal",
+        static String* nameLab_1[] = { "dtp(min)","dt(sec)","dP(dB)","dPSecu(dB)","Nbal",
                 "P_cde(dBm)","Pp(kW)","Nbal_max","Fr(Hz)","N_cur",
-                "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)",
+                "SVd(10-10mbar)","SVfin(10-10mbar)","SV1(10-10mbar)","SV2(10-10mbar)","V_cur(10-10mbar)",
+                "Pi_min(kW)","Timer(min)","SVil(10-10mbar)","Sleil(mA)","STc(°C)",
                 "Eil","Nil","Nil_stat","P_last(dBm)","N_last","dPil(dB)"};
 
@@ -139 +165 @@
         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_5[] = {"N_cur","Ln(us)","Tp_max(min)","Pi_max(kW)"};
 
         static String* nameLab_6[] = {"1","2","3","4","5","6","7","8"};