Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update icons #2611

Closed
asazonova opened this issue Mar 5, 2021 · 11 comments
Closed

Update icons #2611

asazonova opened this issue Mar 5, 2021 · 11 comments

Comments

@asazonova
Copy link
Contributor

Please describe the problem your proposed feature would address
Icons do not scale properly (appear too little on high resolution screens)
Missing icons
Need new icons for outline elements

Example:
New icons -> parameter connection (icon should look like a line and a letter)

What is the impact of the problem?
Affects all OSATE users

Example:

Describe the solution you'd like
Communication Services are working on new icons for MBE team

Describe alternatives you've considered
Icons have been altered before via https://www.pixilart.com/draw/
However, can not produce good quality image with this software

@asazonova asazonova self-assigned this Mar 5, 2021
@asazonova
Copy link
Contributor Author

Images that need redone:

  • AadlPackage

  • Abstract (example as AbstractPrototype)

  • Abstract Implementation - add I to Abstract image

  • Abstract Subcomponent - add S to Abstract image

  • Access Connection

  • Bus

  • Bus Access

  • Bus Access Connection

  • Bus Implementation - add I to Bus image

  • Bus Subcomponent - add S to Bus image

  • Data

  • Data Access

  • Data Access Connection

  • Data Implementation - add I to Data image

  • Data Port

  • Data Prototype

  • Data Subcomponent - add S to Data image

  • Data Annex Library

  • Device

  • Device Implementation - add I to Device image

  • Device Subcomponent - add S to Device image

  • End to End Flow

  • Event Connection

  • Event Data Connection

  • Event Data Port

  • Event Port

  • Extends

  • Feature Connection

  • Feature Group

  • Feature Group Connection

  • Flow Implementation - needs I in image

  • Flow Path

  • Flow Path Implementation - add I to Flow Path image

  • Flow Sink

  • Flow Sink Implementation - add I to Flow Sink image

  • Flow Source

  • Flow Source Implementation - add I to Flow Source image

  • Implements

  • In Data Port

  • In Event Data Port

  • In Event Port

  • Initial Mode

  • In Out Data Port

  • In Out Event Data Port

  • In Out Event Port

  • In Out Parameter

  • In Parameter

  • Library (library_obj.gif)

  • Memory

  • Memory Implementation - add I to Memory image

  • Memory Subcomponent - add S to Memory image

  • Mode

  • Mode Transition

  • Out Data Port

  • Out Event Data Port

  • Out Event Port

  • Out Parameter

  • Parameter

  • Port Connection

  • Private Package Section

  • Process

  • Process Implementation - add I to Process image

  • Processor

  • Processor Implementation - add I to Processor image

  • Processor Subcomponent - add I to Processor image

  • Process Prototype

  • Process Subcomponent - add S to Process image

  • Property Association

  • Provided Bus Access

  • Provided Data Access

  • Public Package Section

  • Required Bus Access

  • Required Data Access

  • Subprogram

  • Subprogram Access

  • Subprogram Call Sequence

  • Subprogram Group - make new image without I from Subprogram Group Implementation image

  • Subprogram Group Access

  • Subprogram Group Implementation

  • Subprogram Group Subcomponent - add S to Subprogram Group image

  • Subprogram Implementation - add I to Subprogram image

  • Subprogram Subcomponent - add S to Subprogram image

  • System

  • System Implementation - add I to System image

  • System Subcomponent - add S to System image

  • Thread

  • Thread Group

  • Thread Group Implementation - add I to Thread Group image

  • Thread Group Subcomponent - add S to Thread Group image

  • Thread Implementation - add I to Thread image

  • Thread Subcomponent - add S to Thread image

  • Virtual Bus

  • Virtual Bus Implementation - add I to Virtual Bus image

  • Virtual Bus Subcomponent - add S to Virtual Bus image

  • Virtual Processor

  • Virtual Processor Implementation - add I to Virtual Processor image

  • Virtual Processor Subcomponent - add S to Virtual Processor image

  • 64aadl.jpg transparent background

  • AadlNature.gif it is letter A

  • PropertyConstant.gif it is letter C

  • PropertySet.gif it is letter P

  • PropertyType.gif is letter T

