diff --git a/part1/app/ButtonPanel.java b/part1/app/ButtonPanel.java index 7986fb3..ed097c4 100644 --- a/part1/app/ButtonPanel.java +++ b/part1/app/ButtonPanel.java @@ -1,8 +1,54 @@ package part1.app; import javax.swing.JPanel; +import javax.swing.JPanel; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionListener; public class ButtonPanel extends JPanel{ - - + private static final String[] BUTTONS = { + "7", "8", "9", "/", + "4", "5", "6", "*", + "1", "2", "3", "-", + "0", ".", "=", "+", + "C", "(", ")", "b" + }; + +public ButtonPanel(DisplayPanel display) { + setLayout(new GridLayout(5, 4, 5, 5)); + setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + + ActionListener listener = e -> { + String cmd = ((JButton) e.getSource()).getText(); + + if ("=".equals(cmd)) { + // Evaluate expression and display result + String expr = display.getExpression(); + String result = EvalUtil.eval(expr); + display.setExpression(result); + } else if ("C".equals(cmd)) { + // Clear the display + display.setExpression(""); + } else if ("b".equals(cmd)){ + if (display.getExpression().length() > 0){ + display.setExpression(display.getExpression().substring(0, display.getExpression().length() - 1)); + } + } else { + // Append digit/operator to display + display.setExpression(display.getExpression() + cmd); + } + }; + + // Create and add buttons + for (String label : BUTTONS) { + JButton button = new JButton(label); + button.setFont(new Font("Arial", Font.PLAIN, 18)); + button.addActionListener(listener); + add(button); + } } + +} \ No newline at end of file diff --git a/part1/app/CalculatorApp.java b/part1/app/CalculatorApp.java index d18238e..2aae7a1 100644 --- a/part1/app/CalculatorApp.java +++ b/part1/app/CalculatorApp.java @@ -1,7 +1,29 @@ package part1.app; import javax.swing.JFrame; +import javax.swing.JFrame; +import java.awt.BorderLayout; public class CalculatorApp extends JFrame{ - + public CalculatorApp() { + // Create main window + setTitle("Graphical Calculator"); + + // Configure window + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + setSize(300, 400); + setLocationRelativeTo(null); + + // Initialize components + DisplayPanel display = new DisplayPanel(); + ButtonPanel buttons = new ButtonPanel(display); + + // Layout setup + setLayout(new BorderLayout()); + add(display, BorderLayout.NORTH); + add(buttons, BorderLayout.CENTER); + + // Show window + setVisible(true); + } } diff --git a/part1/app/DisplayPanel.java b/part1/app/DisplayPanel.java index 77a48a5..217fc33 100644 --- a/part1/app/DisplayPanel.java +++ b/part1/app/DisplayPanel.java @@ -1,7 +1,35 @@ package part1.app; import javax.swing.JPanel; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.JTextField; +import java.awt.Font; +import java.awt.BorderLayout; +import java.awt.Dimension; public class DisplayPanel extends JPanel{ - + private JTextField displayField; + + public DisplayPanel() { + setLayout(new BorderLayout()); + displayField = new JTextField(); + + // Configure text field + setPreferredSize(new Dimension(280, 70)); + setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); + displayField.setFont(new Font("Arial", Font.PLAIN, 24)); + displayField.setHorizontalAlignment(JTextField.LEFT); + add(displayField, BorderLayout.CENTER); + } + + // Returns the current expression from the display + public String getExpression() { + return displayField.getText(); + } + + // Updates the display with the provided expression + public void setExpression(String expr) { + displayField.setText(expr); + } } diff --git a/part2/Launcher.java b/part2/Launcher.java index 2a36cb6..0ea4f9f 100644 --- a/part2/Launcher.java +++ b/part2/Launcher.java @@ -1,13 +1,13 @@ package part2; import javax.swing.SwingUtilities; - import part2.app.MainFrame; public class Launcher { public static void main(String[] args) { + // Launch the MainFrame on the Event Dispatch Thread SwingUtilities.invokeLater(() -> { - new MainFrame(); + new MainFrame(); // Create and show the main frame }); } } diff --git a/part2/app/ControlPanel.java b/part2/app/ControlPanel.java index 7765db0..e559793 100644 --- a/part2/app/ControlPanel.java +++ b/part2/app/ControlPanel.java @@ -1,7 +1,57 @@ package part2.app; -import javax.swing.JPanel; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; public class ControlPanel extends JPanel { - -} + private JTextField widthField, heightField; // Input fields for width and height + private JButton scaleButton; // Button to trigger the scaling action + private ShowPanel showPanel; // Reference to the ShowPanel + + public ControlPanel(ShowPanel showPanel) { + this.showPanel = showPanel; // Set the reference to the ShowPanel + setLayout(new FlowLayout()); // Use FlowLayout for arranging components + setBackground(new Color(240, 240, 240)); // Set background color for the panel + setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); // Add padding around the panel + + // Create text fields for width and height + widthField = new JTextField(5); + heightField = new JTextField(5); + scaleButton = new JButton("Scale Image"); + + // Add components to the panel + add(new JLabel("Width:")); + add(widthField); + add(new JLabel("Height:")); + add(heightField); + add(scaleButton); + + // Button action listener to scale the image + scaleButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + try { + int width = Integer.parseInt(widthField.getText()); // Get the entered width + int height = Integer.parseInt(heightField.getText()); // Get the entered height + + // Get the dimensions of the ShowPanel + int maxWidth = showPanel.getWidth(); + int maxHeight = showPanel.getHeight(); + + // Check if the entered size is larger than the panel's size + if (width > maxWidth || height > maxHeight) { + JOptionPane.showMessageDialog(null, "Entered size cannot be larger than the panel size!"); + } else { + // Reload the image and scale it + showPanel.loadImage(); // Reload the image + showPanel.scaleImage(width, height); // Scale the image + } + } catch (NumberFormatException ex) { + JOptionPane.showMessageDialog(null, "Please enter valid numbers for width and height"); // Show error message + } + } + }); + } +} \ No newline at end of file diff --git a/part2/app/MainFrame.java b/part2/app/MainFrame.java index 9a56612..d7c6a28 100644 --- a/part2/app/MainFrame.java +++ b/part2/app/MainFrame.java @@ -1,8 +1,27 @@ package part2.app; -import javax.swing.JFrame; +import javax.swing.*; +import java.awt.*; public class MainFrame extends JFrame { - -} + private ShowPanel showPanel; // Panel for displaying the image + private ControlPanel controlPanel; // Panel for controlling the image size + public MainFrame() { + setTitle("Image Scaler"); + setSize(600, 600); // Set window size + setLocationRelativeTo(null); // Center the frame + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // Close on exit + setLayout(new BorderLayout()); // Use BorderLayout for panels + + // Initialize the panels + showPanel = new ShowPanel(); + controlPanel = new ControlPanel(showPanel); + + // Add panels to the frame + add(showPanel, BorderLayout.CENTER); // Add the ShowPanel to the center + add(controlPanel, BorderLayout.SOUTH); // Add the ControlPanel to the bottom + + setVisible(true); // Make the frame visible + } +} \ No newline at end of file diff --git a/part2/app/ShowPanel.java b/part2/app/ShowPanel.java deleted file mode 100644 index a4309ad..0000000 --- a/part2/app/ShowPanel.java +++ /dev/null @@ -1,9 +0,0 @@ -package part2.app; - -import javax.swing.JPanel; - -public class ShowPanel extends JPanel { - -} - -