Skip to content

Commit

Permalink
Remove unused files, unused imports, commented out code, and update N…
Browse files Browse the repository at this point in the history
…PM packages (#326)

* Remove unused files, unused imports, commented out code, and update npm packages

* Remove unused files, unused imports, commented out code, and update npm packages

* Remove unused files, unused imports, commented out code, and update npm packages

* Remove unused files, unused imports, commented out code, and update npm packages

* Remove unused files, unused imports, commented out code, and update npm packages

* Remove unused files, unused imports, commented out code, and update npm packages

* Update Ground.js to remove second customSave rather than first.
  • Loading branch information
JoshVarga authored Jul 3, 2024
1 parent 4d0b8de commit 85a684a
Show file tree
Hide file tree
Showing 86 changed files with 2,498 additions and 9,193 deletions.
9,570 changes: 2,292 additions & 7,278 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,16 @@
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-vue": "^9.1.0",
"husky": "^8.0.1",
"jsdoc": "3.6.9",
"jsdoc": "^4.0.3",
"prettier": "2.6.2",
"sass": "^1.77.6",
"typescript": "^4.5.4",
"vite": "^2.9.18",
"vite-plugin-vuetify": "^1.0.0-alpha.0",
"vue-cli-plugin-vuetify": "~2.5.1",
"vue-tsc": "^0.34.7"
},
"optionalDependencies": {
"esbuild-linux-64": "^0.15.18"
}
}
5 changes: 2 additions & 3 deletions src/components/Panels/PropertiesPanel/PropertiesPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
<script lang="ts" setup>
import ModuleProperty from '#/components/Panels/PropertiesPanel/ModuleProperty/ModuleProperty.vue'
import LayoutProperty from '#/components/Panels/PropertiesPanel/LayoutProperty/LayoutProperty.vue'
import { ref, toRaw } from '@vue/reactivity'
import { ref, toRaw, onMounted } from 'vue'
import simulationArea from '#/simulator/src/simulationArea'
import { onMounted } from 'vue'
import { checkPropertiesUpdate, prevPropertyObjSet } from '#/simulator/src/ux'
import { layoutModeGet } from '#/simulator/src/layoutMode'
Expand All @@ -33,7 +32,7 @@ function showPropertiesPanel() {
if (toRaw(propertiesPanelObj.value) == simulationArea.lastSelected) return
prevPropertyObjSet(simulationArea.lastSelected)
propertiesPanelObj.value = simulationArea.lastSelected
if(simulationArea.lastSelected.newElement) {
if(simulationArea.lastSelected && simulationArea.lastSelected.newElement) {
simulationArea.lastSelected.label = ""
}
// there are 3 types of panel body for Properties Panel
Expand Down
1 change: 0 additions & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useActions } from './store/SimulatorStore/actions'
import { createApp } from 'vue'
import App from './App.vue'
import vuetify from './plugins/vuetify'
Expand Down
3 changes: 0 additions & 3 deletions src/pages/embed.vue
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,6 @@ onBeforeMount(() => {
})
onMounted(() => {
// $('#zoom-in-embed').on('click', () => ZoomIn())
// $('#zoom-out-embed').on('click', () => ZoomOut())
startListeners()
setup()
})
Expand Down
40 changes: 0 additions & 40 deletions src/simulator/src/VerilogClasses.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,27 @@ import NandGate from './modules/NandGate'
import Multiplexer from './modules/Multiplexer'
import XorGate from './modules/XorGate'
import XnorGate from './modules/XnorGate'
import SevenSegDisplay from './modules/SevenSegDisplay'
import SixteenSegDisplay from './modules/SixteenSegDisplay'
import HexDisplay from './modules/HexDisplay'
import OrGate from './modules/OrGate'
import Stepper from './modules/Stepper'
import NotGate from './modules/NotGate'
import Text from './modules/Text'
import TriState from './modules/TriState'
import Buffer from './modules/Buffer'
import ControlledInverter from './modules/ControlledInverter'
import Adder from './modules/Adder'
import verilogMultiplier from './modules/verilogMultiplier'
import verilogDivider from './modules/verilogDivider'
import verilogPower from './modules/verilogPower'
import verilogShiftLeft from './modules/verilogShiftLeft'
import verilogShiftRight from './modules/verilogShiftRight'
import TwoComplement from './modules/TwoComplement'
import Splitter from './modules/Splitter'
import Ground from './modules/Ground'
import Power from './modules/Power'
import Input from './modules/Input'
import Output from './modules/Output'
import BitSelector from './modules/BitSelector'
import ConstantVal from './modules/ConstantVal'
import NorGate from './modules/NorGate'
import DigitalLed from './modules/DigitalLed'
import VariableLed from './modules/VariableLed'
import Button from './modules/Button'
import RGBLed from './modules/RGBLed'
import SquareRGBLed from './modules/SquareRGBLed'
import Demultiplexer from './modules/Demultiplexer'
import Decoder from './modules/Decoder'
import Flag from './modules/Flag'
import MSB from './modules/MSB'
import LSB from './modules/LSB'
import PriorityEncoder from './modules/PriorityEncoder'
import Tunnel from './modules/Tunnel'
import ALU from './modules/ALU'
import Rectangle from './modules/Rectangle'
import Arrow from './modules/Arrow'
import Counter from './modules/Counter'
import Random from './modules/Random'
import RGBLedMatrix from './modules/RGBLedMatrix'
import simulationArea from './simulationArea'
import TflipFlop from './sequential/TflipFlop'
import DflipFlop from './sequential/DflipFlop'
import Dlatch from './sequential/Dlatch'
import SRflipFlop from './sequential/SRflipFlop'
import JKflipFlop from './sequential/JKflipFlop'
import TTY from './sequential/TTY'
import Keyboard from './sequential/Keyboard'
import Clock from './sequential/Clock'
import RAM from './sequential/RAM'
import verilogRAM from './sequential/verilogRAM'
import EEPROM from './sequential/EEPROM'
import Rom from './sequential/Rom'
import TB_Input from './testbench/testbenchInput'
import TB_Output from './testbench/testbenchOutput'
import ForceGate from './testbench/ForceGate'
import { newCircuit, switchCircuit, changeCircuitName } from './circuit'
import SubCircuit from './subcircuit'

function getBitWidth(bitsJSON) {
if (Number.isInteger(bitsJSON)) {
Expand Down
36 changes: 3 additions & 33 deletions src/simulator/src/circuit.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@
/* eslint-disable no-alert */
import CircuitElement from './circuitElement'
import plotArea from './plotArea'
import simulationArea, { changeClockTime } from './simulationArea'
import simulationArea from './simulationArea'
import {
stripTags,
uniq,
showMessage,
showError,
truncateString,
} from './utils'
import { findDimensions, dots } from './canvasApi'
import { updateRestrictedElementsList } from './restrictedElementDiv'
Expand All @@ -32,21 +29,20 @@ import {
changeLightMode,
} from './engine'
import { toggleLayoutMode, layoutModeGet } from './layoutMode'
import { setProjectName, getProjectName } from './data/save'
import { setProjectName } from './data/save'
import { changeClockEnable } from './sequential'
import { changeInputSize } from './modules'
import { verilogModeGet, verilogModeSet } from './Verilog2CV'
import { updateTestbenchUI } from './testbench'
import { SimulatorStore } from '#/store/SimulatorStore/SimulatorStore'
import { toRef, toRefs } from 'vue'
import { toRefs } from 'vue'
import { provideCircuitName } from '#/components/helpers/promptComponent/PromptComponent.vue'
import { deleteCurrentCircuit } from '#/components/helpers/deleteCircuit/DeleteCircuit.vue'

export const circuitProperty = {
toggleLayoutMode,
setProjectName,
changeCircuitName,
// changeClockTime,
deleteCurrentCircuit,
changeClockEnable,
changeInputSize,
Expand Down Expand Up @@ -235,27 +231,9 @@ export function newCircuit(name, id, isVerilog = false, isVerilogMain = false) {
activeCircuit.value.name = scope.name

if (!isVerilog || isVerilogMain) {
if (embed) {
// added calss - embed-tab using vue logic
// var html = `<div style='' class='circuits toolbarButton current' draggable='true' id='${
// scope.id
// }'><span class='circuitName noSelect'>${truncateString(
// name,
// 18
// )}</span></div>`
// $('#tabsBar').append(html)
// $('#tabsBar').addClass('embed-tabs')
} else {
// logic implemented in vue
}

// Remove listeners
//$('.circuits').off('click')
$('.circuitName').off('click')
//$('.tabsCloseButton').off('click')

// switch circuit function moved inside vue component

if (!embed) {
$('.circuitName').on('click', () => {
simulationArea.lastSelected = globalScope.root
Expand All @@ -265,12 +243,6 @@ export function newCircuit(name, id, isVerilog = false, isVerilogMain = false) {
}, 100)
})
}
// moved inside vue - component
// $('.tabsCloseButton').on('click', function (e) {
// e.stopPropagation()
// deleteCurrentCircuit(this.id)
// })

if (!embed) {
showProperties(scope.root)
}
Expand All @@ -288,13 +260,11 @@ export function newCircuit(name, id, isVerilog = false, isVerilogMain = false) {
export function changeCircuitName(name, id = globalScope.id) {
const simulatorStore = SimulatorStore()
const { circuit_list } = toRefs(simulatorStore)
// const { activeCircuit } = toRefs(simulatorStore)
name = name || 'Untitled'
name = stripTags(name)
scopeList[id].name = name
const index = circuit_list.value.findIndex((circuit) => circuit.id === id)
circuit_list.value[index].name = name
// activeCircuit.value.name = name // add later if necessary at current stage not important handled by projectProperty on switching circuit
}

/**
Expand Down
Loading

0 comments on commit 85a684a

Please sign in to comment.