Add letter P to existing image

  • AbstractPrototype.gif
  • BusPrototype.gif
  • DataPrototype.gif
  • DevicePrototype.gif
  • MemoryPrototype.gif
  • ProcessorPrototype.gif
  • ProcessPrototype.gif
  • SubprogramGroupPrototype.gif
  • SubprogramPrototype.gif
  • SystemPrototype.gif
  • ThreadGroupPrototype.gif
  • ThreadPrototype.gif
  • VirtualBusPrototype.gif
  • VirtualProcessorPrototype.gif

@asazonova
Copy link
Contributor Author

Current icons
3BD14064-3710-44F1-B691-F1C5196D7502_1_105_c
DF384783-2564-49B0-8EE4-000784879A7D_4_5005_c

@asazonova
Copy link
Contributor Author

New set of icons
OSATE_Icons_at_16px

@asazonova
Copy link
Contributor Author

asazonova commented Mar 24, 2021

same new icons but with file names
132A313E-D25A-4144-A598-134B8EA43C78_1_105_c
D586099A-8A49-4350-8FA2-1CDA8DD4057E_4_5005_c
image

@asazonova
Copy link
Contributor Author

asazonova commented Mar 24, 2021

there's few differences that i noticed from current icons:

  • bus access now has B letter in it. Other access images do not have letters
  • data access now has D letter in it
  • feature connection now has F letter. Adding a letter is consistent with other connection images, so I would lean towards keeping a letter F here
  • memory images - not 100% sure if these were intended to be more round
  • subprogram group access - had dark background before, but now background is light and it matches other subprogram group images

@asazonova
Copy link
Contributor Author

new set of icons in gif format and both 16x16 and 32x32
C940ECF3-0AB5-4ED9-9372-56402DF4CFD7_1_105_c
0DD08EE5-9777-4C47-A5B7-7435B2DB6500_1_105_c

@asazonova
Copy link
Contributor Author

asazonova commented Mar 30, 2021

new set of icons in png format
46C83BF4-CE40-446D-9125-B78E33E805C6_1_105_c
B1C6CC2E-DF01-42FB-9A78-61CC1A631717_1_105_c
99242F59-AD8A-4E1D-9B1C-60D96730CA88_1_105_c

@asazonova
Copy link
Contributor Author

asazonova commented May 3, 2021

test file
package testImagesNew

public
	with sei;
	
	abstract A
		features
			inputSignals: in feature group; -- can add more features here , port, bus access
			InPort: in data port;
			OutPort: out data port;
	end A;
	
	abstract implementation A.i
	end A.i;
	
	bus b
	end b;
	
	bus implementation b.i
		prototypes
			djdk: abstract;
			bp: bus b;
			dp: data dddd;
			hdskf: device;
			memp: memory mem;
			pp: process p;
			prp: processor pr;
	end b.i;

	data dddd
	end dddd;

	data d
	end d;
	
	data implementation d.i
	end d.i;
	
	device de
		features
			power: in feature A;
			canbusaccess: requires bus access b;
			actuatorin: in data port d;
			speed: out data port d;
		flows
			f0: flow source speed;
	end de;
	
	device implementation de.i	
		flows
			f0: flow source speed;
	end de.i;
	
	memory mem	
	end mem;

	memory implementation mem.i
	end mem.i;
	
	process p
	end p;
	
	process implementation p.i
	end p.i;
	
	processor pr
		features
			f: in feature A;
	end pr;
	
	processor implementation pr.i
	end pr.i;

	subprogram sbp
		features
			p: in parameter;
			o: out parameter;
			n: out event port;
	end sbp;
	
	system sys
		features
			inDataPort: in data port;
			outDataPort: out data port d;
		flows
			flowsource: flow source outDataPort {Latency => 1ms .. 1ms;};
			flowsink: flow sink inDataPort;
			flowpath: flow path inDataPort -> outDataPort;
		annex EMV2 {**
		**};
	end sys;
	
	system implementation sys.i
		subcomponents
			as: abstract A;
			bs: bus b;
			dd: data dddd;
			ds: device de;
			ms: memory mem;
			hw: system sys;
			ps: process p;
			prs: processor pr;
		flows
			flow1: end to end flow de.f0 -> SCS.data3;
	end sys.i;
	
	system ElectricGrid
	features
			Supplier: in feature A;
			Consumer: out feature A;
		flows
			flowsource: flow source Consumer {Latency => 1ms .. 1ms;};
			flowsink: flow sink Supplier;
			flowpath: flow path Supplier -> Consumer;
		properties
			SEI::GrossWeight => 0.9kg;
			SEI::PowerCapacity => 40.0W;
	end ElectricGrid;
	
	system implementation ElectricGrid.i
		flows
			flowsource: flow source Consumer {Latency => 1ms .. 1ms;};
			flowsink: flow sink Supplier;
			flowpath: flow path Supplier -> Consumer;
	end ElectricGrid.i;
	
	system SCS
		features
			power: in feature A;
		properties
			SEI::PowerBudget => 2.5w applies to power;
			SEI::WeightLimit => 2.5kg;
	end SCS;

	system implementation SCS.tier0
		subcomponents
			dcs: system DCS.singletier0;
			actuator: device de;
		connections
			p1: feature power -> dcs.power;
			cb3: bus access dcs.canbusaccess <-> actuator.canbusaccess;
			data3: feature dcs.actuatorOut -> actuator.actuatorin;
	end SCS.tier0;
	
	feature group sensorInputs
		features
			--provided:out event data port;
			required: in event data port d;
	end sensorInputs;
	
	system DCS
		features
			power: in feature A;
			canbusaccess: provides bus access b;
			actuatorOut: out data port d;
			receiveInput: in feature group sensorInputs;
	end DCS;

	system implementation DCS.singletier0
		subcomponents
			dca: system DCA;
			hw: system platform;
			simpleSensor: abstract A.i;
		connections
			p1: feature power -> hw.power;
			data3: port dca.actuatorOut -> actuatorOut;
			c0: feature group receiveInput -> simpleSensor.inputSignals;
	end DCS.singletier0;
	
	system platform
		features
			canbusaccess: provides bus access b;
			power: in feature A;
		properties
			SEI::PowerBudget => 0.8w applies to power;
			SEI::MIPSCapacity => 2.4 mips;		
	end platform;
	
	system DCA
		features
			actuatorOut: out data port d;
		properties
			SEI::MIPSBudget => 2.0 mips;
	end DCA;

