aims_project_windows 0.3.3 → 0.3.4

data/bin/AimsProjectManager

@@ -36,4 +36,18 @@ end
 AimsProject::ThreadCallbackEvent.set_event_type(Wx::Event.new_event_type)
 Wx::EvtHandler.register_class(AimsProject::ThreadCallbackEvent, AimsProject::ThreadCallbackEvent.event_type, "evt_thread_callback", 0)
 
-controller.main_loop
+begin
+  controller.main_loop
+rescue AimsProject::AimsProjectException => ex
+  STDERR.puts ex.message
+rescue => error
+  STDERR.puts
+  STDERR.puts "Sorry, something went wrong. Please send the following information to joshua.shapiro@gmail.com"
+  STDERR.puts
+  STDERR.puts "FILE:  #{__FILE__}"
+  STDERR.puts "VERSION: #{AimsProject::VERSION}"
+  STDERR.puts "ERROR: " + error.message
+  STDERR.print "\t" + error.backtrace.slice(0..5).join("\n\t")
+  STDERR.puts 
+  STDERR.puts 
+end

data/lib/aims_project.rb

@@ -6,6 +6,7 @@ require "rubygems"
 require 'aims'
 require 'yaml'
 
+require 'aims_project/version.rb'
 require 'aims_project/project.rb'
 require 'aims_project/calculation.rb'
 require 'aims_project/geometry_file.rb'
@@ -133,8 +134,6 @@ require 'aims_project/aims_project_exception.rb'
 # that will upload the calculations to the server and submit them to the queue.
 # 
 
-
-
 module AimsProject
   # Constants
   STAGED   = "STAGED"

data/lib/aims_project/app_controller.rb

@@ -33,14 +33,14 @@ class AppController < Wx::App
         self.app_name = "AimsViewer"
         # Create the frame, toolbar and menubar and define event handlers
         size = [1000,700]
-        @frame = Frame.new(nil, -1, "AimsViewer", DEFAULT_POSITION, size)
+        @frame = Frame.new(nil, :title => "AimsViewer", :size => size)
         @statusbar = @frame.create_status_bar
 
         # This timer will cause the main thread to pass every 2 ms so that other threads
         # can get work done.
-        timer = Wx::Timer.new(self, Wx::ID_ANY)
-        evt_timer(timer.id) {Thread.pass}
-        timer.start(2)
+        # timer = Wx::Timer.new(self, Wx::ID_ANY)
+        # evt_timer(timer.id) {Thread.pass}
+        # timer.start(2)
 
         # Initialize the selection
         @selection = {}
@@ -113,7 +113,7 @@ class AppController < Wx::App
        @menubar.append(fileMenu, "File")
        @menubar.append(editMenu, "Edit")
        @menubar.append(viewMenu, "Views")
-       @menubar.append(toolsMenu, "Tools")
+       # @menubar.append(toolsMenu, "Tools")
        
        evt_menu @menubar, :process_menu_event
      end

data/lib/aims_project/crystal_viewer.rb

@@ -225,11 +225,11 @@ class CrystalViewer < Wx::Panel
 
   def init_clip_planes
       
-      Thread.new(self) { |evtHandler|
-        @unit_cell_corrected = @unit_cell.correct
-        evt = ThreadCallbackEvent.new
-        evtHandler.add_pending_event(evt)
-      }
+      # Thread.new(self) { |evtHandler|
+        # @unit_cell_corrected = @unit_cell.correct
+      #   evt = ThreadCallbackEvent.new
+      #   evtHandler.add_pending_event(evt)
+      # }
     
       return unless (@unit_cell and @unit_cell.is_valid?) 
     
@@ -762,7 +762,7 @@ class CrystalViewer < Wx::Panel
     return unless self.unit_cell
     
     atoms = if @options.correct
-      @unit_cell_corrected
+      @unit_cell.correct
     else
       @unit_cell
     end

