@ -1,5 +1,6 @@
# include "displayMenuCalculator.h"
# include "displayMenuCalculator.h"
# include "calculatorGetUserInput.c"
# include "calculatorGetUserInput.c"
# include "calculatorGetUserInputFactorial.c"
/ / Note :
/ / Note :
/* This Function may or may not be implemented in actual program, even if it is merged to the main branch.
/* This Function may or may not be implemented in actual program, even if it is merged to the main branch.
If it is temporarily not included in the main Program , then this has a role in future Development of the Project */
If it is temporarily not included in the main Program , then this has a role in future Development of the Project */
@ -12,11 +13,12 @@ int check()
}
}
}
}
void displayMenuCalculator ( char x ) / / Displays the correct output , only when x is c .
void displayMenuCalculator ( char x ) / / Displays the correct output , only when x is c .
{
{
float num1 , num2 , answer ; / / Created for storing numbers for addition , subtraction , multiplication and division and the final answer .
float num1 , num2 , answer ; / / Created for storing numbers for addition , subtraction , multiplication and division and the final answer .
int num ; / / Created specially for calculatorFactorial ( )
int choose ;
int choose ;
if ( x = = ' c ' ) / / calculator can be activated by adding ' c ' in void displayMenuCalculator ( )
if ( x = = ' c ' ) / / calculator can be activated by adding ' c ' in void displayMenuCalculator ( )
{
{
if ( check ( ) = = 1 )
if ( check ( ) = = 1 )
@ -53,7 +55,7 @@ void displayMenuCalculator(char x) //Displays the correct output, only when x i
break ;
break ;
case 5 :
case 5 :
/ / NOT YET IMPLEMENTED
calculatorGetUserInputFactorial ( & num ) ; / / Created specially for factorial which gets a number from user .
/ / NOT YET IMPLEMENTED
/ / NOT YET IMPLEMENTED
break ;
break ;