end testImagesNew;

@asazonova
Copy link
Contributor Author

asazonova commented May 11, 2021

test file

package testImagesNew

public
with sei;

abstract A
features
inputSignals: in feature group;
InPort: in data port;
OutPort: out data port;
InEvDPort: in event data port;
OutEvDPort: out event data port;
InEvPort: in event port;
OutEvPort: out event port;
p: in out data port d;
c: in out event data port;
b: in out event port;
end A;

abstract implementation A.i
end A.i;

abstract ae extends A

end ae;

bus b
end b;

bus implementation b.i
prototypes
djdk: abstract;
bp: bus b;
dp: data dddd;
hdskf: device;
memp: memory mem;
pp: process p;
prp: processor pr;
end b.i;

data dddd
end dddd;

data d
end d;

data implementation d.i
end d.i;

device de
features
power: in feature A;
canbusaccess: requires bus access b;
actuatorin: in data port d;
speed: out data port d;
flows
f0: flow source speed;
end de;

device implementation de.i
flows
f0: flow source speed;
end de.i;

feature group sensorInputs
features
required: in event data port d;
end sensorInputs;

memory mem
end mem;

memory implementation mem.i
end mem.i;

process p
end p;

process implementation p.i
subcomponents
thr: thread th;
thgr: thread group thg;
end p.i;

processor pr
features
f: in feature A;
end pr;

processor implementation pr.i
end pr.i;

subprogram sbp
features
p: in parameter;
o: out parameter;
n: out event port;
sensorData: out parameter d;
end sbp;

subprogram group sbpg
end sbpg;

subprogram group implementation sbpg.i
end sbpg.i;

system sys
features
inDataPort: in data port;
outDataPort: out data port d;
flows
flowsource: flow source outDataPort {Latency => 1ms .. 1ms;};
flowsink: flow sink inDataPort;
flowpath: flow path inDataPort -> outDataPort;
modes
m1: initial mode;
m2: mode;
annex EMV2 {**
**};
end sys;

system implementation sys.i
subcomponents
as: abstract A;
bs: bus b;
dd: data dddd;
ds: device de;
ms: memory mem;
hw: system sys;
scs: system SCS;
ps: process p;
prs: processor pr;
sbpsub: subprogram group sbpg;
sbp: subprogram sbp;
vbs: virtual bus vbus;
vps: virtual processor partition;
connections
c1: port ds.speed -> scs.p2;
flows
flow1: end to end flow ds.f0 -> c1 -> scs;
end sys.i;