data/lib/aims_project/geometry_console.rb

@@ -1,4 +1,3 @@
-
 module AimsProject
   
   class CommandHistory
@@ -38,7 +37,7 @@ module AimsProject
     def initialize(app, window)
       super(window)
       @app = app
-      @text_ctrl = RichTextCtrl.new(self)
+      @text_ctrl = RichTextCtrl.new(self, :style => Wx::WANTS_CHARS)
       @history = CommandHistory.new
       sizer = BoxSizer.new(VERTICAL)
       sizer.add_item(@text_ctrl, :proportion => 1, :flag => EXPAND | ALL, :border => 5)
@@ -114,7 +113,7 @@ module AimsProject
     end
     
     def prompt
-      @text_ctrl.append_text(">> ")
+      print(">> ")
       @text_ctrl.move_end
       @line_start = @text_ctrl.get_caret_position + 1
       @text_ctrl.show_position(@line_start)
@@ -125,6 +124,7 @@ module AimsProject
       @text_ctrl.append_text(str)
       stop = @text_ctrl.get_caret_position
       @text_ctrl.set_style(start..stop, RichTextAttr.new(color))
+      
     end
     
     def echo(str, color=Wx::BLACK)
@@ -152,4 +152,4 @@ module AimsProject
     end
     
   end
-end
+end

data/lib/aims_project/geometry_window.rb

@@ -111,7 +111,8 @@ module AimsProject
       puts "Selection:" 
       puts @selection[:atoms].each{|a| puts a.format_geometry_in}
       @geomEditor.select_atom(atom)
-      @console.echo(atom.to_s)
+      @console.echo("\n" + atom.to_s)
+      @console.prompt
     end
     
     def nudge_selected_atoms(x,y,z)

data/lib/aims_project/inspector.rb

@@ -26,8 +26,9 @@ EOS
   
   def initialize(app, frame)
     
-    super(frame, :style => (CLOSE_BOX | CAPTION | FRAME_FLOAT_ON_PARENT))
-
+    super(frame, :style => (SYSTEM_MENU | CAPTION | CLOSE_BOX | FRAME_FLOAT_ON_PARENT))
+    enable_close_button
+    
     @app = app
     
     # Array to track the inspector windows being shown
@@ -180,4 +181,4 @@ EOS
    end
    
 end
-end
+end

data/lib/aims_project/version.rb

@@ -0,0 +1,3 @@
+module AimsProject
+  VERSION="0.3.4"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aims_project_windows
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000Z
+date: 2013-06-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wxruby-ruby19
-  requirement: &5407500 !ruby/object:Gem::Requirement
+  requirement: &5465660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *5407500
+  version_requirements: *5465660
 - !ruby/object:Gem::Dependency
   name: ruby-opengl
-  requirement: &5407270 !ruby/object:Gem::Requirement
+  requirement: &5465430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.61.0
   type: :runtime
   prerelease: false
-  version_requirements: *5407270
+  version_requirements: *5465430
 - !ruby/object:Gem::Dependency
   name: aims
-  requirement: &5407040 !ruby/object:Gem::Requirement
+  requirement: &5465200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *5407040
+  version_requirements: *5465200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &5406810 !ruby/object:Gem::Requirement
+  requirement: &5464970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *5406810
+  version_requirements: *5464970
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &5406580 !ruby/object:Gem::Requirement
+  requirement: &5464740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *5406580
+  version_requirements: *5464740
 description: This gem simplifies and streamlines the calculation pipeline for FHI-AIMS.
 email: joshua.shapiro@gmail.com
 executables:
@@ -94,6 +94,7 @@ files:
 - lib/aims_project/project.rb
 - lib/aims_project/project_tree.rb
 - lib/aims_project/thread_callback_event.rb
+- lib/aims_project/version.rb
 - lib/aims_project.rb
 - lib/aims_project/pan.gif
 - lib/aims_project/rotate.gif