Commit be8ceff4 authored by claes's avatar claes

New pixmaps in the subgraph palette

parent a9fb6760
#define ge_bitmap_axis27_width 16
#define ge_bitmap_axis27_height 13
static unsigned char ge_bitmap_axis27_bits[] = {
0xc0, 0x01, 0x00, 0x01, 0x00, 0x01, 0x80, 0x01, 0x00, 0x01, 0x00, 0x01,
0xc0, 0x01, 0x00, 0x01, 0x00, 0x01, 0x80, 0x01, 0x00, 0x01, 0x00, 0x01,
0xc0, 0x01};
#define ge_bitmap_bar26_width 16
#define ge_bitmap_bar26_height 12
static unsigned char ge_bitmap_bar26_bits[] = {
0xc0, 0x03, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0xc0, 0x03, 0xc0, 0x03,
0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03};
#define ge_bitmap_emergencystop34_width 16
#define ge_bitmap_emergencystop34_height 12
static unsigned char ge_bitmap_emergencystop34_bits[] = {
0x00, 0x00, 0xe0, 0x03, 0x10, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
0xf8, 0x0f, 0x80, 0x00, 0x80, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_ind47_width 16
#define ge_bitmap_ind47_height 12
static unsigned char ge_bitmap_ind47_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x20, 0x02, 0x10, 0x04,
0x10, 0x04, 0x10, 0x04, 0x20, 0x02, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_ind48_width 16
#define ge_bitmap_ind48_height 12
static unsigned char ge_bitmap_ind48_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x10, 0x04, 0x10, 0x04,
0x10, 0x04, 0x10, 0x04, 0x10, 0x04, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_menubar32_width 16
#define ge_bitmap_menubar32_height 12
static unsigned char ge_bitmap_menubar32_bits[] = {
0xff, 0xff, 0x01, 0x80, 0xff, 0xff, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00,
0x41, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_needle40_width 16
#define ge_bitmap_needle40_height 12
static unsigned char ge_bitmap_needle40_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0xf1, 0x03, 0x01, 0xfc,
0xf1, 0x03, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_optionsmenu31_width 16
#define ge_bitmap_optionsmenu31_height 12
static unsigned char ge_bitmap_optionsmenu31_bits[] = {
0xff, 0xff, 0x01, 0xf8, 0x01, 0xa8, 0xff, 0xff, 0x01, 0x08, 0xff, 0x0f,
0x01, 0x08, 0xff, 0x0f, 0x01, 0x08, 0xff, 0x0f, 0x01, 0x08, 0xff, 0x0f};
#define ge_bitmap_padlock39_width 16
#define ge_bitmap_padlock39_height 12
static unsigned char ge_bitmap_padlock39_bits[] = {
0xc0, 0x01, 0x20, 0x02, 0x10, 0x04, 0x10, 0x04, 0xf8, 0x0f, 0x08, 0x08,
0xc8, 0x09, 0xc8, 0x09, 0x88, 0x08, 0x08, 0x08, 0xf8, 0x0f, 0x00, 0x00};
#define ge_bitmap_pc44_width 16
#define ge_bitmap_pc44_height 12
static unsigned char ge_bitmap_pc44_bits[] = {
0xf0, 0x03, 0x08, 0x03, 0xfc, 0x03, 0x84, 0x03, 0x84, 0x03, 0x84, 0x03,
0x84, 0x03, 0x84, 0x03, 0xfc, 0x03, 0x84, 0x03, 0x84, 0x01, 0xfc, 0x00};
#define ge_bitmap_pulldownmenu33_width 16
#define ge_bitmap_pulldownmenu33_height 12
static unsigned char ge_bitmap_pulldownmenu33_bits[] = {
0xff, 0xaa, 0x41, 0x00, 0xff, 0xaa, 0x41, 0x00, 0x7f, 0x00, 0xc1, 0x1f,
0xff, 0x10, 0xc1, 0x1f, 0xff, 0x10, 0x80, 0x1f, 0x80, 0x10, 0x80, 0x1f};
#define ge_bitmap_pulpet45_width 16
#define ge_bitmap_pulpet45_height 12
static unsigned char ge_bitmap_pulpet45_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x87,
0xe0, 0x80, 0x1c, 0x80, 0x0f, 0x80, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_rack43_width 16
#define ge_bitmap_rack43_height 12
static unsigned char ge_bitmap_rack43_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xaa, 0xa9, 0xaa, 0xa9, 0xaa,
0xa9, 0xaa, 0xa9, 0xaa, 0xa9, 0xaa, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_screw46_width 16
#define ge_bitmap_screw46_height 12
static unsigned char ge_bitmap_screw46_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x15, 0xfe, 0x7f, 0xff, 0x3f,
0x54, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_slider37_width 16
#define ge_bitmap_slider37_height 12
static unsigned char ge_bitmap_slider37_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf0, 0x07, 0x10, 0x04, 0xf0, 0x07,
0x10, 0x04, 0x10, 0x04, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_sliderbg38_width 16
#define ge_bitmap_sliderbg38_height 12
static unsigned char ge_bitmap_sliderbg38_bits[] = {
0xe0, 0x03, 0x20, 0x02, 0xa0, 0x02, 0xa0, 0x02, 0xa0, 0x02, 0xa0, 0x02,
0xa0, 0x02, 0xa0, 0x02, 0xa0, 0x02, 0xa0, 0x02, 0x20, 0x02, 0xe0, 0x03};
#define ge_bitmap_tabbedwindow35_width 16
#define ge_bitmap_tabbedwindow35_height 12
static unsigned char ge_bitmap_tabbedwindow35_bits[] = {
0xfe, 0x7f, 0x11, 0x42, 0xf1, 0xff, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80,
0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0xff, 0xff};
#define ge_bitmap_table30_width 16
#define ge_bitmap_table30_height 12
static unsigned char ge_bitmap_table30_bits[] = {
0xff, 0xff, 0x11, 0x91, 0xff, 0xff, 0x11, 0x91, 0x11, 0x91, 0x11, 0x91,
0x11, 0x91, 0x11, 0x91, 0x11, 0x91, 0x11, 0x91, 0x11, 0x91, 0xff, 0xff};
#define ge_bitmap_terminal42_width 16
#define ge_bitmap_terminal42_height 12
static unsigned char ge_bitmap_terminal42_bits[] = {
0xfc, 0x1f, 0x04, 0x10, 0x04, 0x10, 0x04, 0x10, 0x04, 0x10, 0x04, 0x10,
0x04, 0x10, 0xfc, 0x1f, 0xe0, 0x03, 0xfc, 0x1f, 0x02, 0x20, 0xff, 0x7f};
#define ge_bitmap_thermometer28_width 16
#define ge_bitmap_thermometer28_height 12
static unsigned char ge_bitmap_thermometer28_bits[] = {
0x80, 0x00, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01,
0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xe0, 0x03, 0xe0, 0x03, 0xc0, 0x01};
#define ge_bitmap_trafficlight36_width 16
#define ge_bitmap_trafficlight36_height 12
static unsigned char ge_bitmap_trafficlight36_bits[] = {
0xfc, 0x1f, 0xfc, 0x1f, 0x3c, 0x1e, 0x1c, 0x1c, 0x0c, 0x18, 0x0c, 0x18,
0x0c, 0x18, 0x1c, 0x1c, 0x3c, 0x1e, 0xfc, 0x1f, 0xfc, 0x1f, 0x00, 0x00};
#define ge_bitmap_trend25_width 16
#define ge_bitmap_trend25_height 12
static unsigned char ge_bitmap_trend25_bits[] = {
0x00, 0x40, 0x00, 0xe0, 0x00, 0x40, 0x00, 0x41, 0xc0, 0x4a, 0x22, 0x54,
0x14, 0x60, 0x08, 0x40, 0x00, 0x40, 0x02, 0x40, 0xff, 0x7f, 0x02, 0x00};
#define ge_bitmap_value49_width 16
#define ge_bitmap_value49_height 12
static unsigned char ge_bitmap_value49_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x80,
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_value50_width 16
#define ge_bitmap_value50_height 12
static unsigned char ge_bitmap_value50_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x10, 0x08,
0x10, 0x08, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_value51_width 16
#define ge_bitmap_value51_height 12
static unsigned char ge_bitmap_value51_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0x04, 0x10, 0x04, 0x10,
0x04, 0x10, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_value52_width 16
#define ge_bitmap_value52_height 12
static unsigned char ge_bitmap_value52_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80,
0x01, 0x80, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_videocamera41_width 16
#define ge_bitmap_videocamera41_height 12
static unsigned char ge_bitmap_videocamera41_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x3c, 0x80, 0x24, 0x80, 0x3c, 0x80,
0x3c, 0x80, 0x20, 0x80, 0xe0, 0xff, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00};
#define ge_bitmap_window29_width 16
#define ge_bitmap_window29_height 12
static unsigned char ge_bitmap_window29_bits[] = {
0xff, 0xff, 0x01, 0xa0, 0x01, 0xa0, 0x01, 0xa0, 0x01, 0xa0, 0x01, 0xa0,
0x01, 0xa0, 0x01, 0xe0, 0x01, 0xe0, 0xff, 0xff, 0x01, 0xbe, 0xff, 0xff};
...@@ -66,6 +66,34 @@ extern "C" { ...@@ -66,6 +66,34 @@ extern "C" {
#include "ge_bitmap_pincon22.h" #include "ge_bitmap_pincon22.h"
#include "ge_bitmap_motor23.h" #include "ge_bitmap_motor23.h"
#include "ge_bitmap_speedswitch24.h" #include "ge_bitmap_speedswitch24.h"
#include "ge_bitmap_trend25.h"
#include "ge_bitmap_bar26.h"
#include "ge_bitmap_axis27.h"
#include "ge_bitmap_thermometer28.h"
#include "ge_bitmap_window29.h"
#include "ge_bitmap_table30.h"
#include "ge_bitmap_optionsmenu31.h"
#include "ge_bitmap_menubar32.h"
#include "ge_bitmap_pulldownmenu33.h"
#include "ge_bitmap_emergencystop34.h"
#include "ge_bitmap_tabbedwindow35.h"
#include "ge_bitmap_trafficlight36.h"
#include "ge_bitmap_slider37.h"
#include "ge_bitmap_sliderbg38.h"
#include "ge_bitmap_padlock39.h"
#include "ge_bitmap_needle40.h"
#include "ge_bitmap_videocamera41.h"
#include "ge_bitmap_terminal42.h"
#include "ge_bitmap_rack43.h"
#include "ge_bitmap_pc44.h"
#include "ge_bitmap_pulpet45.h"
#include "ge_bitmap_screw46.h"
#include "ge_bitmap_ind47.h"
#include "ge_bitmap_ind48.h"
#include "ge_bitmap_value49.h"
#include "ge_bitmap_value50.h"
#include "ge_bitmap_value51.h"
#include "ge_bitmap_value52.h"
#define SUBPALETTE__INPUT_SYNTAX 2 #define SUBPALETTE__INPUT_SYNTAX 2
#define SUBPALETTE__OBJNOTFOUND 4 #define SUBPALETTE__OBJNOTFOUND 4
...@@ -104,6 +132,15 @@ void SubPaletteBrow::free_pixmaps() ...@@ -104,6 +132,15 @@ void SubPaletteBrow::free_pixmaps()
// //
// Create pixmaps for leaf, closed map and open map // Create pixmaps for leaf, closed map and open map
// //
#define ALLOC_PIXMAP( bitmap, idx) \
for ( i = 0; i < 9; i++) { \
pixmap_data[i].width = ## bitmap ## _width; \
pixmap_data[i].height = ## bitmap ## _height; \
pixmap_data[i].bits = (char *) ## bitmap ## _bits; \
} \
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[idx]);
void SubPaletteBrow::allocate_pixmaps() void SubPaletteBrow::allocate_pixmaps()
{ {
flow_sPixmapData pixmap_data; flow_sPixmapData pixmap_data;
...@@ -133,180 +170,60 @@ void SubPaletteBrow::allocate_pixmaps() ...@@ -133,180 +170,60 @@ void SubPaletteBrow::allocate_pixmaps()
pixmap_data[i].height =xnav_bitmap_openmap12_height; pixmap_data[i].height =xnav_bitmap_openmap12_height;
pixmap_data[i].bits =xnav_bitmap_openmap12_bits; pixmap_data[i].bits =xnav_bitmap_openmap12_bits;
} }
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmap_openmap); brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmap_openmap);
for ( i = 0; i < 9; i++) ALLOC_PIXMAP( ge_bitmap_valve1, 1);
{ ALLOC_PIXMAP( ge_bitmap_valve2, 2);
pixmap_data[i].width = ge_bitmap_valve1_width; ALLOC_PIXMAP( ge_bitmap_pump3, 3);
pixmap_data[i].height = ge_bitmap_valve1_height; ALLOC_PIXMAP( ge_bitmap_valve4, 4);
pixmap_data[i].bits = ge_bitmap_valve1_bits; ALLOC_PIXMAP( ge_bitmap_ind5, 5);
} ALLOC_PIXMAP( ge_bitmap_ind6, 6);
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[1]); ALLOC_PIXMAP( ge_bitmap_pushbutton7, 7);
ALLOC_PIXMAP( ge_bitmap_frame8, 8);
for ( i = 0; i < 9; i++) ALLOC_PIXMAP( ge_bitmap_crosscon9, 9);
{ ALLOC_PIXMAP( ge_bitmap_threewaycon10, 10);
pixmap_data[i].width = ge_bitmap_valve2_width; ALLOC_PIXMAP( ge_bitmap_cornercon11, 11);
pixmap_data[i].height = ge_bitmap_valve2_height; ALLOC_PIXMAP( ge_bitmap_arrow12, 12);
pixmap_data[i].bits = ge_bitmap_valve2_bits; ALLOC_PIXMAP( ge_bitmap_checkvalve13, 13);
} ALLOC_PIXMAP( ge_bitmap_tank14, 14);
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[2]); ALLOC_PIXMAP( ge_bitmap_filter15, 15);
ALLOC_PIXMAP( ge_bitmap_pressureswitch16, 16);
for ( i = 0; i < 9; i++) ALLOC_PIXMAP( ge_bitmap_hydrpump17, 17);
{ ALLOC_PIXMAP( ge_bitmap_pressuregauge18, 18);
pixmap_data[i].width = ge_bitmap_pump3_width; ALLOC_PIXMAP( ge_bitmap_releasevalve19, 19);
pixmap_data[i].height = ge_bitmap_pump3_height; ALLOC_PIXMAP( ge_bitmap_releasevalve20, 20);
pixmap_data[i].bits = ge_bitmap_pump3_bits; ALLOC_PIXMAP( ge_bitmap_frame21, 21);
} ALLOC_PIXMAP( ge_bitmap_pincon22, 22);
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[3]); ALLOC_PIXMAP( ge_bitmap_motor23, 23);
ALLOC_PIXMAP( ge_bitmap_speedswitch24, 24);
for ( i = 0; i < 9; i++) ALLOC_PIXMAP( ge_bitmap_trend25, 25);
{ ALLOC_PIXMAP( ge_bitmap_bar26, 26);
pixmap_data[i].width = ge_bitmap_valve4_width; ALLOC_PIXMAP( ge_bitmap_axis27, 27);
pixmap_data[i].height = ge_bitmap_valve4_height; ALLOC_PIXMAP( ge_bitmap_thermometer28, 28);
pixmap_data[i].bits = ge_bitmap_valve4_bits; ALLOC_PIXMAP( ge_bitmap_window29, 29);
} ALLOC_PIXMAP( ge_bitmap_table30, 30);
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[4]); ALLOC_PIXMAP( ge_bitmap_optionsmenu31, 31);
for ( i = 0; i < 9; i++) ALLOC_PIXMAP( ge_bitmap_menubar32, 32);
{ ALLOC_PIXMAP( ge_bitmap_pulldownmenu33, 33);
pixmap_data[i].width = ge_bitmap_ind5_width; ALLOC_PIXMAP( ge_bitmap_emergencystop34, 34);
pixmap_data[i].height = ge_bitmap_ind5_height; ALLOC_PIXMAP( ge_bitmap_tabbedwindow35, 35);
pixmap_data[i].bits = ge_bitmap_ind5_bits; ALLOC_PIXMAP( ge_bitmap_trafficlight36, 36);
} ALLOC_PIXMAP( ge_bitmap_slider37, 37);
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[5]); ALLOC_PIXMAP( ge_bitmap_sliderbg38, 38);
for ( i = 0; i < 9; i++) ALLOC_PIXMAP( ge_bitmap_padlock39, 39);
{ ALLOC_PIXMAP( ge_bitmap_needle40, 40);
pixmap_data[i].width = ge_bitmap_ind6_width; ALLOC_PIXMAP( ge_bitmap_videocamera41, 41);
pixmap_data[i].height = ge_bitmap_ind6_height; ALLOC_PIXMAP( ge_bitmap_terminal42, 42);
pixmap_data[i].bits = ge_bitmap_ind6_bits; ALLOC_PIXMAP( ge_bitmap_rack43, 43);
} ALLOC_PIXMAP( ge_bitmap_pc44, 44);
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[6]); ALLOC_PIXMAP( ge_bitmap_pulpet45, 45);
for ( i = 0; i < 9; i++) ALLOC_PIXMAP( ge_bitmap_screw46, 46);
{ ALLOC_PIXMAP( ge_bitmap_ind47, 47);
pixmap_data[i].width = ge_bitmap_pushbutton7_width; ALLOC_PIXMAP( ge_bitmap_ind48, 48);
pixmap_data[i].height = ge_bitmap_pushbutton7_height; ALLOC_PIXMAP( ge_bitmap_value49, 49);
pixmap_data[i].bits = ge_bitmap_pushbutton7_bits; ALLOC_PIXMAP( ge_bitmap_value50, 50);
} ALLOC_PIXMAP( ge_bitmap_value51, 51);
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[7]); ALLOC_PIXMAP( ge_bitmap_value52, 52);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_frame8_width;
pixmap_data[i].height = ge_bitmap_frame8_height;
pixmap_data[i].bits = ge_bitmap_frame8_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[8]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_crosscon9_width;
pixmap_data[i].height = ge_bitmap_crosscon9_height;
pixmap_data[i].bits = ge_bitmap_crosscon9_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[9]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_threewaycon10_width;
pixmap_data[i].height = ge_bitmap_threewaycon10_height;
pixmap_data[i].bits = ge_bitmap_threewaycon10_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[10]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_cornercon11_width;
pixmap_data[i].height = ge_bitmap_cornercon11_height;
pixmap_data[i].bits = ge_bitmap_cornercon11_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[11]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_arrow12_width;
pixmap_data[i].height = ge_bitmap_arrow12_height;
pixmap_data[i].bits = ge_bitmap_arrow12_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[12]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_checkvalve13_width;
pixmap_data[i].height = ge_bitmap_checkvalve13_height;
pixmap_data[i].bits = ge_bitmap_checkvalve13_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[13]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_tank14_width;
pixmap_data[i].height = ge_bitmap_tank14_height;
pixmap_data[i].bits = ge_bitmap_tank14_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[14]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_filter15_width;
pixmap_data[i].height = ge_bitmap_filter15_height;
pixmap_data[i].bits = ge_bitmap_filter15_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[15]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_pressureswitch16_width;
pixmap_data[i].height = ge_bitmap_pressureswitch16_height;
pixmap_data[i].bits = ge_bitmap_pressureswitch16_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[16]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_hydrpump17_width;
pixmap_data[i].height = ge_bitmap_hydrpump17_height;
pixmap_data[i].bits = ge_bitmap_hydrpump17_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[17]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_pressuregauge18_width;
pixmap_data[i].height = ge_bitmap_pressuregauge18_height;
pixmap_data[i].bits = ge_bitmap_pressuregauge18_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[18]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_releasevalve19_width;
pixmap_data[i].height = ge_bitmap_releasevalve19_height;
pixmap_data[i].bits = ge_bitmap_releasevalve19_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[19]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_releasevalve20_width;
pixmap_data[i].height = ge_bitmap_releasevalve20_height;
pixmap_data[i].bits = ge_bitmap_releasevalve20_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[20]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_frame21_width;
pixmap_data[i].height = ge_bitmap_frame21_height;
pixmap_data[i].bits = ge_bitmap_frame21_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[21]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_pincon22_width;
pixmap_data[i].height = ge_bitmap_pincon22_height;
pixmap_data[i].bits = ge_bitmap_pincon22_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[22]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_motor23_width;
pixmap_data[i].height = ge_bitmap_motor23_height;
pixmap_data[i].bits = ge_bitmap_motor23_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[23]);
for ( i = 0; i < 9; i++)
{
pixmap_data[i].width = ge_bitmap_speedswitch24_width;
pixmap_data[i].height = ge_bitmap_speedswitch24_height;
pixmap_data[i].bits = ge_bitmap_speedswitch24_bits;
}
brow_AllocAnnotPixmap( ctx, &pixmap_data, &pixmaps[24]);
} }
......
...@@ -29,7 +29,7 @@ extern "C" { ...@@ -29,7 +29,7 @@ extern "C" {
/*@{*/ /*@{*/
#define subpalette_cVersion "X3.0b" #define subpalette_cVersion "X3.0b"
#define SUBP_PIXMAPS_SIZE 40 #define SUBP_PIXMAPS_SIZE 60
typedef struct subpalette_s_Menu { typedef struct subpalette_s_Menu {
char title[80]; char title[80];
......
...@@ -12,48 +12,48 @@ menu Images ...@@ -12,48 +12,48 @@ menu Images
} }
menu Analog menu Analog
{ {
subgraph Trend pwr_trend.component 6 subgraph Trend pwr_trend.component 25
subgraph FastCurve pwr_fastcurve.component 6 subgraph FastCurve pwr_fastcurve.component 25
subgraph Bar pwr_bar.component 6 subgraph Bar pwr_bar.component 26
subgraph Axis pwr_axis.component 6 subgraph Axis pwr_axis.component 27
} }
menu Process menu Process
{ {
subgraph Valve pwr_exe:pwr_valve.pwsg 1 subgraph Valve pwr_exe:pwr_valve.pwsg 1
subgraph ValveManuel pwr_exe:pwr_valvemanuel.pwsg 4 subgraph ValveManuel pwr_exe:pwr_valvemanuel.pwsg 4
subgraph ValveControl pwr_exe:pwr_valvecontrol.pwsg 2 subgraph ValveControl pwr_exe:pwr_valvecontrol.pwsg 2
subgraph Thermometer pwr_exe:pwr_thermometer.pwsg 6 subgraph Thermometer pwr_exe:pwr_thermometer.pwsg 28
} }
menu Electric menu Electric
{ {
subgraph Motor pwr_exe:pwr_motor.pwsg 23 subgraph Motor pwr_exe:pwr_motor.pwsg 23
subgraph SpeedSwitch pwr_exe:pwr_speedswitch.pwsg 24 subgraph SpeedSwitch pwr_exe:pwr_speedswitch.pwsg 24
subgraph EmergencyStop pwr_exe:pwr_emergencystop.pwsg 5 subgraph EmergencyStop pwr_exe:pwr_emergencystop.pwsg 34
} }
menu Indicators menu Indicators
{ {
subgraph IndSquare pwr_exe:pwr_indsquare.pwsg 5 subgraph IndSquare pwr_exe:pwr_indsquare.pwsg 48
subgraph IndSquareTextFront pwr_exe:pwr_indsquaretextfront.pwsg 5 subgraph IndSquareTextFront pwr_exe:pwr_indsquaretextfront.pwsg 48
subgraph IndSquareTextRear pwr_exe:pwr_indsquaretextrear.pwsg 5 subgraph IndSquareTextRear pwr_exe:pwr_indsquaretextrear.pwsg 48
subgraph IndSquareLarge pwr_exe:pwr_indsquarelarge.pwsg 5 subgraph IndSquareLarge pwr_exe:pwr_indsquarelarge.pwsg 5
subgraph IndRound pwr_exe:pwr_indround.pwsg 6 subgraph IndRound pwr_exe:pwr_indround.pwsg 47
subgraph IndRoundTextFront pwr_exe:pwr_indroundtextfront.pwsg 6 subgraph IndRoundTextFront pwr_exe:pwr_indroundtextfront.pwsg 47
subgraph IndRoundTextRear pwr_exe:pwr_indroundtextrear.pwsg 6 subgraph IndRoundTextRear pwr_exe:pwr_indroundtextrear.pwsg 47
subgraph IndRoundLarge pwr_exe:pwr_indroundlarge.pwsg 6 subgraph IndRoundLarge pwr_exe:pwr_indroundlarge.pwsg 6
subgraph IndSoap pwr_exe:pwr_indsoap.pwsg 21 subgraph IndSoap pwr_exe:pwr_indsoap.pwsg 21
subgraph TrafficLight pwr_exe:pwr_trafficlight.pwsg 5 subgraph TrafficLight pwr_exe:pwr_trafficlight.pwsg 36
} }
menu Values menu Values
{ {
subgraph ValueSmall pwr_exe:pwr_valuesmall.pwsg 8 subgraph ValueSmall pwr_exe:pwr_valuesmall.pwsg 50
subgraph ValueMedium pwr_exe:pwr_valuemedium.pwsg 8 subgraph ValueMedium pwr_exe:pwr_valuemedium.pwsg 51
subgraph ValueLarge pwr_exe:pwr_valuelarge.pwsg 8 subgraph ValueLarge pwr_exe:pwr_valuelarge.pwsg 52
subgraph ValueInputSmall pwr_exe:pwr_valueinputsmall.pwsg 8 subgraph ValueInputSmall pwr_exe:pwr_valueinputsmall.pwsg 50
subgraph ValueInputMedium pwr_exe:pwr_valueinputmedium.pwsg 8 subgraph ValueInputMedium pwr_exe:pwr_valueinputmedium.pwsg 51
subgraph ValueInputLarge pwr_exe:pwr_valueinputlarge.pwsg 8 subgraph ValueInputLarge pwr_exe:pwr_valueinputlarge.pwsg 52
subgraph ValueLong pwr_exe:pwr_valuelong.pwsg 8 subgraph ValueLong pwr_exe:pwr_valuelong.pwsg 49
subgraph ValueReliefDown pwr_exe:pwr_valuereliefdown.pwsg 8 subgraph ValueReliefDown pwr_exe:pwr_valuereliefdown.pwsg 51
subgraph ValueReliefUp pwr_exe:pwr_valuereliefup.pwsg 8 subgraph ValueReliefUp pwr_exe:pwr_valuereliefup.pwsg 51
} }
menu Pushbuttons menu Pushbuttons
{ {
...@@ -82,11 +82,11 @@ menu Pushbuttons ...@@ -82,11 +82,11 @@ menu Pushbuttons
} }
menu Sliders menu Sliders
{ {
subgraph SliderArrow pwr_exe:pwr_sliderarrow.pwsg 7 subgraph SliderArrow pwr_exe:pwr_sliderarrow.pwsg 37
subgraph Slider1 pwr_exe:pwr_slider1.pwsg 7 subgraph Slider1 pwr_exe:pwr_slider1.pwsg 37
subgraph SliderBackground1 pwr_exe:pwr_sliderbackground1.pwsg 8 subgraph SliderBackground1 pwr_exe:pwr_sliderbackground1.pwsg 38
subgraph Slider2 pwr_exe:pwr_slider2.pwsg 7 subgraph Slider2 pwr_exe:pwr_slider2.pwsg 37
subgraph SliderBackground2 pwr_exe:pwr_sliderbackground2.pwsg 8 subgraph SliderBackground2 pwr_exe:pwr_sliderbackground2.pwsg 38
} }
menu Hydraulics menu Hydraulics
{ {
...@@ -130,30 +130,30 @@ menu Other ...@@ -130,30 +130,30 @@ menu Other
menu Animations menu Animations
{ {
subgraph PumpAnim pwr_exe:pwr_pumpanim.pwsg 17 subgraph PumpAnim pwr_exe:pwr_pumpanim.pwsg 17
subgraph PadlockAnim pwr_exe:pwr_padlockanim.pwsg 5 subgraph PadlockAnim pwr_exe:pwr_padlockanim.pwsg 39
subgraph ValveAnim pwr_exe:pwr_valveanim.pwsg 1 subgraph ValveAnim pwr_exe:pwr_valveanim.pwsg 1
subgraph MotorAnim pwr_exe:pwr_motoranim.pwsg 23 subgraph MotorAnim pwr_exe:pwr_motoranim.pwsg 23
subgraph ScrewAnim pwr_exe:pwr_screw.pwsg 5 subgraph ScrewAnim pwr_exe:pwr_screw.pwsg 46
subgraph IndAnimSquare pwr_exe:pwr_indanimsquare.pwsg 5 subgraph IndAnimSquare pwr_exe:pwr_indanimsquare.pwsg 5
subgraph IndAnimRound pwr_exe:pwr_indanimround.pwsg 6 subgraph IndAnimRound pwr_exe:pwr_indanimround.pwsg 6
subgraph IndPulsarSquare pwr_exe:pwr_indpulsarsquare.pwsg 5 subgraph IndPulsarSquare pwr_exe:pwr_indpulsarsquare.pwsg 5
subgraph IndPulsarRound pwr_exe:pwr_indpulsarround.pwsg 6 subgraph IndPulsarRound pwr_exe:pwr_indpulsarround.pwsg 6
subgraph Smile pwr_exe:pwr_smile.pwsg 6 subgraph Smile pwr_exe:pwr_smile.pwsg 6
} }
subgraph Padlock pwr_exe:pwr_padlock.pwsg 5 subgraph Padlock pwr_exe:pwr_padlock.pwsg 39
subgraph Needle pwr_exe:pwr_needle.pwsg 5 subgraph Needle pwr_exe:pwr_needle.pwsg 40
subgraph Pc pwr_exe:pwr_pc.pwsg 5 subgraph Pc pwr_exe:pwr_pc.pwsg 44
subgraph Pulpet pwr_exe:pwr_pulpet.pwsg 5 subgraph Pulpet pwr_exe:pwr_pulpet.pwsg 45
subgraph Rack pwr_exe:pwr_rack.pwsg 5 subgraph Rack pwr_exe:pwr_rack.pwsg 43
subgraph Terminal pwr_exe:pwr_terminal.pwsg 5 subgraph Terminal pwr_exe:pwr_terminal.pwsg 42
subgraph VideoCamera pwr_exe:pwr_videocamera.pwsg 5 subgraph VideoCamera pwr_exe:pwr_videocamera.pwsg 14
subgraph ConGlue pwr_conglue.component 6 subgraph ConGlue pwr_conglue.component 10
subgraph MenuBar pwr_exe:pwr_menubar.pwsg 6 subgraph MenuBar pwr_exe:pwr_menubar.pwsg 32
subgraph PulldownMenu pwr_exe:pwr_pulldownmenu.pwsg 6 subgraph PulldownMenu pwr_exe:pwr_pulldownmenu.pwsg 33
subgraph OptionMenu pwr_exe:pwr_optionmenu.pwsg 6 subgraph OptionMenu pwr_exe:pwr_optionmenu.pwsg 31
subgraph Window pwr_window.component 6 subgraph Window pwr_window.component 29
subgraph Table pwr_table.component 6 subgraph Table pwr_table.component 30
subgraph TabbedWindow pwr_folder.component 6 subgraph TabbedWindow pwr_folder.component 35
} }
localsubgraphs Ssab ssab_exe:*.pwsg localsubgraphs Ssab ssab_exe:*.pwsg
menu Local menu Local
......
...@@ -4,19 +4,19 @@ ...@@ -4,19 +4,19 @@
101 20 101 20
102 -29 102 -29
103 -46 103 -46
104 13.6187 104 9.89052
136 13.6187 136 9.89052
105 100 105 100
106 -10 106 -7
107 -16 107 -11
108 2.3 108 2.3
109 0 109 0
110 0.7 110 0.7
111 0 111 0
116 0 116 0
117 0 117 0
118 199 118 144
119 155 119 112
120 1 120 1
121 Claes context 121 Claes context
122 0 122 0
...@@ -78,287 +78,13 @@ pwr_exe: ...@@ -78,287 +78,13 @@ pwr_exe:
2233 1 2233 1
2234 1 2234 1
2235 0 2235 0
2243 0
99 99
123 123
2 2
99 99
124 124
2 2
4
400 cc_3_1_1
401 3
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_3_4_1
401 3
402 1
403 142
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_0_5_1
401 0
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_1
401 3
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_4_13_0
401 3
402 1
403 134
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_5_13_0
401 3
402 1
403 134
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_14_0
401 3
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_1_0_0
401 3
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_0_5_14_0
401 0
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_0_0
401 3
402 1
403 0
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_0_5_18_0
401 0
402 1
403 172
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_18_0
401 3
402 1
403 172
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_3_33_0
401 3
402 1
403 304
404 3
405 1.2
406 1.8
407 0.5
408 0
99
4
400 cc_3_3_0_0
401 3
402 1
403 0
404 3
405 1.2
406 1.8
407 0.5
408 0
99
4
400 cc_0_1_1
401 0
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_0_1_0_0
401 0
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_3_5_33_0
401 3
402 1
403 304
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_34_0
401 3
402 1
403 108
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_1_34_0
401 3
402 1
403 108
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_0_4_0_0
401 0
402 1
403 0
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_0_4_67_0
401 0
402 1
403 204
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_4_67_0
401 3
402 1
403 204
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_4_67_20
401 3
402 0
403 204
404 4
405 1.6
406 2.4
407 2
408 0
99
4
400 cc_3_4_67_5
401 3
402 0
403 204
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_1_19_0
401 3
402 1
403 176
404 1
405 0.4
406 0.6
407 0.5
408 0
99
99 99
125 125
2 2
...@@ -372,10 +98,11 @@ pwr_exe: ...@@ -372,10 +98,11 @@ pwr_exe:
1909 41 1909 41
1910 41 1910 41
1911 0 1911 0
1915 0 1915 1
1913 5 1913 5
1916 2 1916 2
1914 0 1914 1
1917 0
1907 0 1907 0
1906 1906
1905 1905
...@@ -416,6 +143,7 @@ pwr_exe: ...@@ -416,6 +143,7 @@ pwr_exe:
9 9
900 1 900 1
901 304 901 304
904 0
902 A1 902 A1
903 903
7 7
...@@ -444,6 +172,7 @@ pwr_exe: ...@@ -444,6 +172,7 @@ pwr_exe:
13 13
1300 1 1300 1
1301 304 1301 304
1306 0
1302 1 1302 1
1305 1 1305 1
1303 1303
...@@ -464,137 +193,5 @@ pwr_exe: ...@@ -464,137 +193,5 @@ pwr_exe:
2806 0 2806 0
99 99
99 99
20
2004
2000 0
2001 0
2002 0.7
2003 0
2009 108
2005
6
600 108
601 1
602
7
700 0
701 0.7
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 0
2003 0
2009 108
2005
6
600 108
601 1
602
7
700 2.3
701 0
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 0.7
2003 0.7
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0.7
99
603
7
700 0
701 0.7
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 2.3
2002 0.7
2003 0
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0
99
603
7
700 2.3
701 0.7
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
99 99
99 99
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
1909 41 1909 41
1910 41 1910 41
1911 0 1911 0
1915 0 1915 1
1913 5 1913 5
1916 2 1916 2
1914 0 1914 1
1917 0
1907 0 1907 0
1906 1906
1905 1905
...@@ -53,6 +54,7 @@ ...@@ -53,6 +54,7 @@
13 13
1300 1 1300 1
1301 304 1301 304
1306 0
1302 1 1302 1
1305 1 1305 1
1303 1303
...@@ -73,138 +75,6 @@ ...@@ -73,138 +75,6 @@
2806 0 2806 0
99 99
99 99
20
2004
2000 0
2001 0
2002 0.7
2003 0
2009 108
2005
6
600 108
601 1
602
7
700 0
701 0.7
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 0
2003 0
2009 108
2005
6
600 108
601 1
602
7
700 2.3
701 0
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 0.7
2003 0.7
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0.7
99
603
7
700 0
701 0.7
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 2.3
2002 0.7
2003 0
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0
99
603
7
700 2.3
701 0.7
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
99
99 99
302 0 302 0
305 0 305 0
...@@ -232,6 +102,7 @@ ...@@ -232,6 +102,7 @@
318 0 318 0
319 0 319 0
320 0 320 0
328 0
99 99
99 99
99 99
...@@ -4,19 +4,19 @@ ...@@ -4,19 +4,19 @@
101 20 101 20
102 -26 102 -26
103 -78 103 -78
104 7.1048 104 5.15982
136 7.1048 136 5.15982
105 100 105 100
106 -9 106 -6
107 -27 107 -20
108 2.3 108 2.3
109 0 109 0
110 0.7 110 0.7
111 0 111 0
116 0 116 0
117 0 117 0
118 199 118 144
119 154 119 112
120 1 120 1
121 Claes context 121 Claes context
122 0 122 0
...@@ -78,287 +78,13 @@ pwr_exe: ...@@ -78,287 +78,13 @@ pwr_exe:
2233 1 2233 1
2234 1 2234 1
2235 0 2235 0
2243 0
99 99
123 123
2 2
99 99
124 124
2 2
4
400 cc_3_1_1
401 3
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_3_4_1
401 3
402 1
403 142
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_0_5_1
401 0
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_1
401 3
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_4_13_0
401 3
402 1
403 134
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_5_13_0
401 3
402 1
403 134
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_14_0
401 3
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_1_0_0
401 3
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_0_5_14_0
401 0
402 1
403 142
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_0_0
401 3
402 1
403 0
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_0_5_18_0
401 0
402 1
403 172
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_18_0
401 3
402 1
403 172
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_3_33_0
401 3
402 1
403 304
404 3
405 1.2
406 1.8
407 0.5
408 0
99
4
400 cc_3_3_0_0
401 3
402 1
403 0
404 3
405 1.2
406 1.8
407 0.5
408 0
99
4
400 cc_0_1_1
401 0
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_0_1_0_0
401 0
402 1
403 0
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_3_5_33_0
401 3
402 1
403 304
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_5_34_0
401 3
402 1
403 108
404 5
405 2
406 3
407 0.5
408 0
99
4
400 cc_3_1_34_0
401 3
402 1
403 108
404 1
405 0.4
406 0.6
407 0.5
408 0
99
4
400 cc_0_4_0_0
401 0
402 1
403 0
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_0_4_67_0
401 0
402 1
403 204
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_4_67_0
401 3
402 1
403 204
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_4_67_20
401 3
402 0
403 204
404 4
405 1.6
406 2.4
407 2
408 0
99
4
400 cc_3_4_67_5
401 3
402 0
403 204
404 4
405 1.6
406 2.4
407 0.5
408 0
99
4
400 cc_3_1_19_0
401 3
402 1
403 176
404 1
405 0.4
406 0.6
407 0.5
408 0
99
99 99
125 125
2 2
...@@ -372,10 +98,11 @@ pwr_exe: ...@@ -372,10 +98,11 @@ pwr_exe:
1909 41 1909 41
1910 41 1910 41
1911 0 1911 0
1915 0 1915 1
1913 5 1913 5
1916 2 1916 2
1914 0 1914 0
1917 0
1907 0 1907 0
1906 1906
1905 1905
...@@ -416,6 +143,7 @@ pwr_exe: ...@@ -416,6 +143,7 @@ pwr_exe:
9 9
900 1 900 1
901 304 901 304
904 0
902 A1 902 A1
903 903
7 7
...@@ -444,6 +172,7 @@ pwr_exe: ...@@ -444,6 +172,7 @@ pwr_exe:
13 13
1300 1 1300 1
1301 304 1301 304
1306 0
1302 1 1302 1
1305 1 1305 1
1303 1303
...@@ -464,137 +193,5 @@ pwr_exe: ...@@ -464,137 +193,5 @@ pwr_exe:
2806 0 2806 0
99 99
99 99
20
2004
2000 2.3
2001 2.3
2002 0.7
2003 0
2009 108
2005
6
600 108
601 1
602
7
700 0
701 0.7
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 2.3
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 0.7
2003 0.7
2009 108
2005
6
600 108
601 1
602
7
700 2.3
701 0
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0.7
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 -1.11022e-16
2003 -1.11022e-16
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0.7
99
603
7
700 0
701 0.7
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 -0.7
2806 0
99
99
20
2004
2000 4.44089e-16
2001 4.44089e-16
2002 0.7
2003 0
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0
99
603
7
700 2.3
701 0.7
99
99
2008
28
2800 1
2801 0
2802 -2.3
2803 0
2804 1
2805 0
2806 0
99
99
99 99
99 99
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
1909 41 1909 41
1910 41 1910 41
1911 0 1911 0
1915 0 1915 1
1913 5 1913 5
1916 2 1916 2
1914 0 1914 0
1917 0
1907 0 1907 0
1906 1906
1905 1905
...@@ -53,6 +54,7 @@ ...@@ -53,6 +54,7 @@
13 13
1300 1 1300 1
1301 304 1301 304
1306 0
1302 1 1302 1
1305 1 1305 1
1303 1303
...@@ -73,138 +75,6 @@ ...@@ -73,138 +75,6 @@
2806 0 2806 0
99 99
99 99
20
2004
2000 2.3
2001 2.3
2002 0.7
2003 0
2009 108
2005
6
600 108
601 1
602
7
700 0
701 0.7
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 2.3
2803 0
2804 1
2805 0
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 0.7
2003 0.7
2009 108
2005
6
600 108
601 1
602
7
700 2.3
701 0
99
603
7
700 0
701 0
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0.7
2806 0
99
99
20
2004
2000 2.3
2001 0
2002 -1.11022e-16
2003 -1.11022e-16
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0.7
99
603
7
700 0
701 0.7
99
99
2008
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 -0.7
2806 0
99
99
20
2004
2000 4.44089e-16
2001 4.44089e-16
2002 0.7
2003 0
2009 40
2005
6
600 40
601 1
602
7
700 2.3
701 0
99
603
7
700 2.3
701 0.7
99
99
2008
28
2800 1
2801 0
2802 -2.3
2803 0
2804 1
2805 0
2806 0
99
99
99 99
302 0 302 0
305 0 305 0
...@@ -232,6 +102,7 @@ ...@@ -232,6 +102,7 @@
318 0 318 0
319 0 319 0
320 0 320 0
328 0
99 99
99 99
99 99
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment