From 5171f41be79274d07c390b6d5110c31ebeb345a1 Mon Sep 17 00:00:00 2001 From: prascle Date: Thu, 20 Apr 2006 19:27:50 +0000 Subject: [PATCH] PR: remove unused files --- idl/SALOME_DataTypeCatalog.idl | 49 --- resources/channel.cfg | 278 +++++++++++++ resources/config | 1 + resources/copy.png | Bin 209 -> 0 bytes resources/default.png | Bin 225 -> 0 bytes resources/dl_delete.png | Bin 174 -> 0 bytes resources/dl_insert.png | Bin 193 -> 0 bytes resources/dl_movedown.png | Bin 149 -> 0 bytes resources/dl_moveup.png | Bin 151 -> 0 bytes resources/forward.xpm | 28 -- resources/help.png | Bin 214 -> 0 bytes resources/home.xpm | 27 -- resources/new.png | Bin 177 -> 0 bytes resources/open.png | Bin 231 -> 0 bytes resources/paste.png | Bin 224 -> 0 bytes resources/plot2d_dump.png | Bin 610 -> 0 bytes resources/plot2d_fitall.png | Bin 319 -> 0 bytes resources/plot2d_fitarea.png | Bin 311 -> 0 bytes resources/plot2d_legend.png | Bin 308 -> 0 bytes resources/plot2d_linear.png | Bin 281 -> 0 bytes resources/plot2d_linear_y.png | Bin 289 -> 0 bytes resources/plot2d_lines.png | Bin 299 -> 0 bytes resources/plot2d_log.png | Bin 288 -> 0 bytes resources/plot2d_log_y.png | Bin 280 -> 0 bytes resources/plot2d_pan.png | Bin 457 -> 0 bytes resources/plot2d_points.png | Bin 272 -> 0 bytes resources/plot2d_settings.png | Bin 313 -> 0 bytes resources/plot2d_splines.png | Bin 289 -> 0 bytes resources/plot2d_zoom.png | Bin 375 -> 0 bytes resources/print.png | Bin 233 -> 0 bytes resources/redo.png | Bin 211 -> 0 bytes resources/reset.png | Bin 232 -> 0 bytes resources/salomeCommonModel.spml | 49 --- resources/save.png | Bin 215 -> 0 bytes resources/select1.png | Bin 975 -> 0 bytes resources/tile.png | Bin 199 -> 0 bytes resources/uc_add.png | Bin 298 -> 0 bytes resources/uc_clear.png | Bin 372 -> 0 bytes resources/uc_current.png | Bin 298 -> 0 bytes resources/uc_del.png | Bin 300 -> 0 bytes resources/uc_new.png | Bin 306 -> 0 bytes resources/undo.png | Bin 210 -> 0 bytes resources/view_back.png | Bin 391 -> 0 bytes resources/view_bottom.png | Bin 399 -> 0 bytes resources/view_camera_dump.png | Bin 518 -> 0 bytes resources/view_fitall.png | Bin 523 -> 0 bytes resources/view_fitarea.png | Bin 511 -> 0 bytes resources/view_front.png | Bin 374 -> 0 bytes resources/view_glpan.png | Bin 540 -> 0 bytes resources/view_left.png | Bin 391 -> 0 bytes resources/view_pan.png | Bin 545 -> 0 bytes resources/view_reset.png | Bin 477 -> 0 bytes resources/view_right.png | Bin 390 -> 0 bytes resources/view_rotate.png | Bin 511 -> 0 bytes resources/view_top.png | Bin 392 -> 0 bytes resources/view_triedre.png | Bin 442 -> 0 bytes resources/view_zoom.png | Bin 488 -> 0 bytes src/DataTypeCatalog/Makefile.am | 113 ------ .../SALOME_DataTypeCatalog_Client.cxx | 128 ------ .../SALOME_DataTypeCatalog_Handler.cxx | 192 --------- .../SALOME_DataTypeCatalog_Handler.hxx | 134 ------ .../SALOME_DataTypeCatalog_Parser.hxx | 51 --- .../SALOME_DataTypeCatalog_Server.cxx | 166 -------- .../SALOME_DataTypeCatalog_impl.cxx | 382 ------------------ .../SALOME_DataTypeCatalog_impl.hxx | 145 ------- src/RessourcesCatalog/Makefile.am | 116 ------ .../SALOME_RessourcesCatalog_Client.cxx | 124 ------ .../SALOME_RessourcesCatalog_Handler.cxx | 264 ------------ .../SALOME_RessourcesCatalog_Handler.hxx | 141 ------- .../SALOME_RessourcesCatalog_Parser.hxx | 60 --- .../SALOME_RessourcesCatalog_Server.cxx | 160 -------- .../SALOME_RessourcesCatalog_impl.cxx | 314 -------------- .../SALOME_RessourcesCatalog_impl.hxx | 127 ------ 73 files changed, 279 insertions(+), 2770 deletions(-) delete mode 100644 idl/SALOME_DataTypeCatalog.idl create mode 100755 resources/channel.cfg create mode 100644 resources/config delete mode 100644 resources/copy.png delete mode 100644 resources/default.png delete mode 100644 resources/dl_delete.png delete mode 100644 resources/dl_insert.png delete mode 100644 resources/dl_movedown.png delete mode 100644 resources/dl_moveup.png delete mode 100644 resources/forward.xpm delete mode 100644 resources/help.png delete mode 100644 resources/home.xpm delete mode 100644 resources/new.png delete mode 100644 resources/open.png delete mode 100644 resources/paste.png delete mode 100644 resources/plot2d_dump.png delete mode 100644 resources/plot2d_fitall.png delete mode 100644 resources/plot2d_fitarea.png delete mode 100644 resources/plot2d_legend.png delete mode 100644 resources/plot2d_linear.png delete mode 100644 resources/plot2d_linear_y.png delete mode 100644 resources/plot2d_lines.png delete mode 100644 resources/plot2d_log.png delete mode 100644 resources/plot2d_log_y.png delete mode 100644 resources/plot2d_pan.png delete mode 100644 resources/plot2d_points.png delete mode 100644 resources/plot2d_settings.png delete mode 100644 resources/plot2d_splines.png delete mode 100644 resources/plot2d_zoom.png delete mode 100644 resources/print.png delete mode 100644 resources/redo.png delete mode 100644 resources/reset.png delete mode 100644 resources/salomeCommonModel.spml delete mode 100644 resources/save.png delete mode 100644 resources/select1.png delete mode 100644 resources/tile.png delete mode 100644 resources/uc_add.png delete mode 100644 resources/uc_clear.png delete mode 100644 resources/uc_current.png delete mode 100644 resources/uc_del.png delete mode 100644 resources/uc_new.png delete mode 100644 resources/undo.png delete mode 100644 resources/view_back.png delete mode 100644 resources/view_bottom.png delete mode 100644 resources/view_camera_dump.png delete mode 100644 resources/view_fitall.png delete mode 100644 resources/view_fitarea.png delete mode 100644 resources/view_front.png delete mode 100644 resources/view_glpan.png delete mode 100644 resources/view_left.png delete mode 100644 resources/view_pan.png delete mode 100644 resources/view_reset.png delete mode 100644 resources/view_right.png delete mode 100644 resources/view_rotate.png delete mode 100644 resources/view_top.png delete mode 100644 resources/view_triedre.png delete mode 100644 resources/view_zoom.png delete mode 100644 src/DataTypeCatalog/Makefile.am delete mode 100644 src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx delete mode 100644 src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx delete mode 100644 src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx delete mode 100644 src/DataTypeCatalog/SALOME_DataTypeCatalog_Parser.hxx delete mode 100644 src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx delete mode 100644 src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx delete mode 100644 src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx delete mode 100644 src/RessourcesCatalog/Makefile.am delete mode 100644 src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx delete mode 100755 src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx delete mode 100755 src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.hxx delete mode 100755 src/RessourcesCatalog/SALOME_RessourcesCatalog_Parser.hxx delete mode 100644 src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx delete mode 100644 src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx delete mode 100644 src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx diff --git a/idl/SALOME_DataTypeCatalog.idl b/idl/SALOME_DataTypeCatalog.idl deleted file mode 100644 index ad1767e9a..000000000 --- a/idl/SALOME_DataTypeCatalog.idl +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_DataTypeCatalog.idl -// Author : Estelle Deville, Paul Rascle -// $Header$ - -module SALOME_DataTypeCatalog{ -// Type definitions - -// List of Data Type Names - typedef sequence ListOfDataTypeName ; - - // Exception thrown if a DataType is not found in the catalog - exception NotFound {}; -//-------------------------------------------------------------------------- -// Interfaces - -// Catalog interface : -// methods to : -// - obtain the data type names of the catalog -// - test the compatibility between two type names -interface DataCatalog -{ - ListOfDataTypeName GetDataTypeList() ; - boolean isDerivedFrom(in string type_in, in string type_out) raises(NotFound); - string GetDataInterfaceRead(in string type) raises(NotFound); - string GetDataInterfaceWrite(in string type)raises(NotFound); - ListOfDataTypeName GetDataTypeParents(in string type) raises(NotFound); -} ; -}; diff --git a/resources/channel.cfg b/resources/channel.cfg new file mode 100755 index 000000000..afe59a75c --- /dev/null +++ b/resources/channel.cfg @@ -0,0 +1,278 @@ +# ================================================================= +# PARAM SETTINGS +# +# ** standard.cfg : +# sets up the daemon with default params as given +# in the CosNotification specification. +# +# ** channel.cfg : +# sets up daemon with default params which we prefer. +# +# You can choose which one to use, or copy one and edit it +# to suit your needs. +# +# There are only a couple of differences: +# +# standard.cfg channel.cfg +# +# PacingInterval 0 1000 (1 second) +# MaximumBatchSize 1 8 +# + +# ================================================================= +# omniNotify Configuration (Startup) Properties +# +# You can modify startup properties in one of 3 ways +# +# 1. copy this file to create your own .cfg file and edit it. Use +# promp> notifd -i -c myconfig.cfg +# to start notifd using the config file myconfig.cfg +# +# 2. set an environment variable; this will override any +# config file settings. e.g., for tcsh, +# promp> setenv LocalClockTDF 0 +# promp> notifd -i -c channel.cfg +# This uses channel.cfg but changes the time zone to GMT +# +# 3. use explicit command-line param definitions +# these override both the config file and any env variable settings +# promp> setenv LocalClockTDF 0 +# promp> notifd -i -c channel.cfg -DLocalClockTDF=-60 +# This would set the time zone to 1 hour earlier than GMT +# +# omniNotify manages 3 kinds of properties +# +# * ServerQOS properties are properties that all channels share; +# they cannot be changed on a per-channel basis. +# +# * AdminQoS properties are properties that can only be +# set at the channel factory / channel level. +# +# * NotifQoS properties are properties that can be set at +# many levels: channel factory, channel, admin, proxy; +# some of these can also be changed on a per-event basis. +# +# The channel factory's AdminQoS and NotifQoS property settings +# are used as defaults: when creating a channel these property +# values are used unless specific overrides are provided in +# with the channel creation request. Once a channel is created, +# its AdminQoS and NotifQoS properties can be modified; the +# factory's properties can also be modified. Note that once a +# channel is created, its properties are independent of the +# factory -- modifications to the channel properties do not affect +# the factory defaults, and modifications to the factory defaults +# do not affect the properties of already-created channels. +# +# The settings specified in config files, environment +# variables and/or command line param definitions are used to +# set the initial values for the server's ServerQoS properties and +# for the channel factory's AdminQoS and NotifQoS +# default properties. Since the default channel is created on startup, +# it also takes its AdminQoS and NotifQoS properties from +# these initial settings. +# +#================================================================== + +#================================================================== +# Misc Startup Properties +# -- these are essentially ServerQoS properties, +# but are not currently implemented that way +#================================================================== + +# Names to be assigned to the channel factory and channel created by +# the notifd channel daemon + +ChannelFactoryName ChannelFactory +DefaultChannelName EventChannel + +# Path names of the files used to store the string representation of +# the above channel factory IOR and channel object IOR + +FactoryIORFileName /tmp/rdifact.ior +ChannelIORFileName /tmp/rdichan.ior + +# If a file path is given for the following parameter, the file is +# used for storing debugging information. 'stderr' and 'stdout' can be +# used to direct output to standard error / standard output. + +#DebugLogFile ./debug.log +DebugLogFile stderr + +# If a file path is given for the following parameter, the file is +# used for storing report information. 'stderr' and 'stdout' can be +# used to direct output to standard error / standard output. + +#ReportLogFile ./report.log +ReportLogFile stdout + +# debug flags -- 0 is "off", 1 is "on" +DebugDaemon 0 +DebugChannelFactory 0 +DebugFilter 0 +DebugChannel 0 +DebugConsumerAdmin 0 +DebugSupplireAdmin 0 +DebugConsumerProxy 0 +DebugSupplierProxy 0 +DebugEventQueue 0 +DebugRDIEvent 0 +DebugFilterAdmin 0 +DebugFilterEval 0 +DebugCosConsumerProxies 0 +DebugCosSupplierProxies 0 +DebugNotifQoS 0 +DebugAdminQoS 0 +DebugNotifQueue 0 + +# report flags -- 0 is "off", 1 is "on" +ReportChannelStats 1 +ReportQueueSizeStats 1 +ReportConnectedConsumers 1 +ReportConnectedSuppliers 1 +ReportConnectedFilters 1 +ReportUnconnectedFilters 1 +ReportEventRejections 1 +ReportEventDrops 1 +ReportNotifQoS 1 +ReportAdminQoS 1 +ReportServerQoS 1 + +#================================================================== +# Initial ServerQoS Properties +#================================================================== + +# Each ConsumerAdmin and SupplierAdmin object is assigned to a group +# and each group is processed by only one thread. The number of such +# groups and the number of threads that handle the groups have to be +# at least 1. In addition, the number of threads should not exceed +# the number of groups + +NumAdminGroups 2 +NumAdminThreads 2 + +# notifd may split the filter evaluation processing in two stages. In +# this case, a second thread pool is used for evaluating proxy-level +# filters. The size of the pool is controled by the following + +NumProxyThreads 0 + +# The following variables control the number of threads created for +# pushing matched events to push-style consumers and pulling events +# from pull-style suppliers. If these values are 0, each consumer +# and supplier is assigned its own thread. + +NumPushThreads 4 +NumPullThreads 2 + +# The following variables control the number of threads created for +# notifying suppliers of subscription changes (using subscription_change) +# and for notifying consumers of offer changes (using offer_change). +# CAREFUL: Setting NumSChangeThreads to zero DISABLES +# the sending of subscription_change messages! +# CAREFUL: Setting NumOChangeThreads to zero DISABLES +# the sending of offer_change messages + +NumOChangeThreads 1 +NumSChangeThreads 1 + +# For pull style suppliers, the time period (milliseconds) between +# pulls is controlled by the following variable. +# A value of 0 corresponds to continuous pulling + +PullEventPeriod 100 + +# Period in seconds used by the garbage collector of the event queue +# The minimum number that can be used is 1 + +QueueGCPeriod 300 + +# The next entry specifies the time period (in seconds) between +# each 'report' (the Report.. flags above control what gets reported). +# The channel may have a built-in minimum, e.g, even if you say 0, +# the channel may choose a 10 second period. (300 seconds = 5 mins) + +ReportingInterval 300 + +# Description of local clock values returned from omnithread::get_time. +# These values are here because we do not know a portable way to get +# the clock accuracy and the time zone across all Unix flavors and +# Windows. Let us know if you have a portable approach. +# +# LocalClockInaccLo/Hi: local clock inaccuracy in units of 100ns +# (must fit in 48 bits, 32 for Lo, 16 for Hi) +# LocalClockTDF: local time zone expressed in minutes west of +# greenwhich meridian; 300=Eastern time zone, USA +LocalClockInaccLo 0 +LocalClockInaccHi 0 +LocalClockTDF 300 + +#================================================================== +# Initial Default AdminQoS Properties +#================================================================== + +# Maximum number of events that will be queued by the Channel before +# before it begins discarding events or rejecting new ones. A value +# of 0 does not place any upper limit. + +MaxQueueLength 0 + +# The maximum number of Consumers that can be connected to a Channel +# at any given time. A value of 0 does not place any upper limit. + +MaxConsumers 0 + +# The maximum number of Suppliers that can be connected to a Channel +# at any given time. A value of 0 does not place any upper limit. + +MaxSuppliers 0 + +# If 1, newly announced events will be discarded when the number of +# undelivered events in a Channel is equal to 'MaxQueueLength'. If +# 0, newly announced events cause existing events to be discarded +# according to the 'DiscardPolicy' QoS. + +RejectNewEvents 1 + +#================================================================== +# Initial Default NotifQoS Properties +#================================================================== + +# EventReliability and ConnectionReliability can take the values: +# 0 --> CosNotification::BestEffort +# 1 --> CosNotification::Persistent +# OrderPolicy can take the values: +# 0 --> CosNotification::AnyOrder +# 1 --> CosNotification::FifoOrder +# 2 --> CosNotification::PriorityOrder +# 3 --> CosNotification::DeadlineOrder +# DiscardPolicy can take any of the above values and, in addition, +# 4 --> CosNotification::LifoOrder +# StartTimeSupported and StopTimeSupported are boolean and can take +# the values +# 0 --> FALSE +# 1 --> TRUE +# +# NOTE: the current notifd implementation does NOT support all QoS +# settings. In particular, it only supports the following: +# EventReliability 0 +# ConnectionReliability 0 +# StartTimeSupported 0 +# StopTimeSupported 0 + +# Note -- PacingInterval can be set programmatically to any +# TimeBase::TimeT value (units = 100s of nanoseconds). Here you +# set number of MILLISECONDS, e.g., a value of 1000 means send a batch +# roughly every 1 second (or when MaxBatchSize is reached). + +EventReliability 0 +ConnectionReliability 0 +Priority 0 +Timeout 0 +StartTimeSupported 0 +StopTimeSupported 0 +OrderPolicy 0 +DiscardPolicy 0 +PacingInterval 1000 +MaxEventsPerConsumer 0 +MaximumBatchSize 8 + diff --git a/resources/config b/resources/config new file mode 100644 index 000000000..692539760 --- /dev/null +++ b/resources/config @@ -0,0 +1 @@ +language=en \ No newline at end of file diff --git a/resources/copy.png b/resources/copy.png deleted file mode 100644 index 1ba2eca28870d38b00926919445e873729dc0d7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Gdx`!Ln`JhoqU(~fC5KL|FMHN z*1S#IE?JuqlCjbLqfipZuSx;YNi!}Ql}b4m|?cxc49=%$ysWHrBXQGf5tS33D$Z@&MNAfj2+)lTp00i_ I>zopr0Cn$DRsaA1 diff --git a/resources/default.png b/resources/default.png deleted file mode 100644 index fdc199ae1db2c77a46d82f314cb918461a9b17cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!7%)r1n>(-?sK#oCxPl&6fCWEgPbFvplLyG9C zW|luExNfY~xVo=qDG01xx_0gRYjgfTpL6Wk-eadOy?b_{<=qcypkBU`Aiv=M$biB1 zz?~C7nIKOW$B>F!$vaLL%zUWF!4#-JW6$Y=z-bTJI(Sp!cz++`PI-B+wcujMg&BwI zc*^CYnRb46NHVXQm|`foul#)!lcbL2e%_XzgG##sR<7oYC}m`5=S!OUytCmo&~ye* LS3j3^P6anMpkRWh zi(^Q|oVAlJ`4|*=nE#g4?eefWa$8aFvB$y%Ck+dE7S!?1oSgNpfoTJSis$tW*ZdsW zt)6aQ(zIg793!#&A+g_k)})>-dbTfofla`K4LQ}^7t1Fw%~2?8YTonHNAduF{F^4H U1H0aG0_|e(boFyt=akR{00b>Q;{X5v diff --git a/resources/dl_insert.png b/resources/dl_insert.png deleted file mode 100644 index 54e108a889d3fab855bbb1d9dc8a5c79dadfc453..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMpkT45 zi(^Q|oU@Z0xegd`u>AcmZ}Vf5*slq16?3wrq*JnR^u* z!;W)JB8bP0l+XkK*$6~8 diff --git a/resources/dl_movedown.png b/resources/dl_movedown.png deleted file mode 100644 index 9c872192d1481f4a3e3dce5d7cf7c9c29bbd18bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprE^_ zi(^Q|oaBmv|Ax$}GnCG{NFO+G;Ddadry0Ziv?exzOExmR4%Zww9+xm`&MK^Gj5u3y sxIyCVmVVY5iWN^eB^@p>dGRtZM5}x5U2;x#I?zZ4Pgg&ebxsLQ0E}5JQ2+n{ diff --git a/resources/dl_moveup.png b/resources/dl_moveup.png deleted file mode 100644 index 45b275007fa72c9d6a7f050d5c0eb42db4775906..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprEIx zi(^Q|oaBmv|Ax$}GnCG{NFF$F;KTeJW(f(2e}@fDvMFRAOXs*at5DKuQd&;igf)_P v1#YoEGB9Y6IP0>Mxn>q;RilK@Mn(q7wVr#ge9{jA8p`15>gTe~DWM4fM!qlz diff --git a/resources/forward.xpm b/resources/forward.xpm deleted file mode 100644 index 2ed813482..000000000 --- a/resources/forward.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -/* Drawn by Mark Donohoe for the K Desktop Environment */ -/* See http://www.kde.org */ -static char*forward[]={ -"16 16 5 1", -"# c #000000", -"a c #ffffff", -"c c #808080", -"b c #c0c0c0", -". c None", -"................", -"................", -".........#......", -".........##.....", -".........#a#....", -"..########aa#...", -"..#aaaaaaabaa#..", -"..#bbbbbbbbbaa#.", -"..#bbbbbbbbba#..", -"..########ba#c..", -"..ccccccc#a#c...", -"........c##c....", -"........c#c.....", -"........cc......", -"........c.......", -"................", -"................"}; - diff --git a/resources/help.png b/resources/help.png deleted file mode 100644 index e57336285ea67f393322fd6f19a64d9d1de42e53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!9%)r1XI!iqT$l(m|32{Ae;K2X?Kn}y={c$Bg zim@cfFPOpM*^M+1C&}C0g(;1@2Bci9#5JNMI6tkVJh3R1Aw4tAs30$0!AQ?Q&(Jn* zUj|TxkEe@cNX4AwgoJ(PcjV()C>w#3=B*S3``o9LZ`&mG989ZJ6T-G@yGywpz CnKtYI diff --git a/resources/home.xpm b/resources/home.xpm deleted file mode 100644 index 9c1369d9f..000000000 --- a/resources/home.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -/* Drawn by Mark Donohoe for the K Desktop Environment */ -/* See http://www.kde.org */ -static char*home[]={ -"16 16 4 1", -"# c #000000", -"a c #ffffff", -"b c #c0c0c0", -". c None", -"........... ....", -" ....##.......", -"..#...####......", -"..#..#aabb#.....", -"..#.#aaaabb#....", -"..##aaaaaabb#...", -"..#aaaaaaaabb#..", -".#aaaaaaaaabbb#.", -"###aaaaaaaabb###", -"..#aaaaaaaabb#..", -"..#aaa###aabb#..", -"..#aaa#.#aabb#..", -"..#aaa#.#aabb#..", -"..#aaa#.#aabb#..", -"..#aaa#.#aabb#..", -"..#####.######..", -"................"}; - diff --git a/resources/new.png b/resources/new.png deleted file mode 100644 index 953757a62f594c7591c7cdcfe8e51cdde41bfa45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|t_Kbr05bpo|KGb%L=DJd zED7=pW^j0RBMrzAD{+k|3C>R|DNig)Wk}CVGb+eSS1{5u&@;4++m``U!IJLjmJXyP ze>`8)3#3&%T^vIy<|HRDFdn-gps+DZvm@deLlP@PXQ*(8l9MyD!~+I~_)t;*^HWte Q0M#>iy85}Sb4q9e0N}kbVE_OC diff --git a/resources/open.png b/resources/open.png deleted file mode 100644 index d9953b6a7d36d4983f2cd609ef10976ac221215f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!7%)r1n>(-?sKn{O^Pl)S*0|);9XJ~0+_z$EQ z7#`Knt^-nxB|(0{3=Yq3q=7g|-tI0e{TVj{fgG_C*NBqf{Irtt#G+J&^vpD)g1mGE zBRvB>L)*B089)``o-U3d6?1&M4)PvQ;5l+fi(A2vp(}!6Dx*Nk|Cv%5s~;VoE6>K# zQGEW5oA9EG!rjU&^ViLso3`2fSZHEMajgTe~DWM4fqRCMQ diff --git a/resources/paste.png b/resources/paste.png deleted file mode 100644 index d86ece38be776c9ad1efa18546100571bf7a0507..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmV<603ZK}P)&| aEA;`IoQ_T^(_ioa00001wKMdr8^vxQ|~wy?0v9av|%U}Gs*rfcp)?rHBR=#3tgUIJ6OD z(pc!B=?-$jPAPb>Qv}>Xm=x=6a^Rg8d|?@8_M2zloo{$Otu+8dkwa^b7iy+}J&wj0 zH)%unqU*XB-LW+@(|mRRVBZ0Bjyo8|A!3;;-NN~l7twWKyBkO5Lk5|a?ffcjb;f0DCazsJ$Hb}|3DyGO6z zqrO(Bw*0PGZyz3UaCpG&;1>ViMi^rtj`I;*`>@UR&sy&8F6HQZjg1eRR4Zo$^R)t) z^gkh`BpswrJB*^pGsd{YBmh*FDgbP5Z6f6=)un*5)3cF1;X;W0ZO1o7DK&D1DsL+6 zec2;aAy=1IV~=U7E(5GAuh9D30w90LVVF13H>6M?I1t0X4j`tq7U z1`N;CT1#S*;t5qqwNeF`d~LQrZhPzR*IhbD>GgYslZ~y7C+md}lYs!j7nEL=SX@{n zd>xWKWMo-}5CY)~gb+n-NtC7l3V}o-gdoc@c!2xto{}hm&j?WXQ#hQRoAt_bWy+MF zD+T_e%TFqbT#;0dde-4YY3*sPT{MJh?d53$ymj#7#qmlW4q9u6*F-m)D5ZwsFtws) wvvBM~9tMC@N&zq&pOb1d05EZ!FBs$g0O%^=#(Qhl&Hw-a07*qoM6N<$g0qwojQ{`u diff --git a/resources/plot2d_fitall.png b/resources/plot2d_fitall.png deleted file mode 100644 index 9a70952a1d50e98e939168a3274bfb841e63455e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmV-F0l@x=P)= z74N+R7{~IwD5d`w9%DXtZ*IX_&p)+QU03`xp{lv{@*SOKXwa0zr6lfX%`}c7TMWQZ z7eZB`d_z^uwVjm2Ez6PtVvPG9{>GeUXoWc{#^~zxsM|$pL0Zs9z@N?b`7yADv|wP3 zeIl!%?dt-V-D6A__yhGDyKbq+malXh*lXB@dvgNisO zkO9UF>GgOm!$CwcZbs%A@BKC;9w^N7p7F3{92}6n_W;;>B|lBTHb=LO<}WWel*5DA RC71vJ002ovPDHLkV1jcSjS>I= diff --git a/resources/plot2d_fitarea.png b/resources/plot2d_fitarea.png deleted file mode 100644 index f54ae77833d0bc017682149abe77dc2b7209a64c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmV-70m%M|P)ZW4y|2Znu0?c48l$?Qv})Ui%rm9RyBJyzW|qEDS1TRMAj}N54H0o> zmSX%2X*MK}7Z?aRYu?4#nfH*gGJJ2mrZWLFO6Q_vn7G^atY|j7`9r5}p76002ov JPDHLkV1g-ShAjX9 diff --git a/resources/plot2d_legend.png b/resources/plot2d_legend.png deleted file mode 100644 index cdcc1e0d858a1fa5dd62c11d6b8df2344f8b873e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmV-40n7f0P)q<_O%b&X~PS@Rh&PK53aiRc&AF+5-asJ9`bIh<#s{<+<1?CEK$vtQ}@Y|s``%z#iB?sWW&-DgXbs+=*j^k+N@AZI)02Fu427qnb-gDMK1GFIn zr-id>99B8{m3IajcSS$Dyww9KB_|@Jl-x?l4X}jVyWtr%ml9(vH{F%Z@zCK+ci1`{ z0^ym%5%g7ubHIPq1+G2}a8cN+(38W`dNIb~ZB7B<-0Um0*n~XN$a&MtB9ggyzEsuq n-oYYQ{{r9>>QznJbl7zd^&y98Uc7U000000NkvXXu0mjfno54V diff --git a/resources/plot2d_lines.png b/resources/plot2d_lines.png deleted file mode 100644 index 6baf57344cacc7fd22a5e42fa8c5eff44313ecef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmV+`0o4A9P)6Y?_0RXE0JT4_OJT|IN zm=P$_uiT@)Vv5ae6+`d03x@pxz}amxmn^mKnr9P}*-!iyjEDjeeJ#Rp_=bA`$ziJM xV$#u^;(b!4FZb54|K{s!E#|p0jrXqWb^<002ovPDHLkV1f*>eft0a diff --git a/resources/plot2d_log.png b/resources/plot2d_log.png deleted file mode 100644 index aecca8c13acab4ff9fe724bdd0532f858b60e84e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmV+*0pI?KP)yV)cn^ALNr{!zm6}N9f-s*K1ca7l!Ic&+rQHFX z0DzhGSCEL%27Ez3iFbL6y|1-uN{J?4m~%b_`n<&lwMw?-TC3)q(ORP;XrH%uT~~O& zEhVLN2s+DK+kMqOvu1*b z(5N%udAK88j8OwH-muv>x@jahvr-D?c?JOWf6=z(em-aBbs|Eg6aeq;cOAYShx7Eh m)*9uU6@a$Z=)S}LTi^rT50BHSofNhJ000024T;k_?8=a+U^Ie-J8 zx>-@{(9+p2q?EYt8=zQ)y~AEddvY76lz?~lTMqw=3qa1vaWD9Tvestr9RS|Dou~@1S?#(UokNc! z(K)o%J3H3e^76;WC-?iU%%zmnOTvGxTWhnmR<3z}|HHbj0Icg;NZ;xpVvJAe+O{iV z0LB=WWhwVsYbEv%2}M+F4#UVWjD<+5?|a&|%QE*el-j2Ej{E&aO{%q4Vqbz%bsvUl zLTfDxcP&xd?E8KPuq+FgBf5E>l@J7k7zfMFOh=2obUG3R$mP3FCO2tveCO6o9_XQFjbbwF@pryNj9Zvx)| zi5Q&thtEWtrpW+$97zD;@;8D))HKca`6cRfHuSR^znLJ7eY`Wgp8VyP-2Wf z66vN1A-rtFodUAf8UPvpS9%-)h|X;fV$6R5gW2d0edifl00000NkvXXu0mjf;t$bI diff --git a/resources/plot2d_points.png b/resources/plot2d_points.png deleted file mode 100644 index 4847c4e8bcfeb4a2c47651887634307cc9d1b6c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmV+r0q_2aP)4U|+y9YLuzxZ27TOjT%-$E$~~7BX~I%V-x@|x@~x2(ZAX9R%KKv zH@MGoC}F@_4I&aE+H70;nddB~-iLY4vel4?gqeRf*SVE8XRlk&HG8<%u8cjSNlV@f Wo_;8|&b^la0000#4&q426%%9U#yJvcQFmpb-jPz@vDCjNk1TRo9bO7~FmDaAEgfs_?BRl$Z z{J{~B*D*ADZp%(iW>3SJ(I^Wtr zgUl5vb-fG#fb>WJR$lBHZ1^A09Xsld9W@;iQRZq57yw>SO^=j2{5)y<{%mtHr@J^b z^?grYr@S_~r3qMbv>7NOBqG}^)qnuN%#`lwXK1#E<(=B1-Cyh{*-fFAJ}1Tt00000 LNkvXXu0mjfVkmy? diff --git a/resources/plot2d_splines.png b/resources/plot2d_splines.png deleted file mode 100644 index c39d4321c35c26f3792db5fbdcc42d7a272e36a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)E(pSSm7o4rP5dfTZo0?MBWOjZt-%RW<8)Zs3q} nwMS`wb^9v0Oyz4j$R51`lB<3+1VYzX00000NkvXXu0mjfElqrU diff --git a/resources/plot2d_zoom.png b/resources/plot2d_zoom.png deleted file mode 100644 index 35e185b066cccc19bc9688fc33d9fcd46d176fb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmV--0f_#IP)YT?BV|bT+xuE{OU<45`j+_Uu;7} z004L|ATsz--5a*A%q+S&O^y@*fVH*= zTbAVrJ3+geyW`Pwm~#%!IXs`wlk@Hv1Tz=i-u)wZ;rhIAl6y{fUe(U=NSONA#5+0(-?sKn{O^Pl)S*0|#1~TK@lM_z%Pk z3>q;Poq!Z$NswPKgTu2MX&_FLx4R2Vf5y!~AV;jkHKHUqKdq!Zu_%=xJu}UyATM3P zNY6me&^B&g22e$$r;B4q#T;9|+nfxB9H(Pt7Z~4RVU=~r_%{EgRO>H6zopr06D=?0RR91 diff --git a/resources/redo.png b/resources/redo.png deleted file mode 100644 index ac72e5c27cb02fdb6aebd6fdf3a8f08b4a4bb2fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!7%)r1n>(-?sK#pjDPl)S*0|(O5(ij+KrlrjU z0tN;ko8e_7w;YgSED7=pW^j0R10=?n*?YcQZXkvfq^-UO^uOFVzQz_10&lEi3m{%2_6XphGc;j yHqF!^hL=hVK9Uk42TzGOSUK#9bu1CEvt^K0XP(n=mTxoAAO=rYKbLh*2~7a~`8MzX diff --git a/resources/reset.png b/resources/reset.png deleted file mode 100644 index ccda81cb117fd14d8ba2279f5de2aa03b55e1b90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!7%)r1n>(-?sK#ov=Pl)S*0|);9XV|-sVZod^ z|A8z9hKEa&*8wTUk|4ie28U-i(m6vLp z1$pTTMtTN%hPHA0GJq;VJzX3_D(0m27;-fj2(YkE`r?+P-=x1o-s8>r7k~e2yK#1; zbj{VB#%i;{@t7vRb)2A-owOg9tRi2*k)6{5EmN1aeX};$d_CN2vYGxb%MOo=+y2lFzshE?TkPwiNkTB!Gfg=l8m&}#eBr!>XWru@DmT2=etpyT?nG}*37e;y? zSkda3%^Hw(m5a@kjm^N2*=a>vo14Lkbx{V)P7MqUQul;6JeuR&3^bU*)78&qol`;+ E0M`~hx&QzG diff --git a/resources/select1.png b/resources/select1.png deleted file mode 100644 index a1a4ee1d52bb1642c35e59cbd98a6d61e1cbbf3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzU}gyL32{Ag(XtH+i|A$>yGTanrJv}Vn71?{kepP$n8jbDQ&9P6{DSwHJ5&6t;zVEf4 qiTkGBoX&*C49m@7VrQ-I`_JRw<#IIU%bh(S&w0A~xvXw<1Ils0EOha&)G zhi29XRE$AVLX2z83hY@qyn?PN*9!}5%=51tW?*n2DbMS%*Ws|APzsXLeseuu>2PdF zhASAwM6r1$hgOhe0JgfGIdk`9W^WzT?vy_idT*Pv6pO^A*Kc!J`n*}gGY4hUGSfVv=kz%pNyD z%|aCes3^et`Q-pgGGOKm2heA*nuwq+zhbALJN)6+yM4#{bIo$Q8DV3vV(v`S?Yq%< zv)!WIgFOK& z_i)KBA#D}|XaE}8s_6k-3INYJN-48PG^%iT$s|QeiBbx=y&(4kT1o+kTEuLHH5E%K z9Uo3^zs|W@;V{`6ERc@h<1=PJNx{W5SujMixs zcR!$CD~vEzmCL{hjW7U^7>c#l^C19WYm)b3n-O|jueC%YXm8_hv4O7m0trxlKu wCBS->ex-0pc~{YbyqekPf14fbYlUa)34@fKXJBgCO#lD@07*qoM6N<$f`eRvU;qFB diff --git a/resources/uc_del.png b/resources/uc_del.png deleted file mode 100644 index ed6c97cee3997af589c84b8c224c6dfc1dd401dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmV+{0n`48P)Y(?Mzbl8|a01;V&zG_Imlm&%% z0Bj0HWDUri6UmC4d(9m77!-bk_LRpD9d>W=C4~)`45)1J=vNgUF;Fs*ta0<`zuCuc zqpE2a1_0@5FMIdI&Y^1cc-|=s=3V0lczju5gt$p5KVBqlDU9hx7_gagRA}erzIG@8lB+*pKRt1gz2k0000#f5u2!#(-2Vs*kN=IRojzTwK6Zc0$iXZgmDn*Kj6a4uYW5~?#OS}FRU?Q#hCua0- zAOOf}Apq{)+#MpagD*#bmAN~Zx%+ks$jor}^T6BYf1>aP;JLk@Rv55v3J;yK6+RSZ z=n^QZ%~T0^*P5BNJbColrY(!=RLI|8V-7ooqS_z=4A+sFDU?)x0`4%8QYipLDk{59 zFtZ)njW^Xfzbhk4ffID)fi5K@oO1iBa`*|5er$%v{f^uqx(-?sK#ov=Pl)S*0|(O5(ij+Krlrkf zU;r{0c8fE|0x8ClAirP+hi5lHVvI@N?k=o9@?RbYa>PnpBT9nv(@M${i&7cVGt-O; z^3oNI^bGV2ZR7T309Dv~x;TbZ%t=mQU}j}wb7#{iVECBO(8;)tf!9FG&|rfFL+EA) z6N97`4y=4Uemp!~4sBgbS7OxF+1c3AYpNKu@|hn*9eH^jXcU8|tDnm{r-UW|1Q0o1 diff --git a/resources/view_back.png b/resources/view_back.png deleted file mode 100644 index 436f2da157599bbe520d17325d12bdcf949b3cd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)ToQ5QWE47Di$LQWhKmpCjr4BGlVNU9_~9sjS>4aD*%(C5tZDx$_(i5NduFs1I2f zVSn>x>`~-sRc+SA5pAb_R&}+=zsZe~xf)AZV0msvL3LgE_qjTg-fGfXkEd*mA^UAf zaqQ6e{3zRCx9g4WKX+=HX5L{)2y}cql5-E2_GBsBWt8sHfkVc75WlfWQtl5pFJ6n$ zGHm)Vi4MU*C}lTuOivEW_p*&Ha{y#4(dzf`e=jy9ckNLI%imo|WWET9`pE%_a8U9O zbHCk*QN@~-l$Y+>k-NJqX~x{J*-fW$#aa4fC>k#_U2SW^-w&p>fECP^9Y zusKaq4-)YHWv~7K=L8retyUZg)&JkskQvfD|JBoO zzYDtIW9aesNJUvtRaSAyN+~A`+mJO5V(9sDrba)=(7hC$m657fmWtJWrIf)#UN2=9 z&mflSOXjTJ1Lt6z&T{-rV)e9b@jm?D#)kQ_`G2S+uxB66eTN|2B-*BJr5mj0VbbyA zs2(xH&;1gcRYUcv4oe0Y8vw9hh62)m_YWBQuMmZqmX{1eGTG2l@Bst}kDGy&!c2+- z#4;s52b?9c!{)lG4T!<(&vll^HpL7umI+w5>6{%;pdL6aWx8IjW;Ro1*UUF3Lj>Tf tfk96h*9_n^PzO}{2?hEGbItq$-2mb3gTb{fp`ZW&002ovPDHLkV1h$>uz&yn diff --git a/resources/view_camera_dump.png b/resources/view_camera_dump.png deleted file mode 100644 index 8eb63e09be9919e21d4c8e54482127881dfb5d29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmV+h0{Q)kP)4z!7>1uK9(3SAf^^7GunHcs^$cDz)_6(iV({WI4*3It{)u>Xhxj~ti8*H|$zqZ} z5J<)wJji1p0cj{igW)BkJ?%Pv>zOQKhAcmy9|Z{bV&nXriRhkD0mYv?#0>V_!1=*0M=P_N#mTuI*XDD zDJ5oVP*Txqwy4!>IlS;^hIEpWoQ?8%zZa8EQd-RxU+cAeeKbrM3F&eEM51X zf!*F5=A6Sm*rh$|?7AbXz(%uynHuhH?od+YZ|a=GOiey?NmGd`E5Nmlot!6`eYB*L zH19X9_1cPr5NvO4BjpB{0YpI%7DIN*JLpduKl6C+=WZ6B9R&zQh$uddSAl=4-#bmH8`<`*2LJ#707*qo IM6N<$g7~BA;{X5v diff --git a/resources/view_fitall.png b/resources/view_fitall.png deleted file mode 100644 index c09ff94ad89b32483194de03275ece8844f985da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)?PhR9q@fLZN1A`}f&DKuL#6x)fXr>83)#*`Z*DLNWx> zd|z|PU49gYeyKLzz5C?*-n~1GV)|F<_=+jVYW#P)ifeUwvJ$3M?|BI41;baV+C4ze+DhUx>sE#&ay0uli=5tOXJB{D>+os zPG2L#Hrow9Q?}fM{aIbH-4~bqZ$E<>xz@hl54Sx7r~Sb&L^0gNRz zG{hy9;RtH!{S%7=zT0gpVE|wuBsci%&gSzh zE{P0?$>*iRN2v;ihL$e@S@}&<077^hYA7y(Q(+3QD4a`?)?ctH{QyT@0vIgdd#3;Z N002ovPDHLkV1fY3?PhRGdP)2p#HH|33Q%C|O!E6r^~zZh;0?@J zRznD>ih9>Q3RZzetkEITfui?_;cyGVW%sH}v&R{K!#xzoF`uaimYT!$I%KZWv|ZOV z%EEO`wU76_ZgeP}98bo16C};iWJH(%0EV|iWA9{_QFuVB%Eu|IY4j11>$v5gQZa{F z1nKO)cew+pRat1-_G`=amaZ2LD=-vTU~nMovH&X!X&1l>OhyJU>9*7o;uP(oc08j7 z@B~b{?6zEE{;KY9uZ@(|O6evTZV1K(G6p=2X^jN^%3VgvOUhyMr#bycT8p3KYh^rF z;cLiWNLwBPI75B-nQDT{(??YMeDb}NwElus^$S4h`^wgq1%Utn002ovPDHLkV1kOB B=B@w$ diff --git a/resources/view_front.png b/resources/view_front.png deleted file mode 100644 index c5dfc00d5f0c5af534eb0f661c971479866fe3ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmV-+0g3*JP)!JVgih^5+cQw$wr zBrNIEn?Eb+Xi>Xc7Dtq&7Tu@&m416~mCV(Y%K~fP+DTBgtNeI$N79)lt@ShzE6qzo z^>aPCj5UECJ`R)@Ihn#tyX>3`R16KOagjhz=M$CuKw+2^R^?sgQC!71e66*km;6jh z@4SG-)!1cGH4kL#JhGFA(vQgbe3@1|mUm(%Sd1@UMlu* zBq_~nm}%7CX1yU}%tmJ%BGCMdZHzCLn8iW*0_gW| UI2>wZ_W%F@07*qoM6N<$g1r`_kpKVy diff --git a/resources/view_glpan.png b/resources/view_glpan.png deleted file mode 100644 index c23322a4ae4dc6ffdbbac6af7b397fc35554d750..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 540 zcmV+%0^|LOP)BjE6vuxTJUoGh6Qn~vN=>^&xI;}l#9IvgP$g6AE(vlcIgp?XHrJ&k{W1Y*5aB-VXic*jlIhC!B7St)|@M2Zv zKenaC)vQ4nzyL&q^HF@Ps8&pMw%bQCPY@B#UY!B(`pt01s9iyYa}JcEAyTRpnOsbG zdA^B<`wS6bur20$HUwG&k~y#jYc1f%#w&@a=HN(Zy|wwH6&}?Ajs&+1Z$#!H!3<5~&m3wL|-GpP>|d z`#Qsx*1O&z27j^3$vh!{%87IY{L3!mjRHSDRoU*ag!^Q@2sb?~ilTXUh^!Z3)6-D= e58(*eCY}K*P2#+!$#_8k0000#4hYT73@xcd(&pm-#npxikSuV5-9m#TxJaE8cS( z?6CT6guTvLO5I1?Y0TfI*^p9d4t#%GP6fh2>61#>&d|az~ z05N#?xDzwrJ#o5i(^B2kWS)!|$8SyXBtk0wa=r|AGpB2s!CAJ;*nocxT=bl{W&r1b lVS@_K(#Gk*T(fDJegL0JhzmDWEerqv002ovPDHLkV1gN~uB`w7 diff --git a/resources/view_pan.png b/resources/view_pan.png deleted file mode 100644 index 038fba118736ff3732a97e0e62ea4420022560ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmV++0^a?JP)BjE7>1uK9zKDF6S$E4l!kVRaE6$4Xf~VvvDRH$!HE9XPz1Z$vi!vUUz@DL`3!kYtP=iy&zkp=%%I{0NeTtoDI(ah_7On-TAd!lpGY-d%JO%@!%DiVZEgRb(KYiRlo=qu7Yl1y{SK zy}w&x41D=K^XYHt6@$N+u9!KPU5bdHI#2_85YZsxw7e`anCfhV=`LxAq-=b5A) z8p7SrJ6^nc$^5E9RS^+J!!ZE!s|v{k5lH~{GC}}jqVGzFEiA9!zM;Hykby01dWF@z zVl*7{^>hZn^y3s)IslrwA(tE}B)x~K+WC8S4}hb06GVi(h%m{7EENb*ZV1x|dmrD8 zhGWX_uIpiPg_ENR)x6^3>>Oi=eFHAe&S~lf-9!axJ^Vwa`{r2tbtilO`F^_O#g7HP z_B3_F@rPq(UuLZR8Xyit3~h zU1AGWRdk~rSVXXe?Q(Vk%S(q84?pNv-1`04&K|DrR}2`SnLdjBen4wG*G5%obh{EM z)&bigv~oXvK1qi3?SbT*>jmC>R`)9)-YB``NGAUW6cMBl1`KF)`@^?8mSVpEcL1+S TU5X{h00000NkvXXu0mjf?E%y8 diff --git a/resources/view_right.png b/resources/view_right.png deleted file mode 100644 index 598def41df5762d105c934b230cb10f1c6d8a546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmV;10eSw3P)ToQ5QWE87Di$LQWhMcK1b98RH(N>SwyrwOl9>DRjv@{2w6nR5geXj8e_2O0(Dq` zyZ6bQNNyxaDdRw#w1<|O zeKUKEGlm|2j+EsY6?qZ2Y>XMH@B^xG5koK63sv0%g=1i+3LvEv>4SE#&@w>Q;=R{->_G!~_p%cc;8FnQ*Q|c6g@69AY)N!AvA65Z?PeDGCWSsE#LQ@Z^Sznh8;9{<=)kqb9)3T>pEu_l_bNgM zF1*b$b*#=-tj<*$Gl>z1@}prmCi@hC%zQs#e?;)}PVk z>C+jm(`Pu{t7YrV>0a&r*F8SY`EtxbD60s0Qrxc<$~yff#A_=*44mV zj}qYK+YJDR>VUimaH3KSEEqoevu<=26A@-ILlPMh#)`4p^YNV4yAgP6;;3!Eg z*Q7XNcoAXl=lImevP?#V04VMX9-kiBx@|}36y3zSP2}HmEB}-{KRt8#;SzwWk5`dy zxme=8=i=Q(1RB{5Gd7OAgfmfcc`kcOeG0 z2?x}^BQczaAgM4*XOm*1DLZfj!mtI2#5AWa+rP`@-yqS`CtUyl002ovPDHLkV1oV= B^929^ diff --git a/resources/view_top.png b/resources/view_top.png deleted file mode 100644 index ebbf34da5e69afc736d890204dc84ff913cb512e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmV;30eAk1P)Qy+Xqgx~S9*QoBGheug2Av0WAs zFLL8(#^3xTQ$dDi)nZ;8(K2To-iANruP&6}y-1bJu>QGEg4*lW-M7P*Yh^Wsudn!IH=BRb0Ay{}Y1;~CDR|NXF`uxx&gwImCKbNEqn54q3I z=cPXnM0BN8G?0VZQ~F8&z%U_&EZnq=lkz=kni19Q*9Hhlu)NPf;XgX3-h0000LX zs1y%eI2<_t`Okm;B*3xPIM^@Te*!xGCPvWL)&+Z6<^aSeanP*?5c~`)P$zEz|oc#e30cD(1^Uc5=y=x$By?ZPaRGr!Wk^d?nv5moIats-AJTEz@`9Z`A4^ k(&qh^`6b{_V(&lL4{SuhVMr-3DgXcg07*qoM6N<$f-sH8LI3~& diff --git a/resources/view_zoom.png b/resources/view_zoom.png deleted file mode 100644 index b46573914ded57ddbdbd0fdfdeca02dbe772beca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmVP)R=vXa|KZLWj83QE`$^LZRkww0}TLmX=HfmqNPPq2N*whk_Xj$snY8 zUUSLanZyo0AYSg{$NTZzS(MUQb#Y!Ck$rN9RgpuQ&7K0LR35Y_KajzeZ%c~fn35!+ zWS{V~XL+grjmQ&lviz zrUWkmMZZx26Skmst4*RMsB_t&#p8naVLf;aiacwZf@lWrK%dKN2q9Ie-gS@sXFtVU zZG=b%3g1J9BU%VicCWhR%{~4`^iUK-WrPMyS_UwdVrYm{w9DF|VMn%Uf-$7!u&MEb!2y^*cm)hs zP^%%#DetTaV}N~#Mm7VmvRVhLRd%@w21A=K3xrpyc%8_&%Lse(z0s~!6HJZF=<I eF4Jm)Rp}3mY2qUGWh$%y0000 -#include "SALOME_NamingService.hxx" -#include "SALOME_DataTypeCatalog.hh" -#include -#include "utilities.h" -using namespace std; - -int main(int argc,char **argv) -{ - CORBA::ORB_var orb; - CosNaming::NamingContext_var _rootContext; - CORBA::Object_var objVar, objVarN; - try { - - // initialize the ORB - - orb = CORBA::ORB_init (argc, argv); - - - // Get CORBA reference of the catalog - SALOME_NamingService NS(orb); - CORBA::Object_var objVarN = NS.Resolve("/Kernel/DataTypeCatalog"); - - SALOME_DataTypeCatalog::DataCatalog_var Catalogue = SALOME_DataTypeCatalog::DataCatalog::_narrow(objVarN); - MESSAGE("Distant catalog of data type found") - - // Get component list - SALOME_DataTypeCatalog::ListOfDataTypeName_var list_data_type = Catalogue->GetDataTypeList(); - int indice =-1; - for (unsigned int ind = 0; ind < list_data_type->length();ind++) - { - MESSAGE("Data Type list : " << list_data_type[ind]); - } - - - - // obtain interface_read of the first data type defined in the catalog - char* interf; - interf =Catalogue->GetDataInterfaceRead(list_data_type[0]); - MESSAGE("Interface read pour " << list_data_type[0] << " : " << interf); - - - - // obtain interface_read of the last data type defined in the catalog - interf =Catalogue->GetDataInterfaceRead(list_data_type[list_data_type->length() -1]); - MESSAGE("Interface read pour " << list_data_type[list_data_type->length() -1] << " : " << interf); - - // obtain interface_write of the first data type defined in the catalog - interf =Catalogue->GetDataInterfaceWrite(list_data_type[0]); - MESSAGE("Interface write pour " << list_data_type[0] << " : " << interf); - - - - // obtain interface_read of the last data type defined in the catalog - interf =Catalogue->GetDataInterfaceWrite(list_data_type[list_data_type->length() -1]); - MESSAGE("Interface write pour " << list_data_type[list_data_type->length() -1] << " : " << interf); - - //obtain parents name of the last data type defined in the catalog - SALOME_DataTypeCatalog::ListOfDataTypeName_var list_data_type1 = Catalogue->GetDataTypeParents(list_data_type[list_data_type->length() -1]); - - // Test derivation - if (Catalogue->isDerivedFrom(list_data_type[0],list_data_type[list_data_type->length() -1])) - { - MESSAGE("The type " << list_data_type[list_data_type->length() -1] << " derived from " << list_data_type[0] ); - } - else - { - MESSAGE("The type " << list_data_type[list_data_type->length() -1] << " is not derived from " << list_data_type[0]); - } - - } - catch(SALOME_DataTypeCatalog::NotFound &){ - INFOS("SALOME_DataTypeCatalog::NotFound"); - } - catch(CORBA::SystemException&) { - INFOS("Caught CORBA::SystemException.") - } - catch (CosNaming::NamingContext::CannotProceed &) { - INFOS("CosNaming::NamingContext::CannotProceed") - } - catch (CosNaming::NamingContext::NotFound &) { - INFOS("CosNaming::NamingContext::NotFound") - } - catch (CosNaming::NamingContext::InvalidName &) { - INFOS("CosNaming::NamingContext::InvalidName") - } - catch (CosNaming::NamingContext::AlreadyBound &) { - INFOS("CosNaming::NamingContext::AlreadyBound") - } - catch (CosNaming::NamingContext::NotEmpty &) { - INFOS("CosNaming::NamingContext::NotEmpty") - } - - catch(CORBA::Exception &sysEx) { - INFOS("Caught CORBA::Exception.") - } - - - return 0; -} diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx deleted file mode 100644 index 47f8fb92d..000000000 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx +++ /dev/null @@ -1,192 +0,0 @@ -// SALOME DataTypeCatalog : catalog of data types -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_DataTypeCatalog_Handler.cxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#include "SALOME_DataTypeCatalog_Handler.hxx" - -#include "utilities.h" - -using namespace std; - -// contains all the data types defined in the catalog -ListOfParserDataType _datatypelist; - -//---------------------------------------------------------------------- -// Function : SALOME_DataTypeCatalog_Handler -// Purpose : Constructor -//---------------------------------------------------------------------- -SALOME_DataTypeCatalog_Handler::SALOME_DataTypeCatalog_Handler() -{ - MESSAGE("SALOME_DataTypeCatalog_Handler creation"); - // XML Tags initialisation - // Used in the function endElement - test_data_type_name = "DataType-name"; - test_data_type_interf_read = "DataType-interface-read"; - test_data_type_interf_write = "DataType-interface-write"; - test_data_type_parent_name = "Parent-name" ; - test_data_type_parents = "DataType-Parents-list"; - test_data_type = "DataType"; -} - -//---------------------------------------------------------------------- -// Function : ~SALOME_DataTypeCatalog_Handler -// Purpose : Destructor -//---------------------------------------------------------------------- -SALOME_DataTypeCatalog_Handler::~SALOME_DataTypeCatalog_Handler() -{ - MESSAGE("SALOME_DataTypeCatalog_Handler destruction"); -} - -//---------------------------------------------------------------------- -// Function : startDocument -// Purpose : overload handler function -//---------------------------------------------------------------------- -bool SALOME_DataTypeCatalog_Handler::startDocument() -{ - MESSAGE("Begin parse document") - // Empty the private elements - _datatypelist.resize(0); - _a_data_parents_list.resize(0); - return true; -} - -//---------------------------------------------------------------------- -// Function : startElement -// Purpose : overload handler function -//---------------------------------------------------------------------- -bool SALOME_DataTypeCatalog_Handler::startElement(const QString&, - const QString &, - const QString& qName, - const QXmlAttributes& atts) -{ - return true; -} - -//---------------------------------------------------------------------- -// Function : endElement -// Purpose : overload handler function -//---------------------------------------------------------------------- -bool SALOME_DataTypeCatalog_Handler::endElement(const QString&, - const QString &, - const QString& qName) -{ - // DataType - - // tag test_data_type_name - if((qName.compare(QString(test_data_type_name))==0)) - _a_data_type.Parserdata_name = content; - // tag test_data_type_interf_read - if((qName.compare(QString(test_data_type_interf_read))==0)) - _a_data_type.Parserdata_interface_read = content; - // tag test_data_type_interf_write - if((qName.compare(QString(test_data_type_interf_write))==0)) - _a_data_type.Parserdata_interface_write = content; - - // tag test_data_type_parent_name - if((qName.compare(QString(test_data_type_parent_name))==0)) - _a_data_parents_list.push_back(content); - - // tag test_data_type_parents - if((qName.compare(QString(test_data_type_parents))==0)) - { - _a_data_type.Parserdata_parents = _a_data_parents_list; - _a_data_parents_list.resize(0);; - } - - // tag test_data_type - if((qName.compare(QString(test_data_type))==0)) - { - _datatypelist.push_back(_a_data_type); - - // Empty temporary structures - _a_data_type.Parserdata_name = ""; - _a_data_type.Parserdata_interface_read = ""; - _a_data_type.Parserdata_interface_write = ""; - _a_data_type.Parserdata_parents.resize(0); - } - - - - return true; -} - -//---------------------------------------------------------------------- -// Function : characters -// Purpose : overload handler function -//---------------------------------------------------------------------- -bool SALOME_DataTypeCatalog_Handler::characters(const QString& chars) -{ - content = (const char*)chars ; - return true; -} - -//---------------------------------------------------------------------- -// Function : endDocument -// Purpose : overload handler function -// Print all informations find in the catalog -// (only in DEBUG mode!!) -//---------------------------------------------------------------------- -bool SALOME_DataTypeCatalog_Handler::endDocument() -{ - //_datatypelist - for (unsigned int ind = 0; ind < _datatypelist.size(); ind++) - { - MESSAGE("DataType Name :"<<_datatypelist[ind].Parserdata_name); - MESSAGE("DataType interface read :"<<_datatypelist[ind].Parserdata_interface_read); - MESSAGE("DataType interface write :"<<_datatypelist[ind].Parserdata_interface_write); - - for (unsigned int i = 0; i < _datatypelist[ind].Parserdata_parents.size(); i++) - MESSAGE("Parent name :" << _datatypelist[ind].Parserdata_parents[i]); - } - - MESSAGE("Document parsed"); - return true; -} - -//---------------------------------------------------------------------- -// Function : errorProtocol -// Purpose : overload handler function -//---------------------------------------------------------------------- -QString SALOME_DataTypeCatalog_Handler::errorProtocol() -{ - return errorProt ; -} - - -//---------------------------------------------------------------------- -// Function : fatalError -// Purpose : overload handler function -//---------------------------------------------------------------------- -bool SALOME_DataTypeCatalog_Handler::fatalError(const QXmlParseException& exception) -{ - errorProt += QString( "fatal parsing error: %1 in line %2, column %3\n" ) - .arg( exception.message() ) - .arg( exception.lineNumber() ) - .arg( exception.columnNumber() ); - - return QXmlDefaultHandler::fatalError( exception ); -} diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx deleted file mode 100644 index 77b06a5b8..000000000 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx +++ /dev/null @@ -1,134 +0,0 @@ -// SALOME DataTypeCatalog : catalog of data types -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_DataTypeCatalog_Handler.hxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#ifndef SALOME_DATA_CATALOG_HANDLER_H -#define SALOME_DATA_CATALOG_HANDLER_H - -#include "SALOME_DataTypeCatalog_Parser.hxx" -#include -#include -#include - -#if defined DATATYPECATALOG_EXPORTS -#if defined WIN32 -#define DATATYPECATALOG_EXPORT __declspec( dllexport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#else -#if defined WNT -#define DATATYPECATALOG_EXPORT __declspec( dllimport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#endif - -class DATATYPECATALOG_EXPORT SALOME_DataTypeCatalog_Handler : public QXmlDefaultHandler -{ -public: - //! standard constructor - SALOME_DataTypeCatalog_Handler(); - - //! standard destructor - virtual ~SALOME_DataTypeCatalog_Handler(); - - - //! method to overload handler function startDocument - /*! Is called before a xml file is parsed - \return true if no error was detected - */ - virtual bool startDocument(); - - - //! method to overload handler function startElement - /*! - \param Qstring argument by value - \param Qstring argument by value - \param Qstring argument by value - \param QXmlAttributes argument by value - \return true if no error was detected - */ - virtual bool startElement(const QString&, const QString &, - const QString& qName, const QXmlAttributes& atts); - - //! method to overload handler function endElement - /*! - \param Qstring argument by value - \param Qstring argument by value - \param Qstring argument by value - \return true if no error was detected - \sa _Find - */ - virtual bool endElement(const QString&, const QString &, - const QString& qName); - - - //! method to overload handler function characters - /*! - \param Qstring argument by value - \return true if no error was detected - */ - virtual bool characters(const QString& chars); - - //! method to overload handler function endDocument - /*! Is called at the end of the parsing - \return true if no error was detected - */ - virtual bool endDocument(); - - //! method to overload handler function errorProtocol - /*! - \return the error message - */ - virtual QString errorProtocol(); - - //! method to overload handler function fatalError - /*! - \param QXmlParseExecption argument by value - \return true if no error was detected - */ - virtual bool fatalError(const QXmlParseException& exception); - -private: - QString errorProt ; - - std::string content; - - const char* test_data_type_name ; - const char* test_data_type_interf_read ; - const char* test_data_type_interf_write ; - const char* test_data_type_parent_name ; - const char* test_data_type_parents ; - const char* test_data_type; - - ParserDataType _a_data_type; - - ListOfParserDataTypeName _a_data_parents_list ; -}; - -#endif // SALOME_DATA_CATALOG_HANDLER_H diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Parser.hxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Parser.hxx deleted file mode 100644 index fc867bed3..000000000 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Parser.hxx +++ /dev/null @@ -1,51 +0,0 @@ -// SALOME DataTypeCatalog : catalog of data types -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_DataTypeCatalog_Parser.hxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#ifndef SALOME_DATA_CATALOG_PARSER_H -#define SALOME_DATA_CATALOG_PARSER_H - -#include -#include - -// Type Definitions -typedef std::vector ListOfParserDataTypeName; - -struct ParserDataType{ - std::string Parserdata_name ; - std::string Parserdata_interface_read; - std::string Parserdata_interface_write; - ListOfParserDataTypeName Parserdata_parents ; -}; - -typedef std::vector ListOfParserDataType; - -// contains all the data types defined in the catalog -extern ListOfParserDataType _datatypelist; - - -#endif // SALOME_DATA_CATALOG_PARSER_H diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx deleted file mode 100644 index a78e0f80e..000000000 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx +++ /dev/null @@ -1,166 +0,0 @@ -// SALOME DataTypeCatalog : catalog of data types -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_DataTypeCatalog_Server.cxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#include -#include "SALOME_NamingService.hxx" -#include "SALOME_DataTypeCatalog_impl.hxx" -#include "utilities.h" -#include "Utils_SINGLETON.hxx" -using namespace std; - -int main(int argc,char **argv) -{ - // initialize the ORB - CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv); - try - { - CosNaming::NamingContext_var _rootContext, catalogContext; - // initialize POA - // - long TIMESleep = 250000000; - int NumberOfTries = 40; - int a; - timespec ts_req; - ts_req.tv_nsec=TIMESleep; - ts_req.tv_sec=0; - timespec ts_rem; - ts_rem.tv_nsec=0; - ts_rem.tv_sec=0; - CosNaming::NamingContext_var inc; - PortableServer::POA_var poa; - CORBA::Object_var theObj; - CORBA::Object_var obj; - CORBA::Object_var object; - int DATA_TYPE_CATALOG=0; - const char * Env = getenv("USE_LOGGER"); - int EnvL =0; - if ((Env!=NULL) && (strlen(Env))) - EnvL=1; - CosNaming::Name name; - name.length(1); - name[0].id=CORBA::string_dup("Logger"); - PortableServer::POAManager_var mgr; - - for (int i = 1; i<=NumberOfTries; i++) - { - if (i!=1) -#ifndef WNT - a=nanosleep(&ts_req,&ts_rem); -#else - Sleep(TIMESleep/1000000); -#endif - try - { - obj = orb->resolve_initial_references("RootPOA"); - if(!CORBA::is_nil(obj)) - poa = PortableServer::POA::_narrow(obj); - if(!CORBA::is_nil(poa)) - mgr = poa->the_POAManager(); - if(!CORBA::is_nil(orb)) - theObj = orb->resolve_initial_references("NameService"); - if (!CORBA::is_nil(theObj)) - inc = CosNaming::NamingContext::_narrow(theObj);} - catch( CORBA::SystemException& ) - { - MESSAGE( "Data Type Catalog: CORBA::SystemException: Unable to contact the Naming Service" ); - } - if(!CORBA::is_nil(inc)) - { - MESSAGE( "Data Type Catalog: Naming Service was found" ); - if(EnvL==1) - { - CORBA::ORB_var orb1 = CORBA::ORB_init(argc,argv) ; - SALOME_NamingService &NS = *SINGLETON_::Instance() ; - NS.init_orb( orb1 ) ; - for(int j=1; j<=NumberOfTries; j++) - { - if (j!=1) -#ifndef WNT - a=nanosleep(&ts_req, &ts_rem); -#else - Sleep(TIMESleep/1000000); -#endif - try - { - object = inc->resolve(name); - } - catch(CosNaming::NamingContext::NotFound) - { - MESSAGE( "Data Type Catalog: Logger Server wasn't found" ); - } - catch(...) - { - MESSAGE( "Data Type Catalog: Unknown exception" ); - } - if (!CORBA::is_nil(object)) - { - MESSAGE( "Data Type Catalog: Logger Server was found" ); - DATA_TYPE_CATALOG=1; - break; - } - - } - } - } - if ((DATA_TYPE_CATALOG==1)||((EnvL==0)&&(!CORBA::is_nil(inc)))) - break; - } - - // Active catalog - - SALOME_DataTypeCatalogImpl* Catalogue_i = new SALOME_DataTypeCatalogImpl(argc, argv); - poa->activate_object (Catalogue_i); - - mgr->activate(); - - - CORBA::Object_ptr myCata = Catalogue_i->_this(); - - // initialise Naming Service - SALOME_NamingService *_NS; - _NS = new SALOME_NamingService(orb); - // register Catalog in Naming Service - _NS->Register(myCata ,"/Kernel/DataTypeCatalog"); - - MESSAGE("Running DataType Catalog Server.") - - orb->run(); - - poa->destroy(1,1); - - } - catch(CORBA::SystemException&) { - INFOS("Caught CORBA::SystemException.") - } - catch(CORBA::Exception&) { - INFOS("Caught CORBA::Exception.") - } - - // delete myThreadTrace; - return 0; -} diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx deleted file mode 100644 index 13f3584f2..000000000 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx +++ /dev/null @@ -1,382 +0,0 @@ -// SALOME DataTypeCatalog : catalog of data types -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_DataTypeCatalog_impl.cxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#include "SALOME_DataTypeCatalog_impl.hxx" -#include "Utils_ExceptHandlers.hxx" -#include -using namespace std; - -UNEXPECT_CATCH(DTC_NotFound, SALOME_DataTypeCatalog::NotFound); - -//---------------------------------------------------------------------- -// Function : SALOME_DataTypeCatalogImpl -// Purpose : Constructor -//---------------------------------------------------------------------- -SALOME_DataTypeCatalogImpl::SALOME_DataTypeCatalogImpl(int argc, char** argv) -{ - MESSAGE("DataType Catalog creation"); - - // Empty used variables - _datatype_list.resize(0); - - // Parse the arguments given at server run - if (!_parseArguments(argc, argv,&_path_datatype)) - MESSAGE( "Error while argument parsing" ) - - // Test existency of files - if (_path_datatype == NULL) - MESSAGE( "Error the data type catalog should be indicated" ) - else - { - MESSAGE("Parse data type catalog"); - // Affect the variable _datatype_list - _parse_xml_file(_path_datatype,_datatype_list); - - // Verification of _datatype_list content - if(!_verify_data_type(_datatype_list)) - MESSAGE( "Error while parsing the data type list" ) - else MESSAGE("Data Type list OK"); - } -} - -//---------------------------------------------------------------------- -// Function : ~SALOME_DataTypeCatalogImpl -// Purpose : Destructor -//---------------------------------------------------------------------- -SALOME_DataTypeCatalogImpl::~SALOME_DataTypeCatalogImpl() -{ - MESSAGE("DataType Catalog Destruction"); -} - - -//---------------------------------------------------------------------- -// Function : GetDataTypeList -// Purpose : get a data type name list -//---------------------------------------------------------------------- -SALOME_DataTypeCatalog::ListOfDataTypeName* -SALOME_DataTypeCatalogImpl::GetDataTypeList() -{ - MESSAGE("Begin of GetDataTypeList"); - SALOME_DataTypeCatalog::ListOfDataTypeName_var _list_data = - new SALOME_DataTypeCatalog::ListOfDataTypeName; - - _list_data->length(_datatype_list.size()); - - // Duplicate each data type name defined in the catalog - for (unsigned int ind=0; ind < _datatype_list.size();ind++) - { - _list_data[ind]=CORBA::string_dup(_datatype_list[ind].Parserdata_name.c_str()); - // SCRUTE(_list_data[ind]) ; - } - - return _list_data._retn(); -} - -//---------------------------------------------------------------------- -// Function : isDerivedFrom -// Purpose : return true if type_out is derived from type_in -//---------------------------------------------------------------------- -CORBA::Boolean -SALOME_DataTypeCatalogImpl::isDerivedFrom(const char* type_in, - const char* type_out) - throw(SALOME_DataTypeCatalog::NotFound) -{ - Unexpect aCatch(DTC_NotFound); - CORBA::Boolean _return_value = false ; - bool _found_in = false; - bool _found_out = false; - for (unsigned int ind=0; ind < _datatype_list.size();ind++) - { - if (strcmp((_datatype_list[ind].Parserdata_name).c_str(),type_out) == 0) - { - //type_out found - _found_out = true; - // Looking if type_in is indicated in the parents list - _return_value = _explore_parents(type_in,_datatype_list[ind]); - } - if (strcmp((_datatype_list[ind].Parserdata_name).c_str(),type_in) == 0) - _found_in = true; - } - - if(!_found_in) - { - MESSAGE("The data type " << type_in << " was not found in the data type catalog") - throw SALOME_DataTypeCatalog::NotFound() ; - } - if(!_found_out) - { - MESSAGE( "The data type " << type_out << " was not found in the data type catalog") - throw SALOME_DataTypeCatalog::NotFound() ; - } - - return _return_value; - -} - -//---------------------------------------------------------------------- -// Function : GetDataInterfaceRead -// Purpose : get the read interface name -//---------------------------------------------------------------------- -char* -SALOME_DataTypeCatalogImpl::GetDataInterfaceRead(const char* type) - throw(SALOME_DataTypeCatalog::NotFound) -{ - Unexpect aCatch(DTC_NotFound); - char* return_value = NULL; - bool _find = false; - for (unsigned int ind=0; ind < _datatype_list.size();ind++) - { - if (strcmp((_datatype_list[ind].Parserdata_name).c_str(),type) == 0) - { - _find = true; - return_value = CORBA::string_dup(_datatype_list[ind].Parserdata_interface_read.c_str()); - } - } - - // NotFound Exceptin is thrown if the data type indicated is not found in the catalog - if(!_find) - { - MESSAGE( "The data type " << type << " was not found in the data type catalog") - throw SALOME_DataTypeCatalog::NotFound() ; - } - - return return_value; -} - -//---------------------------------------------------------------------- -// Function : GetDataInterfaceWrite -// Purpose : get the write interface name -//---------------------------------------------------------------------- -char* -SALOME_DataTypeCatalogImpl::GetDataInterfaceWrite(const char* type) - throw(SALOME_DataTypeCatalog::NotFound) -{ - Unexpect aCatch(DTC_NotFound); - char* return_value = NULL; - bool _find = false; - for (unsigned int ind=0; ind < _datatype_list.size();ind++) - { - if (strcmp((_datatype_list[ind].Parserdata_name).c_str(),type) == 0) - { - _find = true; - return_value = CORBA::string_dup(_datatype_list[ind].Parserdata_interface_write.c_str()); - } - } - - // NotFound Exceptin is thrown if the data type indicated is not found in the catalog - if(!_find) - { - MESSAGE( "The data type " << type << " was not found in the data type catalog") - throw SALOME_DataTypeCatalog::NotFound() ; - } - return return_value; -} - -//---------------------------------------------------------------------- -// Function : GetDataTypeParents -// Purpose : get Parents data type name list -//---------------------------------------------------------------------- -SALOME_DataTypeCatalog::ListOfDataTypeName* -SALOME_DataTypeCatalogImpl::GetDataTypeParents(const char* type) throw(SALOME_DataTypeCatalog::NotFound) -{ - Unexpect aCatch(DTC_NotFound); - - bool _find = false ; - - SALOME_DataTypeCatalog::ListOfDataTypeName_var _list_data = - new SALOME_DataTypeCatalog::ListOfDataTypeName; - - for (unsigned int ind=0; ind < _datatype_list.size();ind++) - { - if (strcmp((_datatype_list[ind].Parserdata_name).c_str(),type) == 0) - { - // Wanted type is found - // Get all the parents data type name of the type - _find = true; - _list_data->length(_datatype_list[ind].Parserdata_parents.size()); - for (unsigned int ind1=0; ind1 < _datatype_list[ind].Parserdata_parents.size();ind1++) - { - _list_data[ind1]=CORBA::string_dup(_datatype_list[ind].Parserdata_parents[ind1].c_str()); - // SCRUTE(_list_data[ind1]) ; - } - } - } - - // NotFound Exception is thrown if the data type indicated is not found - // in the catalog - if(!_find) - { - MESSAGE( "The data type " << type << " was not found in the data type catalog") - throw SALOME_DataTypeCatalog::NotFound() ; - } - - return _list_data._retn(); -} - -//---------------------------------------------------------------------- -// Function : _explore_parents -// Purpose : return true if type_out is derived from type_in -//---------------------------------------------------------------------- -CORBA::Boolean -SALOME_DataTypeCatalogImpl::_explore_parents(const char* type_in, - ParserDataType& data_out) -{ - - MESSAGE( "Begin of _explore_parents with data_out_name " << data_out.Parserdata_name); - - CORBA::Boolean found = false ; - if (data_out.Parserdata_name == type_in) - found = true ; - else - if (data_out.Parserdata_parents.size() >0) - for (unsigned int ind=0; ind < data_out.Parserdata_parents.size();ind++) - { - if (data_out.Parserdata_parents[ind] == type_in) - found = true ; - else - for (unsigned ip =0; ip < _datatype_list.size();ip++) - { - // run _explore_parents for each parent data of data_out - if (_datatype_list[ip].Parserdata_name == data_out.Parserdata_parents[ind]) - found = _explore_parents(type_in, _datatype_list[ip]); - } - } - return found ; -} - -//---------------------------------------------------------------------- -// Function : _parse_xml_file -// Purpose : parse one module catalog -//---------------------------------------------------------------------- -void -SALOME_DataTypeCatalogImpl::_parse_xml_file(const char* file, - ListOfParserDataType& datatypelist) -{ - SALOME_DataTypeCatalog_Handler* handler = new SALOME_DataTypeCatalog_Handler(); - QFile xmlFile(file); - - QXmlInputSource source(xmlFile); - - QXmlSimpleReader reader; - reader.setContentHandler( handler ); - reader.setErrorHandler( handler ); - reader.parse( source ); - xmlFile.close(); - datatypelist = _datatypelist; -} - - -//---------------------------------------------------------------------- -// Function : _verify_data_type -// Purpose : verify the data type structures from the catalog parsing -// Verify that the parents type associated to a type are defined -// in the catalog -//---------------------------------------------------------------------- -bool -SALOME_DataTypeCatalogImpl::_verify_data_type(ListOfParserDataType datatypelist) -{ - bool _return_value = true; - bool _bool = false ; - vector _data_name_list; - - _data_name_list.resize(0);; - for (unsigned int ind = 0; ind < _datatype_list.size(); ind++) - _data_name_list.push_back(_datatype_list[ind].Parserdata_name) ; - - // Parse if parents data type name of a data type are defined in the - // datatype catalog -#ifndef WNT - for (unsigned int ind = 0; ind < _datatype_list.size(); ind++) -#else - for (ind = 0; ind < _datatype_list.size(); ind++) -#endif - { - // Scrute data type parents - // MESSAGE("Treatment of " << _datatype_list[ind].Parserdata_name); - for (unsigned int ind1 = 0 ; ind1 < _datatype_list[ind].Parserdata_parents.size(); ind1++) - { - // MESSAGE("Looking for " << _datatype_list[ind].Parserdata_parents[ind1] << " in the catalog data type"); - _bool = false; - // Compare parent data type name to all data type names defined in the catalog - for (unsigned int ind2 = 0 ; ind2 < _data_name_list.size(); ind2++) - { - if(_datatype_list[ind].Parserdata_parents[ind1].compare(_data_name_list[ind2]) == 0) - { - // Type found : OK - MESSAGE("The parents data type " << _datatype_list[ind].Parserdata_parents[ind1] << " of " << _datatype_list[ind].Parserdata_name << " was found in the catalog type"); - _bool = true; - } - } - if(!_bool) - { - MESSAGE( "The parents data type " << _datatype_list[ind].Parserdata_parents[ind1] << " of " << _datatype_list[ind].Parserdata_name << " is not defined in the data type catalog" ) - _return_value = false ; - } - } - } - return _return_value; -} - - -//---------------------------------------------------------------------- -// Function : _parseArguments -// Purpose : parse arguments to get general and personal catalog files -//---------------------------------------------------------------------- -bool -SALOME_DataTypeCatalogImpl::_parseArguments(int argc, char **argv, - char **_path_data) -{ - bool _return_value = true; - *_path_data = NULL; - for (int ind = 0; ind < argc ; ind++) - { - - if (strcmp(argv[ind],"-help") == 0) - { - MESSAGE( "Usage: " << argv[0] << " -common 'path to data type catalog' -ORBInitRef NameService=corbaname::localhost"); - _return_value = false ; - } - if (strcmp(argv[ind],"-common") == 0) - { - if (ind + 1 <= argc) - { - // General catalog file - *_path_data = argv[ind + 1] ; - ifstream _path_data_file(*_path_data); - if (!_path_data_file) - { - MESSAGE( "Sorry the file " << *_path_data << " can't be open" ) - *_path_data = NULL; - _return_value = false; - } - } - } - - } - return _return_value; -} diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx deleted file mode 100644 index 6b662f6b2..000000000 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx +++ /dev/null @@ -1,145 +0,0 @@ -// SALOME DataTypeCatalog : catalog of data types -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_DataTypeCatalog_impl.hxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#ifndef DATATYPECATALOG_IMPL_H -#define DATATYPECATALOG_IMPL_H - -#include "utilities.h" -#include "SALOME_DataTypeCatalog_Handler.hxx" -#include -#include CORBA_SERVER_HEADER(SALOME_DataTypeCatalog) - -#if defined DATATYPECATALOG_EXPORTS -#if defined WIN32 -#define DATATYPECATALOG_EXPORT __declspec( dllexport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#else -#if defined WNT -#define DATATYPECATALOG_EXPORT __declspec( dllimport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#endif - -class DATATYPECATALOG_EXPORT SALOME_DataTypeCatalogImpl: public POA_SALOME_DataTypeCatalog::DataCatalog, - public PortableServer::RefCountServantBase -{ -public: - //! standard constructor - SALOME_DataTypeCatalogImpl(int argc, char** argv); - - //! standard destructor - virtual ~SALOME_DataTypeCatalogImpl(); - - //! method to get a data type list - /*! - \return a data type list - */ - virtual SALOME_DataTypeCatalog::ListOfDataTypeName* GetDataTypeList(); - - //! method to know if type_out is derived from type_in - /*! - \param type_in const char* arguments - \param type_out const char* arguments - \return a boolean (true if type_out is derived from type_in) - */ - virtual CORBA::Boolean isDerivedFrom(const char* type_in, const char* type_out) throw(SALOME_DataTypeCatalog::NotFound); - - //! method to get the name of the interface to acces the data in read mode - /*! - \param type const char* arguments - \return the read interface name - */ - virtual char* GetDataInterfaceRead(const char* type) throw(SALOME_DataTypeCatalog::NotFound); - - - //! method to get the name of the interface to acces the data in write mode - /*! - \param type const char* arguments - \return the write interface name - */ - virtual char* GetDataInterfaceWrite(const char* type) throw(SALOME_DataTypeCatalog::NotFound); - - //! method to get parents data type list - /*! - \param type const char* arguments - \return a data type list - */ - virtual SALOME_DataTypeCatalog::ListOfDataTypeName* - GetDataTypeParents(const char* type) throw(SALOME_DataTypeCatalog::NotFound); - - -private: - //! method to know if parents type of data_out derived from type_in - /*! - \param type_in const char* arguments - \param data_out const ParserDataType arguments (by value) - \return a boolean (true if type_out is derived from type_in) - */ - virtual CORBA::Boolean _explore_parents(const char* type_in, - ParserDataType& data_out); - - - //! method to parse the data type catalog - /*! - \param file const char* arguments - \param datatypelist ListOfParserDataType arguments - */ - virtual void _parse_xml_file(const char* file, - ListOfParserDataType& datatypelist); - - - //! method to verify data type content - /*! - \param datatypelist ListOfParserDataType arguments - \return true if verfication is OK - */ - virtual bool _verify_data_type(ListOfParserDataType datatypelist); - - - //! method to parse arguments to get general and personal catalog files - /*! - \param argc int arguments - \param argv char** arguments - \param _path_data char** arguments - \return true if parsing is OK - */ - virtual bool _parseArguments(int argc, char **argv, char **_path_data); - - - // will contain the path to the data type catalog - char* _path_datatype; - - - //will contain the informations on the data type catalog(after parsing) - ListOfParserDataType _datatype_list ; -}; - -#endif // DATATYPECATALOG_IMPL_H diff --git a/src/RessourcesCatalog/Makefile.am b/src/RessourcesCatalog/Makefile.am deleted file mode 100644 index 24f917812..000000000 --- a/src/RessourcesCatalog/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -# SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -# -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -# -# -# File : Makefile.am -# Author : Guillaume Boulant (CSSI) -# Module : SALOME -# $Header$ - - -include $(top_srcdir)/salome_adm/unix/make_common_starter.am - -# -# =============================================================== -# Header to be installed -# =============================================================== -# -# header files -salomeinclude_HEADERS = \ - SALOME_RessourcesCatalog_impl.hxx \ - SALOME_RessourcesCatalog_Parser.hxx \ - SALOME_RessourcesCatalog_Handler.hxx - - -# -# =============================================================== -# Local definitions -# =============================================================== -# - -# This local variable defines the list of CPPFLAGS common to all target in this package. -COMMON_CPPFLAGS=\ - -I$(srcdir)/../Basics \ - -I$(srcdir)/../SALOMELocalTrace \ - -I$(srcdir)/../NamingService \ - -I$(srcdir)/../Utils \ - -I$(top_builddir)/salome_adm/unix \ - -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ - -# This local variable defines the list of dependant libraries common to all target in this package. -COMMON_LIBS =\ - ../NamingService/libSalomeNS.la \ - ../Utils/libOpUtil.la \ - ../SALOMELocalTrace/libSALOMELocalTrace.la \ - ../Basics/libSALOMEBasics.la \ - $(top_builddir)/idl/libSalomeIDLKernel.la - -# -# =============================================================== -# Libraries targets -# =============================================================== -# - -lib_LTLIBRARIES = libSalomeRessourcesCatalog.la -libSalomeRessourcesCatalog_la_SOURCES=\ - SALOME_RessourcesCatalog_Handler.cxx \ - SALOME_RessourcesCatalog_impl.cxx - -libSalomeRessourcesCatalog_la_CPPFLAGS =\ - $(COMMON_CPPFLAGS) \ - @QT_MT_INCLUDES@ - -libSalomeRessourcesCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeRessourcesCatalog_la_LIBADD =\ - $(COMMON_LIBS) \ - @QT_MT_LIBS@ - -# -# =============================================================== -# Executables targets -# =============================================================== -# -bin_PROGRAMS = SALOME_RessourcesCatalog_Server SALOME_RessourcesCatalog_Client - -#SALOME_RessourcesCatalog_Server -SALOME_RessourcesCatalog_Server_SOURCES = SALOME_RessourcesCatalog_Server.cxx -SALOME_RessourcesCatalog_Server_CPPFLAGS =\ - $(COMMON_CPPFLAGS) \ - @QT_MT_INCLUDES@ - -SALOME_RessourcesCatalog_Server_LDADD =\ - libSalomeRessourcesCatalog.la \ - $(COMMON_LIBS) \ - @CORBA_LIBS@ - -#SALOME_RessourcesCatalog_Client -SALOME_RessourcesCatalog_Client_SOURCES = SALOME_RessourcesCatalog_Client.cxx -SALOME_RessourcesCatalog_Client_CPPFLAGS =\ - $(COMMON_CPPFLAGS) \ - @QT_MT_INCLUDES@ - -SALOME_RessourcesCatalog_Client_LDADD =\ - libSalomeRessourcesCatalog.la \ - $(COMMON_LIBS) \ - @CORBA_LIBS@ - diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx deleted file mode 100644 index 9fef8478b..000000000 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx +++ /dev/null @@ -1,124 +0,0 @@ -// SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_RessourcesCatalog_Client.cxx -// Module : SALOME - -/* $Header$ */ - -#include -#include "SALOME_NamingService.hxx" -#include -#ifndef WNT -#include CORBA_SERVER_HEADER(SALOME_RessourcesCatalog) -#else -#include -#endif -#include -#include "utilities.h" -using namespace std; - -int main(int argc,char **argv) -{ - CORBA::ORB_var orb; - CosNaming::NamingContext_var _rootContext; - CORBA::Object_var objVar, objVarN; - try { - - // initialize the ORB - - orb = CORBA::ORB_init (argc, argv); - - - // Get CORBA reference of the catalog - SALOME_NamingService NS(orb); - CORBA::Object_var objVarN = NS.Resolve("/Kernel/RessourcesCatalog"); - - SALOME_RessourcesCatalog::RessourcesCatalog_var Catalogue = SALOME_RessourcesCatalog::RessourcesCatalog::_narrow(objVarN); - MESSAGE("Ressources distant catalog found"); - - //Get Computer list information - SALOME_RessourcesCatalog::ListOfComputer_var _list = Catalogue->GetComputerList(); - for (unsigned int ind = 0; ind < _list->length();ind++) - { - MESSAGE("Ressources list : " << _list[ind]); - } - - //Get container type list of computer eri - SALOME_RessourcesCatalog::ListOfContainerType_var list = Catalogue->GetContainerTypeList("eri"); -#ifndef WNT - for (unsigned int ind = 0; ind < list->length();ind++) -#else - for (ind = 0; ind < list->length();ind++) -#endif - { - MESSAGE("Container type list of eri : " << list[ind]); - } - - // Get processors information of eri - SALOME_RessourcesCatalog::computer_info_var computer = Catalogue->GetComputerInfo("eri"); - MESSAGE("Ressource name : " << computer->name); - MESSAGE("Ressource OS : " << computer->OS); - MESSAGE("Ressource OS version : " << computer->OS_version); -#ifndef WNT - for (unsigned int ind = 0; ind < computer->procs.length();ind++) -#else - for (ind = 0; ind < computer->procs.length();ind++) -#endif - { - MESSAGE("Processor number : " << computer->procs[ind].number); - MESSAGE("Processor model name : " << computer->procs[ind].model_name); - MESSAGE("Processor cpu : " << computer->procs[ind].cpu_mhz); - MESSAGE("Processor cache : " << computer->procs[ind].cache_size); - } - - } - catch(SALOME_RessourcesCatalog::NotFound &){ - INFOS("SALOME_RessourcesCatalog::NotFound"); - } - catch(CORBA::SystemException&) { - INFOS("Caught CORBA::SystemException.") - } - catch (CosNaming::NamingContext::CannotProceed &) { - INFOS("CosNaming::NamingContext::CannotProceed") - } - catch (CosNaming::NamingContext::NotFound &) { - INFOS("CosNaming::NamingContext::NotFound") - } - catch (CosNaming::NamingContext::InvalidName &) { - INFOS("CosNaming::NamingContext::InvalidName") - } - catch (CosNaming::NamingContext::AlreadyBound &) { - INFOS("CosNaming::NamingContext::AlreadyBound") - } - catch (CosNaming::NamingContext::NotEmpty &) { - INFOS("CosNaming::NamingContext::NotEmpty") - } - - catch(CORBA::Exception &sysEx) { - INFOS("Caught CORBA::Exception.") - } - - - return 0; -} diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx deleted file mode 100755 index 565170301..000000000 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.cxx +++ /dev/null @@ -1,264 +0,0 @@ -// SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_RessourcesCatalog_Handler.cxx -// Author : Estelle Deville -// Module : SALOME -//$Header$ - -#include "SALOME_RessourcesCatalog_Handler.hxx" - -#include "utilities.h" - -using namespace std; - -ListOfParserressources _ressources_list; - -//---------------------------------------------------------------------- -//Function : SALOME_RessourcesCatalog_Handler -//Purpose: Constructor -//---------------------------------------------------------------------- -SALOME_RessourcesCatalog_Handler::SALOME_RessourcesCatalog_Handler() -{ - MESSAGE("SALOME_RessourcesCatalog_Handler creation"); - //XML tags initialisation - test_computer = "computer"; - test_computer_name="name"; - test_computer_OS="OS"; - test_computer_OS_version = "OS-version"; - test_proc = "proc"; - test_proc_number ="number" ; - test_proc_model= "model" ; - test_proc_cpu= "CPU-MHz" ; - test_proc_cache = "cache" ; - test_proc_list = "proc-list" ; - test_container_type = "containertype" ; - test_container_type_list = "containertype-list" ; -} - -//---------------------------------------------------------------------- -//Function : ~SALOME_RessourcesCatalog_Handler -//Purpose: Destructor -//---------------------------------------------------------------------- -SALOME_RessourcesCatalog_Handler::~SALOME_RessourcesCatalog_Handler() -{ - MESSAGE("SALOME_RessourcesCatalog_Handler destruction"); -} - -//---------------------------------------------------------------------- -//Function : startDocument -//Purpose: overload handler function -//---------------------------------------------------------------------- -bool -SALOME_RessourcesCatalog_Handler::startDocument() -{ - MESSAGE("Begin parse document"); - // Empty private elements - _procs_list.resize(0); - _ressources_list.resize(0); - _container_list.resize(0); - return true; -} - -//---------------------------------------------------------------------- -//Function : startElement -//Purpose: overload handler function -//---------------------------------------------------------------------- -bool -SALOME_RessourcesCatalog_Handler::startElement(const QString&, - const QString&, - const QString& qName, - const QXmlAttributes& atts) -{ - return true; -} - -//---------------------------------------------------------------------- -//Function : endElement -//Purpose: overload handler function -//---------------------------------------------------------------------- -bool -SALOME_RessourcesCatalog_Handler::endElement(const QString&, const QString&, - const QString& qName) -{ - // Ressources - - // tag test_computer_name - if((qName.compare(QString(test_computer_name))==0)) - _a_ressource.Parsername = content; - - // tag test_computer_OS - if((qName.compare(QString(test_computer_OS))==0)) - _a_ressource.ParserOS = content; - - // tag test_computer_OS_version - if((qName.compare(QString(test_computer_OS_version))==0)) - _a_ressource.ParserOS_version = content; - - //tag test_proc_number - if((qName.compare(QString(test_proc_number))==0)) - _a_proc.Parsernumber = atol(content.c_str()); - - //tag test_proc_model - if((qName.compare(QString(test_proc_model))==0)) - _a_proc.Parsermodel_name = content; - - //tag test_proc_cpu - if((qName.compare(QString(test_proc_cpu))==0)) - _a_proc.Parsercpu_mhz = atof(content.c_str()); - - //tag test_proc_cache - if((qName.compare(QString(test_proc_cache))==0)) - _a_proc.Parsercache_size = atof(content.c_str()); - - //tag test_proc - if((qName.compare(QString(test_proc))==0)) - { - _procs_list.push_back(_a_proc); - - // Empty temporary structures - _a_proc.Parsernumber = 0; - _a_proc.Parsermodel_name = ""; - _a_proc.Parsercpu_mhz = 0; - _a_proc.Parsercache_size = 0; - } - - //tag test_proc_list - if((qName.compare(QString(test_proc_list))==0)) - { - _a_ressource.Parserprocs = _procs_list; - - // Empty temporary structures - _procs_list.resize(0); - } - - //tag test_container_type - if((qName.compare(QString(test_container_type))==0)) - { - // We just have to compare the first character of content - // If C => Cpp - // If p => python - // If N => NP - switch(content[0]) { - case 'C': - _container_list.push_back(Cpp) ; - break; - case 'p': - _container_list.push_back(python) ; - break; - case 'N': - _container_list.push_back(NP) ; - break; - - default: - // If it'not in all theses cases, the type is affected to Cpp - _container_list.push_back(Cpp) ; - break; - } - } - - //tag test container_type_list - if((qName.compare(QString(test_container_type_list))==0)) - { - _a_ressource.Parsercontainertype = _container_list; - - // Empty temporary structures - _container_list.resize(0); - } - - // tag test_computer - if((qName.compare(QString(test_computer))==0)) - { - _ressources_list.push_back(_a_ressource); - - // Empty temporary structures - _a_ressource.Parsername = ""; - _a_ressource.ParserOS=""; - _a_ressource.ParserOS_version=""; - _a_ressource.Parserprocs.resize(0); - _a_ressource.Parsercontainertype.resize(0); - } - - return true; -} - -//---------------------------------------------------------------------- -//Function : characters -//Purpose: overload handler function -//---------------------------------------------------------------------- -bool SALOME_RessourcesCatalog_Handler::characters(const QString& chars) -{ - content = (const char *)chars ; - return true; -} - -//---------------------------------------------------------------------- -//Function : endDocument -//Purpose: overload handler function -//---------------------------------------------------------------------- -bool SALOME_RessourcesCatalog_Handler::endDocument() -{ - //_ressources_list - for (unsigned int ind = 0; ind < _ressources_list.size(); ind++) - { - MESSAGE("Ressources name :"<<_ressources_list[ind].Parsername); - MESSAGE("OS :"<<_ressources_list[ind].ParserOS); - MESSAGE("OS version :"<<_ressources_list[ind].ParserOS_version); - for (unsigned int i = 0; i < _ressources_list[ind].Parserprocs.size(); i++) - { - MESSAGE("Proc number :" << _ressources_list[ind].Parserprocs[i].Parsernumber); - MESSAGE("Model name :" << _ressources_list[ind].Parserprocs[i].Parsermodel_name); - MESSAGE("CPU(MHz) :" << _ressources_list[ind].Parserprocs[i].Parsercpu_mhz); - MESSAGE("Cache :" << _ressources_list[ind].Parserprocs[i].Parsercache_size); - } - for (unsigned int j = 0; j < _ressources_list[ind].Parsercontainertype.size(); j++) - MESSAGE("Container Type :" << _ressources_list[ind].Parsercontainertype[j]); - } - - return true; -} - -//---------------------------------------------------------------------- -//Function : errorProtocol -//Purpose: overload handler function -//---------------------------------------------------------------------- -QString SALOME_RessourcesCatalog_Handler::errorProtocol() -{ - return errorProt; -} - -//---------------------------------------------------------------------- -//Function : fatalError -//Purpose: overload handler function -//---------------------------------------------------------------------- -bool -SALOME_RessourcesCatalog_Handler::fatalError(const QXmlParseException& exception) -{ - errorProt += QString( "fatal parsing error: %1 in line %2, column %3\n" ) - .arg( exception.message() ) - .arg( exception.lineNumber() ) - .arg( exception.columnNumber() ); - - return QXmlDefaultHandler::fatalError( exception ); -} - diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.hxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.hxx deleted file mode 100755 index 79e785560..000000000 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.hxx +++ /dev/null @@ -1,141 +0,0 @@ -// SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_RessourcesCatalog_Handler.hxx -// Author : Estelle Deville -// Module : SALOME -//$Header$ - -#ifndef SALOME_RESSOURCES_CATALOG_HANDLER -#define SALOME_RESSOURCES_CATALOG_HANDLER - -#include "SALOME_RessourcesCatalog_Parser.hxx" - -#include -#include -#include - -#if defined RESSOURCESCatalog_EXPORTS -#if defined WIN32 -#define RESSOURCESCatalog_EXPORT __declspec( dllexport ) -#else -#define RESSOURCESCatalog_EXPORT -#endif -#else -#if defined WNT -#define RESSOURCESCatalog_EXPORT __declspec( dllimport ) -#else -#define RESSOURCESCatalog_EXPORT -#endif -#endif - -class RESSOURCESCatalog_EXPORT SALOME_RessourcesCatalog_Handler : public QXmlDefaultHandler -{ -public : - //! standard constructor - SALOME_RessourcesCatalog_Handler(); - - //! standard destructor - virtual ~SALOME_RessourcesCatalog_Handler(); - - //! method to overload handler function startDocument - /*! is called before a xml file is parsed - \return true if no error was detected - */ - virtual bool startDocument(); - - //! method to overload handler function startElement - /*! - \param QString argument by value - \param QString argument by value - \param QString qName argument by value - \param QXmlAttributes atts argument by value - \return true if no error was detected - */ - virtual bool startElement(const QString& , const QString& , - const QString& qName, const QXmlAttributes& atts); - - //! method to overload handler function endElement - /*! - \param QString argument by value - \param QString argument by value - \param QString qName argument by value - \return true if no error was detected - */ - virtual bool endElement(const QString&, const QString&, - const QString& qName); - - //! method to overload handler function characters - /*! - \param QString chars argument by value - \return true if no error was detected - */ - virtual bool characters(const QString& chars); - - //! method to overload handler function endDocument - /*! is called at the end of the parsing - \return true if no error was detected - */ - virtual bool endDocument(); - - //! method to overload handler function errorProtocol - /*! - \return the error message - */ - virtual QString errorProtocol(); - -//! method to overload handler function fatalError - /*! - \param QXmlParseException exception argument by value - \return true if no error was detected - */ - virtual bool fatalError(const QXmlParseException& exception); - - -private : - QString errorProt; - - std::string content; - - const char* test_computer; - const char* test_computer_name; - const char* test_computer_OS; - const char* test_computer_OS_version; - const char* test_proc; - const char* test_proc_number; - const char* test_proc_model; - const char* test_proc_cpu; - const char* test_proc_cache; - const char* test_proc_list; - const char* test_container_type; - const char* test_container_type_list; - - Parserressources _a_ressource; - - ListOfParserProc _procs_list; - ParserProc _a_proc; - ListOfParserContainerType _container_list; - -}; - -#endif // SALOME_RESSOURCES_CATALOG_HANDLER diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Parser.hxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Parser.hxx deleted file mode 100755 index 107f5ee41..000000000 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Parser.hxx +++ /dev/null @@ -1,60 +0,0 @@ -// SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_RessourcesCatalog_Parser.hxx -// Author : Estelle Deville -// Module : SALOME -//$Header$ - -#ifndef SALOME_RESSOURCES_CATALOG_PARSER -#define SALOME_RESSOURCES_CATALOG_PARSER - -#include -#include - -struct ParserProc{ - long Parsernumber; - std::string Parsermodel_name; - float Parsercpu_mhz; - float Parsercache_size; -}; - -typedef std::vector ListOfParserProc; - -enum Parsercontainertype {Cpp, python, NP}; -typedef std::vector ListOfParserContainerType; - -struct Parserressources{ - std::string Parsername; - std::string ParserOS; - std::string ParserOS_version; - ListOfParserProc Parserprocs; - ListOfParserContainerType Parsercontainertype; -}; - -typedef std::vector ListOfParserressources; - -extern ListOfParserressources _ressources_list; - - -#endif //SALOME_RESSOURCES_CATALOG_PARSER diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx deleted file mode 100644 index 8ea3a1a22..000000000 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx +++ /dev/null @@ -1,160 +0,0 @@ -// SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_RessourcesCatalog_Server.cxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#include -#include "SALOME_NamingService.hxx" -#include "SALOME_RessourcesCatalog_impl.hxx" -#include "utilities.h" -#include "Utils_SINGLETON.hxx" -using namespace std; - -int main(int argc,char **argv) -{ - // initialize the ORB - CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv); - try - { - CosNaming::NamingContext_var _rootContext, catalogContext; - - // initialize POA - // - long TIMESleep = 250000000; - int NumberOfTries = 40; - int a; - timespec ts_req; - ts_req.tv_nsec=TIMESleep; - ts_req.tv_sec=0; - timespec ts_rem; - ts_rem.tv_nsec=0; - ts_rem.tv_sec=0; - CosNaming::NamingContext_var inc; - PortableServer::POA_var poa; - CORBA::Object_var theObj; - CORBA::Object_var obj; - CORBA::Object_var object; - SALOME_NamingService &naming = *SINGLETON_::Instance() ; - int RESSOURCES_CATALOG=0; - const char * Env = getenv("USE_LOGGER"); - int EnvL =0; - if ((Env!=NULL) && (strlen(Env))) - EnvL=1; - CosNaming::Name name; - name.length(1); - name[0].id=CORBA::string_dup("Logger"); - PortableServer::POAManager_var mgr; - for (int i = 1; i<=NumberOfTries; i++) - { - if (i!=1) -#ifndef WNT - a=nanosleep(&ts_req,&ts_rem); -#else - Sleep(TIMESleep/1000000); -#endif - try - { - obj = orb->resolve_initial_references("RootPOA"); - if(!CORBA::is_nil(obj)) - poa = PortableServer::POA::_narrow(obj); - if(!CORBA::is_nil(poa)) - mgr = poa->the_POAManager(); - if(!CORBA::is_nil(orb)) - theObj = orb->resolve_initial_references("NameService"); - if (!CORBA::is_nil(theObj)) - inc = CosNaming::NamingContext::_narrow(theObj); - } - catch( CORBA::SystemException& ) - { - INFOS( "Ressources Catalog: CORBA::SystemException: Unable to contact the Naming Service" ); - } - if(!CORBA::is_nil(inc)) - { - MESSAGE( "Ressources Catalog: Naming Service was found" ); - if(EnvL==1) - { - for(int j=1; j<=NumberOfTries; j++) - { - if (j!=1) -#ifndef WNT - a=nanosleep(&ts_req, &ts_rem); -#else - Sleep(TIMESleep/1000000); -#endif - try{ - object = inc->resolve(name); - } - catch(CosNaming::NamingContext::NotFound) - { - INFOS( "Ressources Catalog: Logger Server wasn't found" ); - } - catch(...) - { - INFOS( "Ressources Catalog: Unknown exception" ); - } - if (!CORBA::is_nil(object)) - { - MESSAGE( "Ressources Catalog: Loger Server was found" ); - RESSOURCES_CATALOG=1; - break; - } - } - } - } - if ((RESSOURCES_CATALOG==1)||((EnvL==0)&&(!CORBA::is_nil(inc)))) - break; - } - - // Active catalog - - SALOME_RessourcesCatalogImpl* Catalogue_i = new SALOME_RessourcesCatalogImpl(argc, argv); - poa->activate_object (Catalogue_i); - mgr->activate(); - CORBA::Object_ptr myCata = Catalogue_i->_this(); - - // initialise Naming Service - SALOME_NamingService *_NS; - _NS = new SALOME_NamingService(orb); - // register Catalog in Naming Service - _NS->Register(myCata ,"/Kernel/RessourcesCatalog"); - - MESSAGE("Running Ressources Catalog Server.") - - orb->run(); - - poa->destroy(1,1); - - } - catch(CORBA::SystemException&) { - INFOS("Caught CORBA::SystemException.") - } - catch(CORBA::Exception&) { - INFOS("Caught CORBA::Exception.") - } - - // delete myThreadTrace; - return 0; -} diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx deleted file mode 100644 index 28be74c37..000000000 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.cxx +++ /dev/null @@ -1,314 +0,0 @@ -// SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_RessourcesCatalog_impl.cxx -// Author : Estelle Deville -// Module : SALOME - -#include "SALOME_RessourcesCatalog_impl.hxx" -#include - -#include "Utils_ExceptHandlers.hxx" -using namespace std; -UNEXPECT_CATCH(RC_NotFound, SALOME_RessourcesCatalog::NotFound); - -//---------------------------------------------------------------------- -// Function : SALOME_RessourcesCatalogImpl -// Purpose : Constructor -//---------------------------------------------------------------------- -SALOME_RessourcesCatalogImpl::SALOME_RessourcesCatalogImpl(int argc, char** argv) -{ - MESSAGE("Ressources Catalog creation"); - - // Empty used variables - _ressourceslist.resize(0); - - // Parse the arguments given at server run - if (!_parseArguments(argc, argv,&_path_ressources)) - MESSAGE( "Error while argument parsing" ) - - // Test existency of files - if (_path_ressources == NULL) - MESSAGE( "Error the ressources catalog should be indicated" ) - else - { - MESSAGE("Parse ressources catalog"); - // Affect the variable _ressourceslist - _parse_xml_file(_path_ressources,_ressourceslist); - - // Verification of _datatype_list content - if(!_verify_ressources(_ressourceslist)) - MESSAGE( "Error while parsing the ressources catalog" ) - else MESSAGE("Ressources Catalog OK"); - } -} - -//---------------------------------------------------------------------- -// Function : ~SALOME_RessourcesCatalogImpl -// Purpose : Destructor -//---------------------------------------------------------------------- -SALOME_RessourcesCatalogImpl::~SALOME_RessourcesCatalogImpl() -{ - MESSAGE("Ressources Catalog Destruction"); -} - -//---------------------------------------------------------------------- -// Function : GetComputerList -// Purpose : get ressources list -//---------------------------------------------------------------------- -SALOME_RessourcesCatalog::ListOfComputer* -SALOME_RessourcesCatalogImpl::GetComputerList() -{ - MESSAGE("Begin of GetComputerList"); - SALOME_RessourcesCatalog::ListOfComputer_var _list = new SALOME_RessourcesCatalog::ListOfComputer; - _list->length(_ressourceslist.size()); - for (unsigned int ind=0; ind < _ressourceslist.size();ind++) - { - _list[ind]=CORBA::string_dup(_ressourceslist[ind].Parsername.c_str()); - } - return _list._retn(); -} - - -//---------------------------------------------------------------------- -// Function : GetRessourcesList -// Purpose : get a data type name list -//---------------------------------------------------------------------- -SALOME_RessourcesCatalog::ListOfContainerType* -SALOME_RessourcesCatalogImpl::GetContainerTypeList(const char* computer) - throw(SALOME_RessourcesCatalog::NotFound) -{ - Unexpect aCatch(RC_NotFound); - MESSAGE("Begin of GetContainerTypeList"); - SALOME_RessourcesCatalog::ListOfContainerType_var _list = - new SALOME_RessourcesCatalog::ListOfContainerType; - - bool find = false ; - - // Looking for ressources named "computer" - // If found, get container type list - // If not found, exception is thrown - - for (unsigned int ind=0; ind < _ressourceslist.size();ind++) - { - if (strcmp((_ressourceslist[ind].Parsername).c_str(),computer) == 0) - { - MESSAGE("Ressources named " << computer << " found in the ressources catalog"); - find = true; - - _list->length(_ressourceslist[ind].Parsercontainertype.size()); - for (unsigned int ind1=0; ind1 < _ressourceslist[ind].Parsercontainertype.size();ind1++) - { - // get container type list - switch(_ressourceslist[ind].Parsercontainertype[ind1]){ - case Cpp: - _list[ind1] = SALOME_RessourcesCatalog::Cpp; - break; - case python: - _list[ind1] = SALOME_RessourcesCatalog::python; - break; - case NP: - _list[ind1] = SALOME_RessourcesCatalog::NP; - break; - } - } - } - } - - if (!find) - { - // The ressources was not found, the exception should be thrown - MESSAGE( "The ressource " << computer << " was not found in the ressources catalog" ) - throw SALOME_RessourcesCatalog::NotFound() ; - } - return _list._retn(); -} - -//---------------------------------------------------------------------- -// Function : GetComputerInfo -// Purpose : get ressources information -//---------------------------------------------------------------------- -SALOME_RessourcesCatalog::computer_info* -SALOME_RessourcesCatalogImpl::GetComputerInfo(const char* computer) - throw(SALOME_RessourcesCatalog::NotFound) -{ - MESSAGE("Begin of GetComputerInfo"); - Unexpect aCatch(RC_NotFound); - SALOME_RessourcesCatalog::computer_info_var _computer_info = - new SALOME_RessourcesCatalog::computer_info; - - bool find = false ; - - // Looking for ressources named "computer" - // If found, get computer info - // If not found, exception is thrown - for (unsigned int ind=0; ind < _ressourceslist.size();ind++) - { - if (strcmp((_ressourceslist[ind].Parsername).c_str(),computer) == 0) - { - MESSAGE("Ressources named " << computer << " found in the ressources catalog"); - find = true; - - _computer_info->name = CORBA::string_dup(_ressourceslist[ind].Parsername.c_str()); - _computer_info->OS = CORBA::string_dup(_ressourceslist[ind].ParserOS.c_str()); - _computer_info->OS_version = CORBA::string_dup(_ressourceslist[ind].ParserOS_version.c_str()); - _computer_info->procs = _duplicate_procs(_ressourceslist[ind].Parserprocs); - } - } - - if (!find) - { - // The ressources was not found, the exception should be thrown - MESSAGE( "The ressource " << computer << " was not found in the ressources catalog" ) - throw SALOME_RessourcesCatalog::NotFound() ; - } - return _computer_info._retn(); -} - - - -//---------------------------------------------------------------------- -// Function : _parse_xml_file -// Purpose : parse one module catalog -//---------------------------------------------------------------------- -void -SALOME_RessourcesCatalogImpl::_parse_xml_file(const char* file, - ListOfParserressources& ressourceslist) -{ - SALOME_RessourcesCatalog_Handler* handler = new SALOME_RessourcesCatalog_Handler(); - QFile xmlFile(file); - - QXmlInputSource source(xmlFile); - - QXmlSimpleReader reader; - reader.setContentHandler( handler ); - reader.setErrorHandler( handler ); - reader.parse( source ); - xmlFile.close(); - ressourceslist = _ressources_list; -} - - -//---------------------------------------------------------------------- -// Function : _verify_ressources -// Purpose : verify ressources from the catalog parsing -// Verify that a computer is'nt defined twice in the catalog -//---------------------------------------------------------------------- -bool -SALOME_RessourcesCatalogImpl::_verify_ressources(ListOfParserressources ressourceslist) -{ - bool _return_value = true; - bool _bool = false ; - vector _machine_list; - _machine_list.resize(0); - - // Fill a list of all computers indicated in the ressources list - for (unsigned int ind = 0; ind < ressourceslist.size(); ind++) - _machine_list.push_back(ressourceslist[ind].Parsername); - - // Parse if a computer name is twice in the list of computers -#ifndef WNT - for (unsigned int ind = 0; ind < _machine_list.size(); ind++) -#else - for (ind = 0; ind < _machine_list.size(); ind++) -#endif - { - for (unsigned int ind1 = ind+1 ; ind1 < _machine_list.size(); ind1++) - { - if(_machine_list[ind].compare(_machine_list[ind1]) == 0) - { - MESSAGE("The computer " << _machine_list[ind] << " is indicated more than once in the ressources list") - _return_value = false; - } - } - } - - return _return_value; -} - - -//---------------------------------------------------------------------- -// Function : _parseArguments -// Purpose : parse arguments to get general and personal catalog files -//---------------------------------------------------------------------- -bool -SALOME_RessourcesCatalogImpl::_parseArguments(int argc, char **argv, - char **_path) -{ - bool _return_value = true; - *_path = NULL; - for (int ind = 0; ind < argc ; ind++) - { - - if (strcmp(argv[ind],"-help") == 0) - { - MESSAGE( "Usage: " << argv[0] << " -common 'path to ressources catalog' -ORBInitRef NameService=corbaname::localhost"); - _return_value = false ; - } - if (strcmp(argv[ind],"-common") == 0) - { - if (ind + 1 <= argc) - { - // General catalog file - *_path= argv[ind + 1] ; - ifstream _path_file(*_path); - if (!_path_file) - { - MESSAGE( "Sorry the file " << *_path << " can't be open" ) - *_path = NULL; - _return_value = false; - } - } - } - - } - return _return_value; -} - -//---------------------------------------------------------------------- -// Function : _duplicate_procs -// Purpose : create a list of processors information from the catalog parsing -//---------------------------------------------------------------------- -SALOME_RessourcesCatalog::ListOfProc -SALOME_RessourcesCatalogImpl::_duplicate_procs(ListOfParserProc list_procs) -{ - SALOME_RessourcesCatalog::ListOfProc _list_procs; - unsigned int _length = list_procs.size(); - _list_procs.length(_length); - - for (unsigned int ind = 0; ind < _length; ind++) - { - //duplicate processor number - _list_procs[ind].number = list_procs[ind].Parsernumber; - - //duplicate model name - _list_procs[ind].model_name = CORBA::string_dup(list_procs[ind].Parsermodel_name.c_str()); - - //duplicate cpu - _list_procs[ind].cpu_mhz = list_procs[ind].Parsercpu_mhz; - - // duplicate cache size - _list_procs[ind].cache_size = list_procs[ind].Parsercache_size; - } - return _list_procs; -} diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx deleted file mode 100644 index 42237b98b..000000000 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx +++ /dev/null @@ -1,127 +0,0 @@ -// SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_RessourcesCatalog_impl.hxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#ifndef RESSOURCESCATALOG_IMPL_H -#define RESSOURCESCATALOG_IMPL_H - -#include "utilities.h" -#include "SALOME_RessourcesCatalog_Handler.hxx" -#include -#include CORBA_SERVER_HEADER(SALOME_RessourcesCatalog) - -#if defined RESSOURCESCatalog_EXPORTS -#if defined WIN32 -#define RESSOURCESCatalog_EXPORT __declspec( dllexport ) -#else -#define RESSOURCESCatalog_EXPORT -#endif -#else -#if defined WNT -#define RESSOURCESCatalog_EXPORT __declspec( dllimport ) -#else -#define RESSOURCESCatalog_EXPORT -#endif -#endif - -class RESSOURCESCatalog_EXPORT SALOME_RessourcesCatalogImpl: public POA_SALOME_RessourcesCatalog::RessourcesCatalog, - public PortableServer::RefCountServantBase -{ -public: - //! standard constructor - SALOME_RessourcesCatalogImpl(int argc, char** argv); - - //! standard destructor - virtual ~SALOME_RessourcesCatalogImpl(); - - //! method to get the ressources list - /*! - \return a computer list - */ - virtual SALOME_RessourcesCatalog::ListOfComputer* GetComputerList(); - - //! method to get the container type list of a computer - /*! - \param computer const char* arguments - \return a container type list - */ - virtual SALOME_RessourcesCatalog::ListOfContainerType* GetContainerTypeList(const char* computer) throw(SALOME_RessourcesCatalog::NotFound); - - //! method to get informations on a computer - /*! - \param computer const char* arguments - \return informations of the computer - */ - virtual SALOME_RessourcesCatalog::computer_info* GetComputerInfo(const char* computer) throw(SALOME_RessourcesCatalog::NotFound); - - -private: - - //! method to parse the data type catalog - /*! - \param file const char* arguments - \param datatypelist ListOfParserDataType arguments - */ - virtual void _parse_xml_file(const char* file, - ListOfParserressources& ressourceslist); - - - //! method to verify ressources catalog content - /*! - \param ressourceslist ListOfParserRessources arguments - \return true if verfication is OK - */ - virtual bool _verify_ressources(ListOfParserressources ressourceslist); - - - //! method to parse arguments to get catalog file - /*! - \param argc int arguments - \param argv char** arguments - \param _path char** arguments - \return true if parsing is OK - */ - virtual bool _parseArguments(int argc, char **argv, char **_path); - - //! method to create a list of processors information from the catalog parsing - /*! - \param list_procs ListOfParserProc arguments - \return the processors information list - */ - virtual SALOME_RessourcesCatalog::ListOfProc - _duplicate_procs(ListOfParserProc list_procs); - - - // will contain the path to the ressources catalog - char* _path_ressources; - - - //will contain the informations on the data type catalog(after parsing) - ListOfParserressources _ressourceslist ; -}; - -#endif // RESSOURCESCATALOG_IMPL_H -- 2.39.2