#include "wxContourMainFrame.h"
//Test JCP 13-10-08
-#include "wxContourEventHandler.h"
+//#include "wxContourEventHandler.h"
//Test JCP 13-10-08
//----------------------------------------------------------------------------------------------------------------
sizer->Add( _outSizer, 1, wxEXPAND| wxGROW );
sizer->Add( resolutionSizer, 1, wxEXPAND | wxGROW );
SetSizer( sizer );
- Connect( wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onChechBoxClicked );
+ Connect( wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onCheckBoxClicked );
}
sizer->Add( _outSizer, 1, wxEXPAND| wxGROW );
sizer->Add( _resolutionSlider, 1, wxEXPAND | wxGROW );
SetSizer( sizer );
- Connect( wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onChechBoxClicked );
+ Connect( wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onCheckBoxClicked );
}
wxInstantChooserPanel :: ~wxInstantChooserPanel()
}
else
{
- for(int i=0; i<_concepts->size(); i++)
+ for(int i=0; i< (int)(_concepts->size()); i++)
{
changeResolutionAtConceptControl( (*_concepts)[i] );
}
}
//------------------------------------------------------------------------------------------------------------
- void wxInstantChooserPanel :: onChechBoxClicked( wxCommandEvent& event )
+ void wxInstantChooserPanel :: onCheckBoxClicked( wxCommandEvent& event )
{
- int groupID = (int)event.GetClientData();
+ /*int groupID = (int)event.GetClientData();
wxConceptControl * eventConcept = (wxConceptControl *)event.GetEventObject();
if ( eventConcept->getIfChecked( groupID ) )
{
}
}
}
+ }*/
+
+ int groupID = (int)event.GetClientData();
+ wxConceptControl * eventConcept = (wxConceptControl *)event.GetEventObject();
+ if ( eventConcept->getIfChecked( groupID ) )
+ {
+ int size = _concepts->size();
+ wxConceptControl * aConcept = NULL;
+// int accum = 0;
+
+ for(int i = 0; i < eventConcept->getNumCheckBox();i++){
+ if(i!=groupID){
+ eventConcept->clearCheckAt(i);
+ }
+ }
+ for(int i=0; i<size; i++)
+ {
+ aConcept = (*_concepts)[i];
+ if( aConcept!= eventConcept )
+ {
+ if( aConcept->getIfChecked( groupID ) )
+ {
+ aConcept->clearCheckAt( groupID );
+ }
+ }
+ }
}
}
//-------------------------------------------------
wxCommandEvent newevent(wxINSTANT_CHOOSER_CHANGE,GetId());
//this->onChangeInstant(newevent);
- ((wxContourEventHandler*)_eventHandler)->onChangeInstant(newevent);
+ ConceptDataWrap * dataConcept = getLastConceptData();
+ if(getIfConceptCheckedAt( dataConcept->getName(), 0 )){
+ wxContourMainFrame::getInstance()->onChangeInstantInstantPanel(dataConcept->getName(), dataConcept->getActualValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue());
+ }
+ //((wxContourEventHandler*)_eventHandler)->onChangeInstant(newevent);
//_eventHandler->ProcessEvent(newevent);
}
void wxInstantChooserPanel :: setInstant(std::vector<int> choiceInstant)
{
int max = _concepts->size();
- if( choiceInstant.size() == max )
+ if( (int)(choiceInstant.size()) == max )
{
int i = 0;
while(i< max)
bool isChecked = false;
int i,size = _concepts->size();
- wxConceptControl * aConcept = NULL;
+// wxConceptControl * aConcept = NULL;
for ( i=0; i<size && !isChecked; i++ )
{
if( (*_concepts)[i]->getName().compare( theConceptName ) == 0 )
}
+ void wxInstantChooserPanel::addConcepts(std::vector<std::string> conceptNameVect,std::vector<int> conceptSizeVect){
+ int i=0;
+ int max = conceptNameVect.size();
+ for( ; i<max; i++)
+ {
+ if( conceptNameVect[i].compare("Axe Depth") == 0 )
+ {
+ addConcept( conceptNameVect[i], 0, conceptSizeVect[i], 1);
+ } else {
+ addConcept( conceptNameVect[i], 1, conceptSizeVect[i], 1);
+ } // if
+ }
+ }
+