system ElectricGrid
features
Supplier: in feature A;
Consumer: out feature A;
flows
flowsource: flow source Consumer {Latency => 1ms .. 1ms;};
flowsink: flow sink Supplier;
flowpath: flow path Supplier -> Consumer;
properties
SEI::GrossWeight => 0.9kg;
SEI::PowerCapacity => 40.0W;
end ElectricGrid;

system implementation ElectricGrid.i
flows
flowsource: flow source Consumer {Latency => 1ms .. 1ms;};
flowsink: flow sink Supplier;
flowpath: flow path Supplier -> Consumer;
end ElectricGrid.i;

system SCS
features
power: in feature A;
p2: in data port d;
properties
SEI::PowerBudget => 2.5w applies to power;
SEI::WeightLimit => 2.5kg;
end SCS;

system implementation SCS.tier0
subcomponents
dcs: system DCS.singletier0;
actuator: device de;
connections
p1: feature power -> dcs.power;
cb3: bus access dcs.canbusaccess <-> actuator.canbusaccess;
data3: feature dcs.actuatorOut -> actuator.actuatorin;
end SCS.tier0;

system DCS
features
power: in feature A;
canbusaccess: provides bus access b;
actuatorOut: out data port d;
receiveInput: in feature group sensorInputs;
evpi: in event port;
evpo: out event port;
evdi: in event data port;
evdo: out event data port;
input: requires bus access b;
inputData: requires data access D;
end DCS;

system implementation DCS.singletier0
subcomponents
dca: system DCA;
hw: system platform;
simpleSensor: abstract A.i;
connections
p1: feature power -> hw.power;
data3: port dca.actuatorOut -> actuatorOut;
c0: feature group receiveInput -> simpleSensor.inputSignals;
end DCS.singletier0;

system platform
features
canbusaccess: provides bus access b;
power: in feature A;
properties
SEI::PowerBudget => 0.8w applies to power;
SEI::MIPSCapacity => 2.4 mips;
end platform;

system DCA
features
actuatorOut: out data port d;
properties
SEI::MIPSBudget => 2.0 mips;
end DCA;

thread th
features
sensorData: out event data port d;
end th;

thread implementation th.i
subcomponents
sp: subprogram sbp;
calls
MyCalls: {
R_Spg: subprogram sp; -- MissionSystemSubprograms::ReadBME280SensorData;
};
connections
C1: parameter R_Spg.sensorData -> SensorData;
end th.i;

thread group thg
end thg;

thread group implementation thg.i
end thg.i;

virtual bus vbus
end vbus;

virtual bus implementation vbus.i
end vbus.i;

virtual processor partition
end partition;

virtual processor implementation partition.generic
end partition.generic;

end testImagesNew;

@asazonova
Copy link
Contributor Author

test file 2

property set PCSProperties is
MaxPosition: constant aadlinteger => 250;
MaxPercent: constant aadlinteger => 100;
MaxStepCount: constant aadlinteger => 15;

-- Nom 600 Min 578 Max 621 steps per second
StepDuration : constant Time_Range => 1610 us .. 1730 us ;
MaxStepDuration : constant Time => 1500 us ;
FrameDuration : constant Time => 25 ms; -- 24ms in original
Description : aadlstring applies to (all);
end PCSProperties ;

@lwrage lwrage added this to the 2.10.0 milestone May 14, 2021
@asazonova
Copy link
Contributor Author

test file 1


public
with sei;

abstract A
	features
		inputSignals: in feature group;
		InPort: in data port;
		OutPort: out data port;
		InEvDPort: in event data port;
		OutEvDPort: out event data port;
		InEvPort: in event port;
		OutEvPort: out event port;
	 	p: in out data port d;
	 	c: in out event data port;
	 	b: in out event port;
end A;

abstract implementation A.i
end A.i;

abstract ae extends A
	
end ae;

bus b
end b;

bus implementation b.i
	prototypes
		djdk: abstract;
		bp: bus b;
		dp: data dddd;
		hdskf: device;
		memp: memory mem;
		pp: process p;
		prp: processor pr;
		fgp: feature group sensorInputs;
		fp: feature a;	
end b.i;

data dddd
end dddd;

data d
end d;

data implementation d.i
	subcomponents
		ddd: data dddd;
end d.i;

device de
	features
		power: in feature A;
		canbusaccess: requires bus access b;
		actuatorin: in data port d;
		speed: out data port d;
	flows
		f0: flow source speed;
end de;

device implementation de.i	
	flows
		f0: flow source speed;
end de.i;

