9275511596

Committed 28 May 2024 07:51PM UTC coverage: 29.682% (+1.8%) from 27.877%

Build # 9275511596

Build Type

push

github

Committed by

Martomate

Commit Message

Updated to Scala 3.4 and MUnit 1.0

Run Details

2 of 11 new or added lines in 9 files covered. (18.18%)

430 existing lines in 38 files now uncovered.

401 of 1351 relevant lines covered (29.68%)

0.3 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/main/scala/tripaint/view/gui/TheMenuBar.scala

package tripaint.view.gui

import tripaint.view.{MenuBarAction, TriPaintViewListener}

import scalafx.scene.control.{Menu, MenuBar, MenuItem, SeparatorMenuItem}
import scalafx.scene.image.ImageView

object TheMenuBar {
  def create(controls: TriPaintViewListener): MenuBar = {
    val menu_file = makeMenu(
      "File",
      makeMenuItem(controls, MainStageButtons.New),
      makeMenuItem(controls, MainStageButtons.Open),
      makeMenuItem(controls, MainStageButtons.OpenHexagon),
      new SeparatorMenuItem,
      makeMenuItem(controls, MainStageButtons.Save),
      makeMenuItem(controls, MainStageButtons.SaveAs),
      new SeparatorMenuItem,
      makeMenuItem(controls, MainStageButtons.Exit)
    )

    val menu_edit = makeMenu(
      "Edit",
      makeMenuItem(controls, MainStageButtons.Undo),
      makeMenuItem(controls, MainStageButtons.Redo),
      new SeparatorMenuItem,
      makeMenuItem(controls, MainStageButtons.Cut),
      makeMenuItem(controls, MainStageButtons.Copy),
      makeMenuItem(controls, MainStageButtons.Paste)
    )

    val menu_organize =
      makeMenu(
        "Organize",
        makeMenuItem(controls, MainStageButtons.Move),
        makeMenuItem(controls, MainStageButtons.Scale),
        makeMenuItem(controls, MainStageButtons.Rotate)
      )

    val menu_effects = makeMenu(
      "Effects",
      makeMenuItem(controls, MainStageButtons.Blur),
      makeMenuItem(controls, MainStageButtons.MotionBlur),
      makeMenuItem(controls, MainStageButtons.RandomNoise),
      makeMenuItem(controls, MainStageButtons.Scramble),
      makeMenuItem(controls, MainStageButtons.Cell)
    )

    val menuBar = new MenuBar
    menuBar.useSystemMenuBar = true
    menuBar.menus = Seq(menu_file, menu_edit, menu_organize, menu_effects)
    menuBar
  }

  private def makeMenu(text: String, menuItems: MenuItem*): Menu = {
    val menu = new Menu(text)
    menu.items = menuItems
    menu
  }

  private def makeMenuItem(controls: TriPaintViewListener, action: MenuBarAction): MenuItem = {
    val item = if action.imagePath == null then {
      new MenuItem(action.text)
    } else {
      new MenuItem(action.text, new ImageView(s"icons/${action.imagePath}.png"))
    }
    item.onAction = _ => {
      if action.action != null then {
        controls.perform(action.action)
      }
    }
    if action.accelerator != null then {
      item.accelerator = action.accelerator
    }
    item
  }
}

1	package tripaint.view.gui
2
3	import tripaint.view.{MenuBarAction, TriPaintViewListener}
4
5	import scalafx.scene.control.{Menu, MenuBar, MenuItem, SeparatorMenuItem}
6	import scalafx.scene.image.ImageView
7
8	object TheMenuBar {
9	def create(controls: TriPaintViewListener): MenuBar = {	×
UNCOV 10	val menu_file = makeMenu(	×
11	"File",
12	makeMenuItem(controls, MainStageButtons.New),	×
13	makeMenuItem(controls, MainStageButtons.Open),	×
14	makeMenuItem(controls, MainStageButtons.OpenHexagon),	×
15	new SeparatorMenuItem,	×
16	makeMenuItem(controls, MainStageButtons.Save),	×
17	makeMenuItem(controls, MainStageButtons.SaveAs),	×
18	new SeparatorMenuItem,	×
UNCOV 19	makeMenuItem(controls, MainStageButtons.Exit)	×
20	)
21
UNCOV 22	val menu_edit = makeMenu(	×
23	"Edit",
24	makeMenuItem(controls, MainStageButtons.Undo),	×
25	makeMenuItem(controls, MainStageButtons.Redo),	×
26	new SeparatorMenuItem,	×
27	makeMenuItem(controls, MainStageButtons.Cut),	×
28	makeMenuItem(controls, MainStageButtons.Copy),	×
UNCOV 29	makeMenuItem(controls, MainStageButtons.Paste)	×
30	)
31
32	val menu_organize =
UNCOV 33	makeMenu(	×
34	"Organize",
35	makeMenuItem(controls, MainStageButtons.Move),	×
36	makeMenuItem(controls, MainStageButtons.Scale),	×
UNCOV 37	makeMenuItem(controls, MainStageButtons.Rotate)	×
38	)
39
UNCOV 40	val menu_effects = makeMenu(	×
41	"Effects",
42	makeMenuItem(controls, MainStageButtons.Blur),	×
43	makeMenuItem(controls, MainStageButtons.MotionBlur),	×
44	makeMenuItem(controls, MainStageButtons.RandomNoise),	×
45	makeMenuItem(controls, MainStageButtons.Scramble),	×
UNCOV 46	makeMenuItem(controls, MainStageButtons.Cell)	×
47	)
48
49	val menuBar = new MenuBar	×
50	menuBar.useSystemMenuBar = true	×
UNCOV 51	menuBar.menus = Seq(menu_file, menu_edit, menu_organize, menu_effects)	×
52	menuBar
53	}
54
55	private def makeMenu(text: String, menuItems: MenuItem*): Menu = {	×
56	val menu = new Menu(text)	×
UNCOV 57	menu.items = menuItems	×
58	menu
59	}
60
61	private def makeMenuItem(controls: TriPaintViewListener, action: MenuBarAction): MenuItem = {	×
62	val item = if action.imagePath == null then {	×
63	new MenuItem(action.text)	×
64	} else {	×
UNCOV 65	new MenuItem(action.text, new ImageView(s"icons/${action.imagePath}.png"))	×
66	}
67	item.onAction = _ => {	×
68	if action.action != null then {	×
UNCOV 69	controls.perform(action.action)	×
UNCOV 70	}	×
71	}
72	if action.accelerator != null then {	×
UNCOV 73	item.accelerator = action.accelerator	×
UNCOV 74	}	×
75	item
76	}
77	}

Martomate / TriPaint / 9275511596

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous