Projects >> 02343-CDIO-projekt >>91f170624724aacdc1836192094beb2aac1ad767

Chunk
Conflicting content
            cakeMinBlue.setValue(cakes.getMinB());
            
     */
    public void initThresholdValues()
	{
<<<<<<< HEAD
    	System.out.println("initThresholdValues");
=======
            
        //Common
        //Cakes
            Thresholds cakes = IImageProcessor.CAKE_THRESHOLDS;
            
            cakeMinRed.setValue(cakes.getMinR());
            cakeMinGreen.setValue(cakes.getMinG());
            cakeMaxRed.setValue(cakes.getMaxR());
            cakeMaxGreen.setValue(cakes.getMaxG());
            cakeMaxBlue.setValue(cakes.getMaxB());
            
        //Obstacles
            Thresholds obstacle = IImageProcessor.OBSTACLE_THRESHOLDS;
            
            obsMinRed.setValue(obstacle.getMinR());
            obsMinGreen.setValue(obstacle.getMinG());
            obsMinBlue.setValue(obstacle.getMinB());
            
            obsMaxRed.setValue(obstacle.getMaxR());
            obsMaxGreen.setValue(obstacle.getMaxG());
            obsMaxBlue.setValue(obstacle.getMaxB());
                       	
>>>>>>> 76bb2a182c1cc43c8fd70d2596474ae4a6244b1b
    	// Robots
    	// robot 1
    	Thresholds robot1N = IImageProcessor.ROBOT1_N_THRESHOLDS;
Solution content
     */
    public void initThresholdValues()
	{
            
        //Common
        //Cakes
            Thresholds cakes = IImageProcessor.CAKE_THRESHOLDS;
            
            cakeMinRed.setValue(cakes.getMinR());
            cakeMinGreen.setValue(cakes.getMinG());
            cakeMinBlue.setValue(cakes.getMinB());
            
            cakeMaxRed.setValue(cakes.getMaxR());
            cakeMaxGreen.setValue(cakes.getMaxG());
            cakeMaxBlue.setValue(cakes.getMaxB());
            
        //Obstacles
            Thresholds obstacle = IImageProcessor.OBSTACLE_THRESHOLDS;
            
            obsMinRed.setValue(obstacle.getMinR());
            obsMinGreen.setValue(obstacle.getMinG());
            obsMinBlue.setValue(obstacle.getMinB());
            
            obsMaxRed.setValue(obstacle.getMaxR());
            obsMaxGreen.setValue(obstacle.getMaxG());
            obsMaxBlue.setValue(obstacle.getMaxB());
                       	
    	// Robots
    	// robot 1
    	Thresholds robot1N = IImageProcessor.ROBOT1_N_THRESHOLDS;
File
ImageThresholdsFrame.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable