void pPlotterWindow::setActualScales()
{
// int maxX,maxY,minX,minY; // JPRx
+ int maxX,maxY;//,minX,minY; // JPRx //EED
/*
if the function is drawed interactively the maxX and the
maxY in actual are sets by the user
function->initializeSplineVectors();
UpdateAll();
}
- // bool added1= functions.Append(function)!=NULL; // JPRx
+
+// bool added1= functions.Append(function)!=NULL; // JPRx
+ functions.Append(function); //EED
int id=functions.IndexOf(function);
- /* bool added2= */ AddLayer(function);// JPRx
+
+ // bool added2= AddLayer(function);// JPRx
+ AddLayer(function); //EED
+
UpdateAll();
return id;//added1 && added2;
}
m_popmenu.Enable(mpID_LINE_GUIDES,true);
m_popmenu.Enable(pwID_TRASLATEACTUALFUNCTION,true);
//------------------------------------------
- //Sending the paarticular event of changed actual function
+ //Sending the particular event of changed actual function
//-------------------------------------------
wxCommandEvent cevent( wxEVT_PPLOTTER_CHANGED_FUNCTION, GetId() );
cevent.SetEventObject(this);
UpdateAll();
}
/*
-* Guide lines menu handler method that reacts to the mpID_LINE_GUIDES cimmand event
+* Guide lines menu handler method that reacts to the mpID_LINE_GUIDES command event
* event The corresponding event to handle
*/
void pPlotterWindow :: OnGuideLines (wxCommandEvent &event)
pGraphicalFunction* pPlotterWindow::getFunction(int index)
{
wxNode* node=functions.Item(index);
+ if(node==NULL){
+ return NULL;
+ }
return (pGraphicalFunction*)node->GetData();
}
/*
move the functions that the user wants to move
- and that were setted in functionsToMove
- @param porcentageMinX:the porcentage that the minShowed
- of the funcntions have to be move
+ and that were set in functionsToMove
+ @param porcentageMinX:the percentage that the minShowed
+ of the functions have to be move
0<=porcentageMinX<=1
- @param porcentageMaxX:the porcentage that the maxShowed
- of the funcntions have to be move
+ @param porcentageMaxX:the percentage that the maxShowed
+ of the functions have to be move
0<=porcentageMaxX<=1
*/
*/
int pPlotterWindow::addFunctionToMove(pGraphicalFunction *function)
{
- // bool added1= functionsToMove.Append(function)!=NULL; // JPRx
+ //bool added1= functionsToMove.Append(function)!=NULL; // JPRx
+ functionsToMove.Append(function); // EED
+
int id=functionsToMove.IndexOf(function);
UpdateAll();
return id;