Compile with new versions of creatools

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxConceptControl.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
index 47c1c7e923de0f70e13e86560e10e79a104e036c..deb0a77236c4549b00f4347e6af32594086f928c 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
@@ -26,6 +26,7 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
 
                minValue = minV;
                maxValue = maxV;
+               _numCheckBox = 0;
                
                showLabels = true;
 
@@ -217,7 +218,12 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
                        char a = *elements;     
                        if( a == 67 || a == 99 )// Including C:67 or c:99 as a checkBox (ASCII)
                        {
-                               createCheckBoxAndAddToSizer( checkSizer, "", -1, ckecks);
+                               /*if(ckecks==0){
+                                       createCheckBoxAndAddToSizer( checkSizer, "X", -1, ckecks);
+                               }else{
+                                       createCheckBoxAndAddToSizer( checkSizer, "Y", -1, ckecks);
+                               }*/
+                               createCheckBoxAndAddToSizer( checkSizer, "X", -1, ckecks);
                                ckecks++;
                        }
                        else if ( a == 84 || a==116 )// Including T:84 or t t:116 as textCtrl (ASCII)
@@ -226,9 +232,14 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
                        }
                        i++;
                }
+               _numCheckBox = ckecks;
                sizer->Add(checkSizer, 0, wxGROW |wxALL );      
        }
 
+       int wxConceptControl :: getNumCheckBox(){
+               return _numCheckBox;
+       }
+
        //------------------------------------------------------------------------------------------------------------
        wxCheckBox * wxConceptControl :: createCheckBoxAndAddToSizer(wxSizer *sizer, std::string label, wxWindowID id,int groupID)
        {
@@ -236,10 +247,16 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
                //itoa( groupID, buffer, 10);
 
                std::string buffer;
-               for(int k = groupID; k == 0; k++){
-                       char temp = k % 10 + 48;
-                       k = k / 10;
-                       buffer = temp + buffer; 
+               
+               if(groupID == 0){
+                       buffer = "0";
+               }else{
+                       int k=groupID;
+                       while (k > 0){
+                               char temp = k % 10 + 48;
+                               k = k / 10;
+                               buffer = temp + buffer; 
+                       }
                }
 
                //wxCheckBox *checkbox = new wxCheckBox( this, -1, wxString(  label.c_str(), wxConvUTF8), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxString( buffer, wxConvUTF8) );