Revision: 41800
http://brlcad.svn.sourceforge.net/brlcad/?rev=41800&view=rev
Author: brlcad
Date: 2010-12-27 19:53:32 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
s/BRLCAD/BRL-CAD/g
Modified Paths:
--------------
web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.inc
web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.module
web/trunk/htdocs/more/sites/all/themes/fireflystreamcom/style.css
Modified: web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.inc
===================================================================
--- web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.inc 2010-12-27
19:52:55 UTC (rev 41799)
+++ web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.inc 2010-12-27
19:53:32 UTC (rev 41800)
@@ -2,11 +2,11 @@
/**
* @file
- * BRLCAD related methods.
+ * BRL-CAD related methods.
*/
/**
- * Runs the BRLCAD metadata extraction and raytracing script, parses and
returns the results.
+ * Runs the BRL-CAD metadata extraction and raytracing script, parses and
returns the results.
* @param $model filepath of the model file
* @param $objects array of object names to raytrace
* @return array metadata fields and raytrace image paths
@@ -98,7 +98,7 @@
}
/**
- * Runs a BRLCAD specific command and returns the output of stdout.
+ * Runs a BRL-CAD specific command and returns the output of stdout.
*
* @param $command command line using %s as tokens for arguments (and %% for %)
* @param $params array of command argument strings
@@ -160,7 +160,7 @@
if(empty($script)) {
return;
}
- $command = 'mged -cr %s 2>&1 < %s';
+ $command = 'mged -c -r %s 2>&1 < %s';
$params = array($model, $script);
$output = brlcad_run_command($command, $params, $env, $cwd);
@@ -242,7 +242,7 @@
function brlcad_convert_brlcad2other($output_format, $input, $output,
$objects) {
$function = 'brlcad_convert_brlcad2' . $output_format;
if(!function_exists($function)) {
- watchdog('brlcad', t('Conversion from BRLCAD g format to %format is not
supported.', array('%format' => $output_format)));
+ watchdog('brlcad', t('Conversion from BRL-CAD .g format to %format is not
supported.', array('%format' => $output_format)));
return;
}
return $function($input, $output, $objects);
@@ -259,7 +259,7 @@
function brlcad_convert_other2brlcad($input_format, $input, $output) {
$function = 'brlcad_convert_' . $input_format . '2brlcad';
if(!function_exists($function)) {
- watchdog('brlcad', t('Conversion from %format format to BRLCAD g format is
not supported.', array('%format' => $input_format)));
+ watchdog('brlcad', t('Conversion from %format format to BRL-CAD .g format
is not supported.', array('%format' => $input_format)));
return;
}
return $function($input, $output);
Modified: web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.module
===================================================================
--- web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.module
2010-12-27 19:52:55 UTC (rev 41799)
+++ web/trunk/htdocs/more/sites/all/modules/brlcad/brlcad.module
2010-12-27 19:53:32 UTC (rev 41800)
@@ -51,7 +51,7 @@
}
$form = array();
$form['process'] = array(
- '#value' => t('Start processing models that require BRLCAD processing
!now.', array('!now' => l(t('now'), 'admin/content/brlcad/process'))),
+ '#value' => t('Start processing models that require BRL-CAD processing
!now.', array('!now' => l(t('now'), 'admin/content/brlcad/process'))),
);
$form['system'] = array(
'#type' => 'fieldset',
@@ -225,7 +225,7 @@
}
/**
- * Flags (or unflags) a model node for BRLCAD processing.
+ * Flags (or unflags) a model node for BRL-CAD processing.
* @param $node node to flag
* @param $enable_flag true if the flag should be flaged, false otherwise
* @return boolean current flaging state
@@ -245,7 +245,7 @@
}
/**
- * Process nodes marked for BRLCAD processing.
+ * Process nodes marked for BRL-CAD processing.
*/
function brlcad_process_nodes($time_limit = -1) {
$processingflag = variable_get('brlcad_processing_flag', '');
@@ -270,7 +270,7 @@
}
/**
- * Does BRLCAD processing on a node.
+ * Does BRL-CAD processing on a node.
* @param object $node node to process
*/
function brlcad_process_node(&$node) {
@@ -278,11 +278,11 @@
brlcad_node_create_brlcad_model($node);
brlcad_node_import_data($node);
brlcad_node_create_other_models($node);
- $node->log = t('BRLCAD processing completed.');
+ $node->log = t('BRL-CAD processing completed.');
}
/**
- * Run BRLCAD scripts and imports the metadata and images for a node.
+ * Run BRL-CAD scripts and imports the metadata and images for a node.
* @param $node
* @return true if successfull
*/
@@ -348,7 +348,7 @@
}
/**
- * Converts a generic model to a BRLCAD model.
+ * Converts a generic model to a BRL-CAD model.
* @param $node object containin model node data
*/
function brlcad_node_create_brlcad_model(&$node) {
@@ -359,13 +359,13 @@
return;
}
- // create the brlcad file
+ // create the BRL-CAD file
$file = brlcad_convert_file($node->field_original_file[0], 'brlcad');
$node->field_brlcad_file[0] = $file;
}
/**
- * Converts a the BRLCAD model to other models.
+ * Converts a the BRL-CAD model to other models.
* @param $node object containin model node data
*/
function brlcad_node_create_other_models(&$node) {
@@ -402,7 +402,7 @@
}
/**
- * Helpder function to load the BRLCAD API.
+ * Helpder function to load the BRL-CAD API.
*/
function brlcad_load_api() {
require_once(drupal_get_path('module', 'brlcad') . '/brlcad.inc');
@@ -425,7 +425,7 @@
// - it's not the original upload field
// - it's a file field
// - fits field_format_file the naming convention
- // - can be converted from BRLCAD format
+ // - can be converted from BRL-CAD format
foreach($fields['fields'] as $name => $field) {
if($name != 'field_original_file' && $field['type'] == 'file' &&
preg_match('|^field_(.+)_file$|', $name, $matches) &&
function_exists('brlcad_convert_brlcad2' . $matches[1])) {
@@ -438,7 +438,7 @@
}
/**
- * Helper function to retrieve information about the BRLCAD model file of a
model node.
+ * Helper function to retrieve information about the BRL-CAD model file of a
model node.
* @param $node node to search for model
* @return array value of the CCK model_file field (including fid, filepath,
filename, etc)
*/
@@ -491,8 +491,8 @@
}
/**
- * Retrieves the supported BRLCAD versions based on files in the scripts
directory.
- * @return array supported BRLCAD versions
+ * Retrieves the supported BRL-CAD versions based on files in the scripts
directory.
+ * @return array supported BRL-CAD versions
*/
function _brlcad_supported_versions() {
static $supported;
Modified: web/trunk/htdocs/more/sites/all/themes/fireflystreamcom/style.css
===================================================================
--- web/trunk/htdocs/more/sites/all/themes/fireflystreamcom/style.css
2010-12-27 19:52:55 UTC (rev 41799)
+++ web/trunk/htdocs/more/sites/all/themes/fireflystreamcom/style.css
2010-12-27 19:53:32 UTC (rev 41800)
@@ -1245,7 +1245,7 @@
}
/**
- * BRLCAD customizations
+ * BRL-CAD customizations
*/
.field-type-image .field-items .field-item {
display: inline;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