feature group sensorInputs
	features
		required: in event data port d;
end sensorInputs;

memory mem	
end mem;

memory implementation mem.i
end mem.i;

process p
end p;

process implementation p.i
	subcomponents
		thr: thread th;
		thgr: thread group thg;
end p.i;

processor pr
	features
		f: in feature A;
end pr;

processor implementation pr.i
end pr.i;

subprogram sbp
	features
		p: in parameter;
		o: out parameter;
		n: out event port;
		sensorData: out parameter d;
end sbp;

subprogram group sbpg	
end sbpg;

subprogram group implementation sbpg.i
end sbpg.i;

system sys	
	features
		inDataPort: in data port;
		outDataPort: out data port d;
	flows
		flowsource: flow source outDataPort {Latency => 1ms .. 1ms;};
		flowsink: flow sink inDataPort;
		flowpath: flow path inDataPort -> outDataPort;
   	modes
      m1: initial mode;
      m2: mode;
	annex EMV2 {**
	**};
end sys;

system implementation sys.i
	subcomponents
		as: abstract A;
		bs: bus b;
		dd: data dddd;
		ds: device de;
		ms: memory mem;
		hw: system sys;
		scs: system SCS;
		ps: process p;
		prs: processor pr;
		sbpsub: subprogram group sbpg;
		sbp: subprogram sbp;
		vbs: virtual bus vbus;
		vps: virtual processor partition;
	connections
		c1: port ds.speed -> scs.p2;
	flows
		flow1: end to end flow ds.f0 -> c1 -> scs;
end sys.i;

system ElectricGrid
features
		Supplier: in feature A;
		Consumer: out feature A;
	flows
		flowsource: flow source Consumer {Latency => 1ms .. 1ms;};
		flowsink: flow sink Supplier;
		flowpath: flow path Supplier -> Consumer;
	properties
		SEI::GrossWeight => 0.9kg;
		SEI::PowerCapacity => 40.0W;
end ElectricGrid;

system implementation ElectricGrid.i
	flows
		flowsource: flow source Consumer {Latency => 1ms .. 1ms;};
		flowsink: flow sink Supplier;
		flowpath: flow path Supplier -> Consumer;
end ElectricGrid.i;

system SCS
	features
		power: in feature A;
		p2: in data port d;
	properties
		SEI::PowerBudget => 2.5w applies to power;
		SEI::WeightLimit => 2.5kg;
end SCS;

system implementation SCS.tier0
	subcomponents
		dcs: system DCS.singletier0;
		actuator: device de;
	connections
		p1: feature power -> dcs.power;
		cb3: bus access dcs.canbusaccess <-> actuator.canbusaccess;
		data3: feature dcs.actuatorOut -> actuator.actuatorin;
end SCS.tier0;

system DCS
	features
		power: in feature A;
		canbusaccess: provides bus access b;
		actuatorOut: out data port d;
		receiveInput: in feature group sensorInputs;
		evpi: in event port;
		evpo: out event port;
		evdi: in event data port;
		evdo: out event data port;
		input: requires bus access b;
		inputData: requires data access D;
end DCS;

system implementation DCS.singletier0
	subcomponents
		dca: system DCA;
		hw: system platform;
		simpleSensor: abstract A.i;
	connections
		p1: feature power -> hw.power;
		data3: port dca.actuatorOut -> actuatorOut;
		c0: feature group receiveInput -> simpleSensor.inputSignals;
end DCS.singletier0;

system platform
	features
		canbusaccess: provides bus access b;
		power: in feature A;
	properties
		SEI::PowerBudget => 0.8w applies to power;
		SEI::MIPSCapacity => 2.4 mips;		
end platform;

system DCA
	features
		actuatorOut: out data port d;
	properties
		SEI::MIPSBudget => 2.0 mips;
end DCA;

thread th
	features
		sensorData: out event data port d;
end th;

thread implementation th.i
	subcomponents
			sp: subprogram sbp;
		calls
			MyCalls: {
				R_Spg: subprogram sp; -- MissionSystemSubprograms::ReadBME280SensorData;
			};
		connections
			C1: parameter R_Spg.sensorData -> SensorData;
end th.i;

thread group thg	
end thg;

thread group implementation thg.i	
end thg.i;

virtual bus vbus	
end vbus;

virtual bus implementation vbus.i
end vbus.i;

virtual processor partition
end partition;

virtual processor implementation partition.generic
end partition.generic;

end testImagesNew;

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants